.gitignore

@@ -4,7 +4,6 @@
 **/dist
 /tmp
 /out-tsc
-**/coverage
 # Only exists if Bazel was run
 /bazel-out
 
@@ -27,8 +26,6 @@ speed-measure-plugin*.json
 !Frontend.iml
 !Backend.iml
 !CucumberTests.iml
-!Crawler.iml
-!Crawler-Loadbalancer.iml
 
 # Include IntelliJ modules
 !/.idea/modules.xml

.idea/modules.xml

@@ -4,8 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Backend/Backend.iml" filepath="$PROJECT_DIR$/Backend/Backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/Betterzon.iml" filepath="$PROJECT_DIR$/Betterzon.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Crawler/Crawler.iml" filepath="$PROJECT_DIR$/Crawler/Crawler.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Crawler-Loadbalancer/Crawler-Loadbalancer.iml" filepath="$PROJECT_DIR$/Crawler-Loadbalancer/Crawler-Loadbalancer.iml" />
       <module fileurl="file://$PROJECT_DIR$/CucumberTests/CucumberTests.iml" filepath="$PROJECT_DIR$/CucumberTests/CucumberTests.iml" />
       <module fileurl="file://$PROJECT_DIR$/Frontend/Frontend.iml" filepath="$PROJECT_DIR$/Frontend/Frontend.iml" />
     </modules>

Backend/package.json

@@ -11,19 +11,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@types/cookie-parser": "^1.4.2",
-    "bcrypt": "^5.0.1",
-    "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
-    "guid-typescript": "^1.0.9",
     "helmet": "^4.2.0",
     "mariadb": "^2.5.1",
     "typeorm": "^0.2.29"
   },
   "devDependencies": {
-    "@types/bcrypt": "^3.0.1",
     "@types/cors": "^2.8.8",
     "@types/dotenv": "^8.2.0",
     "@types/express": "^4.17.9",

Backend/src/index.ts

@@ -13,13 +13,6 @@ import {pricesRouter} from './models/prices/prices.router';
 import {vendorsRouter} from './models/vendors/vendors.router';
 import {errorHandler} from './middleware/error.middleware';
 import {notFoundHandler} from './middleware/notFound.middleware';
-import {usersRouter} from './models/users/users.router';
-import {pricealarmsRouter} from './models/pricealarms/pricealarms.router';
-import {contactpersonsRouter} from './models/contact_persons/contact_persons.router';
-import {favoriteshopsRouter} from './models/favorite_shops/favoriteshops.router';
-import {crawlingstatusRouter} from './models/crawling_status/crawling_status.router';
-
-const cookieParser = require('cookie-parser');
 
 dotenv.config();
 
@@ -44,17 +37,11 @@ const app = express();
 app.use(helmet());
 app.use(cors());
 app.use(express.json());
-app.use(cookieParser());
 app.use('/products', productsRouter);
 app.use('/categories', categoriesRouter);
 app.use('/manufacturers', manufacturersRouter);
 app.use('/prices', pricesRouter);
-app.use('/users', usersRouter);
 app.use('/vendors', vendorsRouter);
-app.use('/pricealarms', pricealarmsRouter);
-app.use('/contactpersons', contactpersonsRouter);
-app.use('/favoriteshops', favoriteshopsRouter);
-app.use('/crawlingstatus', crawlingstatusRouter);
 
 app.use(errorHandler);
 app.use(notFoundHandler);

Backend/src/middleware/error.middleware.ts

@@ -1,5 +1,5 @@
-import HttpException from '../common/http-exception';
+import HttpException from "../common/http-exception";
-import {Request, Response, NextFunction} from 'express';
+import { Request, Response, NextFunction } from "express";
 
 export const errorHandler = (
     error: HttpException,
@@ -9,7 +9,7 @@ export const errorHandler = (
 ) => {
     const status = error.statusCode || 500;
     const message =
-        error.message || 'It\'s not you. It\'s us. We are having some problems.';
+        error.message || "It's not you. It's us. We are having some problems.";
 
     response.status(status).send(message);
 };

Backend/src/middleware/notFound.middleware.ts

@@ -1,4 +1,4 @@
-import {Request, Response, NextFunction} from 'express';
+import { Request, Response, NextFunction } from "express";
 
 export const notFoundHandler = (
     request: Request,
@@ -6,7 +6,7 @@ export const notFoundHandler = (
     next: NextFunction
 ) => {
 
-    const message = 'Resource not found';
+    const message = "Resource not found";
 
     response.status(404).send(message);
 };

Backend/src/models/categories/categories.router.ts

@@ -19,19 +19,20 @@ export const categoriesRouter = express.Router();
  * Controller Definitions
  */
 
-// GET categories/
+// GET items/
+
 categoriesRouter.get('/', async (req: Request, res: Response) => {
     try {
         const categories: Categories = await CategoryService.findAll();
 
         res.status(200).send(categories);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET categories/:id
+// GET items/:id
+
 categoriesRouter.get('/:id', async (req: Request, res: Response) => {
     const id: number = parseInt(req.params.id, 10);
 
@@ -45,12 +46,12 @@ categoriesRouter.get('/:id', async (req: Request, res: Response) => {
 
         res.status(200).send(category);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET categories/search/:term
+// GET items/:name
+
 categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
     const term: string = req.params.term;
 
@@ -64,7 +65,48 @@ categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
 
         res.status(200).send(categories);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
+
+
+// POST items/
+
+// categoriesRouter.post('/', async (req: Request, res: Response) => {
+//     try {
+//         const category: Category = req.body.category;
+//
+//         await CategoryService.create(category);
+//
+//         res.sendStatus(201);
+//     } catch (e) {
+//         res.status(404).send(e.message);
+//     }
+// });
+//
+// // PUT items/
+//
+// categoriesRouter.put('/', async (req: Request, res: Response) => {
+//     try {
+//         const category: Category = req.body.category;
+//
+//         await CategoryService.update(category);
+//
+//         res.sendStatus(200);
+//     } catch (e) {
+//         res.status(500).send(e.message);
+//     }
+// });
+//
+// // DELETE items/:id
+//
+// categoriesRouter.delete('/:id', async (req: Request, res: Response) => {
+//     try {
+//         const id: number = parseInt(req.params.id, 10);
+//         await CategoryService.remove(id);
+//
+//         res.sendStatus(200);
+//     } catch (e) {
+//         res.status(500).send(e.message);
+//     }
+// });

Backend/src/models/categories/categories.service.ts

@@ -23,9 +23,6 @@ import {Categories} from './categories.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known categories
- */
 export const findAll = async (): Promise<Categories> => {
     let conn;
     let categRows = [];
@@ -57,10 +54,6 @@ export const findAll = async (): Promise<Categories> => {
     return categRows;
 };
 
-/**
- * Fetches and returns the category with the specified id
- * @param id The id of the category to fetch
- */
 export const find = async (id: number): Promise<Category> => {
     let conn;
     let categ: any;
@@ -84,10 +77,6 @@ export const find = async (id: number): Promise<Category> => {
     return categ;
 };
 
-/**
- * Fetches and returns all categories that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Categories> => {
     let conn;
     let categRows = [];
@@ -111,3 +100,36 @@ export const findBySearchTerm = async (term: string): Promise<Categories> => {
 
     return categRows;
 };
+
+// export const create = async (newItem: Product): Promise<void> => {
+//     let conn;
+//     try {
+//         conn = await pool.getConnection();
+//         await conn.query("");
+//
+//     } catch (err) {
+//         throw err;
+//     } finally {
+//         if (conn) conn.end();
+//     }
+// };
+//
+// export const update = async (updatedItem: Product): Promise<void> => {
+//     if (models.products[updatedItem.product_id]) {
+//         models.products[updatedItem.product_id] = updatedItem;
+//         return;
+//     }
+//
+//     throw new Error("No record found to update");
+// };
+//
+// export const remove = async (id: number): Promise<void> => {
+//     const record: Product = models.products[id];
+//
+//     if (record) {
+//         delete models.products[id];
+//         return;
+//     }
+//
+//     throw new Error("No record found to delete");
+// };

Backend/src/models/contact_persons/contact_person.interface.ts

@@ -1,9 +0,0 @@
-export interface Contact_Person {
-    contact_person_id: number;
-    first_name: string;
-    last_name: string;
-    gender: string;
-    email: string;
-    phone: string;
-    vendor_id: number;
-}

Backend/src/models/contact_persons/contact_persons.interface.ts

@@ -1,5 +0,0 @@
-import {Contact_Person} from './contact_person.interface';
-
-export interface Contact_Persons {
-    [key: number]: Contact_Person;
-}

Backend/src/models/contact_persons/contact_persons.router.ts

@@ -1,133 +0,0 @@
-/**
- * Required External Modules and Interfaces
- */
-
-import express, {Request, Response} from 'express';
-import * as ContactPersonService from './contact_persons.service';
-import {Contact_Person} from './contact_person.interface';
-import {Contact_Persons} from './contact_persons.interface';
-import * as UserService from '../users/users.service';
-import * as PriceService from '../prices/prices.service';
-
-
-/**
- * Router Definition
- */
-
-export const contactpersonsRouter = express.Router();
-
-
-/**
- * Controller Definitions
- */
-
-// GET contactpersons/
-contactpersonsRouter.get('/', async (req: Request, res: Response) => {
-    try {
-        const contacts: Contact_Persons = await ContactPersonService.findAll();
-
-        res.status(200).send(contacts);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// GET contactpersons/:id
-contactpersonsRouter.get('/:id', async (req: Request, res: Response) => {
-    const id: number = parseInt(req.params.id, 10);
-
-    if (!id) {
-        res.status(400).send('Missing parameters.');
-        return;
-    }
-
-    try {
-        const contact: Contact_Person = await ContactPersonService.find(id);
-
-        res.status(200).send(contact);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// GET contactpersons/byvendor/:id
-contactpersonsRouter.get('/byvendor/:id', async (req: Request, res: Response) => {
-    const id: number = parseInt(req.params.id, 10);
-
-    if (!id) {
-        res.status(400).send('Missing parameters.');
-        return;
-    }
-
-    try {
-        const contacts: Contact_Persons = await ContactPersonService.findByVendor(id);
-
-        res.status(200).send(contacts);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// POST contactpersons/
-contactpersonsRouter.post('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get required parameters
-        const vendor_id = req.body.vendor_id;
-        const first_name = req.body.first_name;
-        const last_name = req.body.last_name;
-        const gender = req.body.gender;
-        const email = req.body.email;
-        const phone = req.body.phone;
-
-        const success = await ContactPersonService.createContactEntry(user.user_id, vendor_id, first_name, last_name, gender, email, phone);
-
-        if (success) {
-            res.status(201).send({});
-        } else {
-            res.status(500).send({});
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// PUT contactpersons/:id
-contactpersonsRouter.put('/:id', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get required parameters
-        const contact_person_id = parseInt(req.params.id, 10);
-        const vendor_id = req.body.vendor_id;
-        const first_name = req.body.first_name;
-        const last_name = req.body.last_name;
-        const gender = req.body.gender;
-        const email = req.body.email;
-        const phone = req.body.phone;
-
-        const success = await ContactPersonService.updateContactEntry(user.user_id, contact_person_id, vendor_id, first_name, last_name, gender, email, phone);
-
-        if (success) {
-            res.status(200).send({});
-        } else {
-            res.status(500).send({});
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/contact_persons/contact_persons.service.ts

@@ -1,175 +0,0 @@
-import * as dotenv from 'dotenv';
-
-dotenv.config();
-
-const mariadb = require('mariadb');
-const pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    connectionLimit: 5
-});
-
-/**
- * Data Model Interfaces
- */
-
-import {Contact_Person} from './contact_person.interface';
-import {Contact_Persons} from './contact_persons.interface';
-
-
-/**
- * Service Methods
- */
-
-/**
- * Fetches and returns all known contact persons
- */
-export const findAll = async (): Promise<Contact_Persons> => {
-    let conn;
-    let contRows = [];
-    try {
-        conn = await pool.getConnection();
-        const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons');
-        for (let row in rows) {
-            if (row !== 'meta') {
-                contRows.push(rows[row]);
-            }
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return contRows;
-};
-
-/**
- * Fetches and returns the contact person with the specified id
- * @param id The id of the contact person to fetch
- */
-export const find = async (id: number): Promise<Contact_Person> => {
-    let conn;
-    let cont: any;
-    try {
-        conn = await pool.getConnection();
-        const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons WHERE contact_person_id = ?', id);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                cont = rows[row];
-            }
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return cont;
-};
-
-/**
- * Fetches and returns the contact persons for the specified vendor
- * @param id The id of the vendor to fetch contact persons for
- */
-export const findByVendor = async (id: number): Promise<Contact_Persons> => {
-    let conn;
-    let contRows = [];
-    try {
-        conn = await pool.getConnection();
-        const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons WHERE vendor_id = ?', id);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                contRows.push(rows[row]);
-            }
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return contRows;
-};
-
-/**
- * Creates a contact entry record
- * @param user_id The user id of the issuing user
- * @param vendor_id The vendor id of the vendor to create the record for
- * @param first_name The first name of the contact person
- * @param last_name The last name of the contact person
- * @param gender The gender of the contact person
- * @param email The email of the contact person
- * @param phone The phone number of the contact person
- */
-export const createContactEntry = async (user_id: number, vendor_id: number, first_name: string, last_name: string, gender: string, email: string, phone: string): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Check if the user is authorized to manage the requested vendor
-        const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
-        if (user_vendor_rows.length !== 1) {
-            return false;
-        }
-
-        // Create contact person entry
-        const res = await conn.query('INSERT INTO contact_persons (first_name, last_name, gender, email, phone, vendor_id) VALUES (?, ?, ?, ?, ?, ?)', [first_name, last_name, gender, email, phone, vendor_id]);
-
-        // If there are more / less than 1 affected rows, return false
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Updates a contact entry record
- * @param user_id The user id of the issuing user
- * @param contact_person_id The id of the record to update
- * @param vendor_id The vendor id of the vendor to create the record for
- * @param first_name The first name of the contact person
- * @param last_name The last name of the contact person
- * @param gender The gender of the contact person
- * @param email The email of the contact person
- * @param phone The phone number of the contact person
- */
-export const updateContactEntry = async (user_id: number, contact_person_id: number, vendor_id: number, first_name: string, last_name: string, gender: string, email: string, phone: string): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Check if the user is authorized to manage the requested vendor
-        const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
-        if (user_vendor_rows.length !== 1) {
-            return false;
-        }
-
-        // Create contact person entry
-        const res = await conn.query('UPDATE contact_persons SET first_name = ?, last_name = ?, gender = ?, email = ?, phone = ? WHERE contact_person_id = ? AND vendor_id = ?', [first_name, last_name, gender, email, phone, contact_person_id, vendor_id]);
-
-        // If there are more / less than 1 affected rows, return false
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};

Backend/src/models/crawling_status/crawling_status.interface.ts

@@ -1,7 +0,0 @@
-export interface Crawling_Status {
-    process_id: number;
-    started_timestamp: Date;
-    combinations_to_crawl: number;
-    successful_crawls: number;
-    failed_crawls: number;
-}

Backend/src/models/crawling_status/crawling_status.router.ts

@@ -1,44 +0,0 @@
-/**
- * Required External Modules and Interfaces
- */
-
-import express, {Request, Response} from 'express';
-import * as CrawlingStatusService from './crawling_status.service';
-import {Crawling_Status} from './crawling_status.interface';
-import {Crawling_Statuses} from './crawling_statuses.interface';
-import * as UserService from '../users/users.service';
-
-
-/**
- * Router Definition
- */
-
-export const crawlingstatusRouter = express.Router();
-
-
-/**
- * Controller Definitions
- */
-
-// GET crawlingstatus/
-crawlingstatusRouter.get('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = (req.query.session_id ?? '').toString();
-        const session_key = (req.query.session_key ?? '').toString();
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        if (!user.is_admin) {
-            res.status(403).send({});
-            return;
-        }
-
-        const status: Crawling_Status = await CrawlingStatusService.getCurrent();
-
-        res.status(200).send(status);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/crawling_status/crawling_status.service.ts

@@ -1,75 +0,0 @@
-import * as dotenv from 'dotenv';
-
-dotenv.config();
-
-const mariadb = require('mariadb');
-const pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    connectionLimit: 5
-});
-
-/**
- * Data Model Interfaces
- */
-
-import {Crawling_Status} from './crawling_status.interface';
-import {Crawling_Statuses} from './crawling_statuses.interface';
-
-
-/**
- * Service Methods
- */
-
-/**
- * Fetches and returns the current crawling status if the issuing user is an admin
- */
-export const getCurrent = async (): Promise<Crawling_Status> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Get the current crawling process
-        let process_info = {
-            process_id: -1,
-            started_timestamp: new Date(),
-            combinations_to_crawl: -1
-        };
-        const process = await conn.query('SELECT process_id, started_timestamp, combinations_to_crawl FROM crawling_processes ORDER BY started_timestamp DESC LIMIT 1');
-        for (let row in process) {
-            if (row !== 'meta') {
-                process_info = process[row];
-            }
-        }
-
-        // Get the current status
-        let total_crawls = 0;
-        let successful_crawls = 0;
-        const rows = await conn.query('SELECT COUNT(status_id) as total, SUM(success) as successful FROM crawling_status WHERE process_id = ?', process_info.process_id);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                total_crawls = rows[row].total;
-                successful_crawls = rows[row].successful;
-            }
-        }
-
-        const failed_crawls = total_crawls - successful_crawls;
-
-        return {
-            process_id: process_info.process_id,
-            started_timestamp: process_info.started_timestamp,
-            combinations_to_crawl: process_info.combinations_to_crawl,
-            successful_crawls: successful_crawls,
-            failed_crawls: failed_crawls,
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};

Backend/src/models/crawling_status/crawling_statuses.interface.ts

@@ -1,5 +0,0 @@
-import {Crawling_Status} from './crawling_status.interface';
-
-export interface Crawling_Statuses {
-    [key: number]: Crawling_Status;
-}

Backend/src/models/favorite_shops/favoriteshop.interface.ts

@@ -1,5 +0,0 @@
-export interface FavoriteShop {
-    favorite_id: number;
-    vendor_id: number;
-    user_id: number;
-}

Backend/src/models/favorite_shops/favoriteshops.interface.ts

@@ -1,5 +0,0 @@
-import {FavoriteShop} from './favoriteshop.interface';
-
-export interface FavoriteShops {
-    [key: number]: FavoriteShop;
-}

Backend/src/models/favorite_shops/favoriteshops.router.ts

@@ -1,106 +0,0 @@
-/**
- * Required External Modules and Interfaces
- */
-
-import express, {Request, Response} from 'express';
-import * as FavoriteShopsService from './favoriteshops.service';
-import {FavoriteShop} from './favoriteshop.interface';
-import {FavoriteShops} from './favoriteshops.interface';
-import * as UserService from '../users/users.service';
-
-
-/**
- * Router Definition
- */
-export const favoriteshopsRouter = express.Router();
-
-
-/**
- * Controller Definitions
- */
-
-//GET favoriteshops/
-favoriteshopsRouter.get('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = (req.query.session_id ?? '').toString();
-        const session_key = (req.query.session_key ?? '').toString();
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        const priceAlarms = await FavoriteShopsService.getFavoriteShops(user.user_id);
-
-        res.status(200).send(priceAlarms);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// POST favoriteshops/
-favoriteshopsRouter.post('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get info for price alarm creation
-        const vendor_id = req.body.vendor_id;
-
-        if (!vendor_id) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Create price alarm
-        const success = await FavoriteShopsService.createFavoriteShop(user.user_id, vendor_id);
-
-        if (success) {
-            res.status(201).send(JSON.stringify({success: true}));
-            return;
-        } else {
-            res.status(500).send(JSON.stringify({success: false}));
-            return;
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// DELETE favoriteshops/
-favoriteshopsRouter.delete('/:id', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = (req.query.session_id ?? '').toString();
-        const session_key = (req.query.session_key ?? '').toString();
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get info for price alarm creation
-        const favorite_id = parseInt(req.params.id, 10);
-
-        if (!favorite_id) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Create price alarm
-        const success = await FavoriteShopsService.deleteFavoriteShop(user.user_id, favorite_id);
-
-        if (success) {
-            res.status(201).send(JSON.stringify({success: true}));
-            return;
-        } else {
-            res.status(500).send(JSON.stringify({success: false}));
-            return;
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/favorite_shops/favoriteshops.service.ts

@@ -1,92 +0,0 @@
-import * as dotenv from 'dotenv';
-
-dotenv.config();
-
-const mariadb = require('mariadb');
-const pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    connectionLimit: 5
-});
-
-/**
- * Data Model Interfaces
- */
-
-import {FavoriteShop} from './favoriteshop.interface';
-import {FavoriteShops} from './favoriteshops.interface';
-
-
-/**
- * Service Methods
- */
-
-/**
- * Creates a favorite shop entry for the given user for the given shop
- * @param user_id The id of the user to create the favorite shop entry for
- * @param vendor_id The id of the vendor to set as favorite
- */
-export const createFavoriteShop = async (user_id: number, vendor_id: number): Promise<boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-        const res = await conn.query('INSERT INTO favorite_shops (vendor_id, user_id) VALUES (?, ?)', [vendor_id, user_id]);
-
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Fetches and returns all favorite shops for the given user
- * @param user_id
- */
-export const getFavoriteShops = async (user_id: number): Promise<FavoriteShops> => {
-    let conn;
-    let shops = [];
-    try {
-        conn = await pool.getConnection();
-        const rows = await conn.query('SELECT favorite_id, vendor_id, user_id FROM favorite_shops WHERE user_id = ?', user_id);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                shops.push(rows[row]);
-            }
-        }
-
-        return shops;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Deletes the given favorite shop entry
- * @param user_id The id of the user that wants to delete the favorite shop entry
- * @param favorite_id The favorite shop to delete
- */
-export const deleteFavoriteShop = async (user_id: number, favorite_id: number): Promise<boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-        const res = await conn.query('DELETE FROM favorite_shops WHERE favorite_id = ? AND user_id = ?', [favorite_id, user_id]);
-
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};

Backend/src/models/manufacturers/manufacturers.router.ts

@@ -19,19 +19,20 @@ export const manufacturersRouter = express.Router();
  * Controller Definitions
  */
 
-// GET manufacturers/
+// GET items/
+
 manufacturersRouter.get('/', async (req: Request, res: Response) => {
     try {
         const manufacturers: Manufacturers = await ManufacturerService.findAll();
 
         res.status(200).send(manufacturers);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET manufacturers/:id
+// GET items/:id
+
 manufacturersRouter.get('/:id', async (req: Request, res: Response) => {
     const id: number = parseInt(req.params.id, 10);
 
@@ -45,12 +46,12 @@ manufacturersRouter.get('/:id', async (req: Request, res: Response) => {
 
         res.status(200).send(manufacturer);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET manufacturers/:term
+// GET items/:name
+
 manufacturersRouter.get('/search/:term', async (req: Request, res: Response) => {
     const term: string = req.params.term;
 
@@ -64,7 +65,48 @@ manufacturersRouter.get('/search/:term', async (req: Request, res: Response) =>
 
         res.status(200).send(manufacturer);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
+
+
+// POST items/
+
+// manufacturersRouter.post('/', async (req: Request, res: Response) => {
+//     try {
+//         const category: Category = req.body.category;
+//
+//         await CategoryService.create(category);
+//
+//         res.sendStatus(201);
+//     } catch (e) {
+//         res.status(404).send(e.message);
+//     }
+// });
+//
+// // PUT items/
+//
+// manufacturersRouter.put('/', async (req: Request, res: Response) => {
+//     try {
+//         const category: Category = req.body.category;
+//
+//         await CategoryService.update(category);
+//
+//         res.sendStatus(200);
+//     } catch (e) {
+//         res.status(500).send(e.message);
+//     }
+// });
+//
+// // DELETE items/:id
+//
+// manufacturersRouter.delete('/:id', async (req: Request, res: Response) => {
+//     try {
+//         const id: number = parseInt(req.params.id, 10);
+//         await CategoryService.remove(id);
+//
+//         res.sendStatus(200);
+//     } catch (e) {
+//         res.status(500).send(e.message);
+//     }
+// });

Backend/src/models/manufacturers/manufacturers.service.ts

@@ -23,9 +23,6 @@ import {Manufacturers} from './manufacturers.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known manufacturers
- */
 export const findAll = async (): Promise<Manufacturers> => {
     let conn;
     let manRows = [];
@@ -57,10 +54,6 @@ export const findAll = async (): Promise<Manufacturers> => {
     return manRows;
 };
 
-/**
- * Fetches and returns the manufacturer with the specified id
- * @param id The id of the manufacturer to fetch
- */
 export const find = async (id: number): Promise<Manufacturer> => {
     let conn;
     let man: any;
@@ -84,10 +77,6 @@ export const find = async (id: number): Promise<Manufacturer> => {
     return man;
 };
 
-/**
- * Fetches and returns all manufacturers that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Manufacturers> => {
     let conn;
     let manRows = [];
@@ -111,3 +100,36 @@ export const findBySearchTerm = async (term: string): Promise<Manufacturers> =>
 
     return manRows;
 };
+
+// export const create = async (newItem: Product): Promise<void> => {
+//     let conn;
+//     try {
+//         conn = await pool.getConnection();
+//         await conn.query("");
+//
+//     } catch (err) {
+//         throw err;
+//     } finally {
+//         if (conn) conn.end();
+//     }
+// };
+//
+// export const update = async (updatedItem: Product): Promise<void> => {
+//     if (models.products[updatedItem.product_id]) {
+//         models.products[updatedItem.product_id] = updatedItem;
+//         return;
+//     }
+//
+//     throw new Error("No record found to update");
+// };
+//
+// export const remove = async (id: number): Promise<void> => {
+//     const record: Product = models.products[id];
+//
+//     if (record) {
+//         delete models.products[id];
+//         return;
+//     }
+//
+//     throw new Error("No record found to delete");
+// };

Backend/src/models/pricealarms/pricealarm.interface.ts

@@ -1,6 +0,0 @@
-export interface PriceAlarm {
-    alarm_id: number;
-    user_id: number;
-    product_id: number;
-    defined_price: number;
-}

Backend/src/models/pricealarms/pricealarms.interface.ts

@@ -1,5 +0,0 @@
-import {PriceAlarm} from './pricealarm.interface';
-
-export interface PriceAlarms {
-    [key: number]: PriceAlarm;
-}

Backend/src/models/pricealarms/pricealarms.router.ts

@@ -1,108 +0,0 @@
-/**
- * Required External Modules and Interfaces
- */
-
-import express, {Request, Response} from 'express';
-import * as PriceAlarmsService from './pricealarms.service';
-import {PriceAlarm} from './pricealarm.interface';
-import {PriceAlarms} from './pricealarms.interface';
-import * as UserService from '../users/users.service';
-
-
-/**
- * Router Definition
- */
-export const pricealarmsRouter = express.Router();
-
-
-/**
- * Controller Definitions
- */
-
-//GET pricealarms/
-pricealarmsRouter.get('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = (req.query.session_id ?? '').toString();
-        const session_key = (req.query.session_key ?? '').toString();
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        const priceAlarms = await PriceAlarmsService.getPriceAlarms(user.user_id);
-
-        res.status(200).send(priceAlarms);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// POST pricealarms/
-pricealarmsRouter.post('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get info for price alarm creation
-        const product_id = req.body.product_id;
-        const defined_price = req.body.defined_price;
-
-        if (!product_id || !defined_price) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Create price alarm
-        const success = await PriceAlarmsService.createPriceAlarm(user.user_id, product_id, defined_price);
-
-        if (success) {
-            res.status(201).send(JSON.stringify({success: true}));
-            return;
-        } else {
-            res.status(500).send(JSON.stringify({success: false}));
-            return;
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// PUT pricealarms/
-pricealarmsRouter.put('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get info for price alarm creation
-        const alarm_id = req.body.alarm_id;
-        const defined_price = req.body.defined_price;
-
-        if (!alarm_id || !defined_price) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Update price alarm
-        const success = await PriceAlarmsService.updatePriceAlarm(alarm_id, user.user_id, defined_price);
-
-        if (success) {
-            res.status(200).send(JSON.stringify({success: true}));
-            return;
-        } else {
-            res.status(500).send(JSON.stringify({success: false}));
-            return;
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/pricealarms/pricealarms.service.ts

@@ -1,94 +0,0 @@
-import * as dotenv from 'dotenv';
-
-dotenv.config();
-
-const mariadb = require('mariadb');
-const pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    connectionLimit: 5
-});
-
-/**
- * Data Model Interfaces
- */
-
-import {PriceAlarm} from './pricealarm.interface';
-import {PriceAlarms} from './pricealarms.interface';
-
-
-/**
- * Service Methods
- */
-
-/**
- * Creates a price alarm for the given user for the product with the defined price
- * @param user_id The id of the user to create the price alarm for
- * @param product_id The id of the product to create the price alarm for
- * @param defined_price The defined price for the price alarm
- */
-export const createPriceAlarm = async (user_id: number, product_id: number, defined_price: number): Promise<boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-        const res = await conn.query('INSERT INTO price_alarms (user_id, product_id, defined_price) VALUES (?, ?, ?)', [user_id, product_id, defined_price]);
-
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Fetches and returns all price alarms for the given user
- * @param user_id
- */
-export const getPriceAlarms = async (user_id: number): Promise<PriceAlarms> => {
-    let conn;
-    let priceAlarms = [];
-    try {
-        conn = await pool.getConnection();
-        const rows = await conn.query('SELECT alarm_id, user_id, product_id, defined_price FROM price_alarms WHERE user_id = ?', user_id);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                priceAlarms.push(rows[row]);
-            }
-        }
-
-        return priceAlarms;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Updates the given price alarm with the given fields
- * @param alarm_id The id of the price alarm to update
- * @param user_id The id of the user that wants to update the price alarm
- * @param defined_price The defined price for the price alarm
- */
-export const updatePriceAlarm = async (alarm_id: number, user_id: number, defined_price: number): Promise<boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-        const res = await conn.query('UPDATE price_alarms SET defined_price = ? WHERE alarm_id = ? AND user_id = ?', [defined_price, alarm_id, user_id]);
-
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};

Backend/src/models/prices/price.interface.ts

@@ -5,23 +5,3 @@ export interface Price {
     price_in_cents: number;
     timestamp: Date;
 }
-
-export class Deal implements Price {
-    price_id: number;
-    product_id: number;
-    vendor_id: number;
-    price_in_cents: number;
-    timestamp: Date;
-    amazonDifference: number;
-    amazonDifferencePercent: number;
-
-    constructor(price_id: number, product_id: number, vendor_id: number, price_in_cents: number, timestamp: Date, amazonDifference: number, amazonDifferencePercent: number) {
-        this.price_id = price_id;
-        this.product_id = product_id;
-        this.vendor_id = vendor_id;
-        this.price_in_cents = price_in_cents;
-        this.timestamp = timestamp;
-        this.amazonDifference = amazonDifference;
-        this.amazonDifferencePercent = amazonDifferencePercent;
-    }
-}

Backend/src/models/prices/prices.router.ts

@@ -6,7 +6,6 @@ import express, {Request, Response} from 'express';
 import * as PriceService from './prices.service';
 import {Price} from './price.interface';
 import {Prices} from './prices.interface';
-import * as UserService from '../users/users.service';
 
 
 /**
@@ -20,32 +19,20 @@ export const pricesRouter = express.Router();
  * Controller Definitions
  */
 
-// GET prices/
+// GET items/
+
 pricesRouter.get('/', async (req: Request, res: Response) => {
     try {
-        let prices: Prices = [];
+        const prices: Prices = await PriceService.findAll();
-        const product = req.query.product;
-        const vendor = req.query.vendor;
-        const type = req.query.type;
-
-        if (product) {
-            if (vendor) {
-                prices = await PriceService.findByVendor(<string> product, <string> vendor, <string> type);
-            } else {
-                prices = await PriceService.findByType(<string> product, <string> type);
-            }
-        } else {
-            prices = await PriceService.findAll();
-        }
 
         res.status(200).send(prices);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET prices/:id
+// GET items/:id
+
 pricesRouter.get('/:id', async (req: Request, res: Response) => {
     const id: number = parseInt(req.params.id, 10);
 
@@ -59,72 +46,67 @@ pricesRouter.get('/:id', async (req: Request, res: Response) => {
 
         res.status(200).send(price);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET prices/bestDeals
+// GET items/:name
-pricesRouter.get('/bestDeals/:amount', async (req: Request, res: Response) => {
-    const amount: number = parseInt(req.params.amount, 10);
 
-    if (!amount) {
+pricesRouter.get('/products/:id', async (req: Request, res: Response) => {
+    const id: number = parseInt(req.params.id, 10);
+
+    if (!id) {
         res.status(400).send('Missing parameters.');
         return;
     }
 
     try {
-        const prices: Prices = await PriceService.getBestDeals(amount);
+        const prices: Prices = await PriceService.findByProduct(id);
 
         res.status(200).send(prices);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET prices/byProduct/list/[]
-pricesRouter.get('/byProduct/list/:ids', async (req: Request, res: Response) => {
-    const productIds: [number] = JSON.parse(req.params.ids);
 
-    if (!productIds) {
+// POST items/
-        res.status(400).send('Missing parameters.');
-        return;
-    }
 
-    try {
+// pricesRouter.post('/', async (req: Request, res: Response) => {
-        const prices: Prices = await PriceService.findListByProducts(productIds);
+//     try {
-
+//         const category: Category = req.body.category;
-        res.status(200).send(prices);
+//
-    } catch (e) {
+//         await CategoryService.create(category);
-        console.log('Error handling a request: ' + e.message);
+//
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+//         res.sendStatus(201);
-    }
+//     } catch (e) {
-});
+//         res.status(404).send(e.message);
-
+//     }
-// POST prices/
+// });
-pricesRouter.post('/', async (req: Request, res: Response) => {
+//
-    try {
+// // PUT items/
-        // Authenticate user
+//
-        const user_ip = req.connection.remoteAddress ?? '';
+// pricesRouter.put('/', async (req: Request, res: Response) => {
-        const session_id = req.body.session_id;
+//     try {
-        const session_key = req.body.session_key;
+//         const category: Category = req.body.category;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
+//
-
+//         await CategoryService.update(category);
-        // Get required parameters
+//
-        const vendor_id = req.body.vendor_id;
+//         res.sendStatus(200);
-        const product_id = req.body.product_id;
+//     } catch (e) {
-        const price_in_cents = req.body.price_in_cents;
+//         res.status(500).send(e.message);
-
+//     }
-        const success = await PriceService.createPriceEntry(user.user_id, vendor_id, product_id, price_in_cents);
+// });
-
+//
-        if (success) {
+// // DELETE items/:id
-            res.status(201).send({});
+//
-        } else {
+// pricesRouter.delete('/:id', async (req: Request, res: Response) => {
-            res.status(500).send({});
+//     try {
-        }
+//         const id: number = parseInt(req.params.id, 10);
-    } catch (e) {
+//         await CategoryService.remove(id);
-        console.log('Error handling a request: ' + e.message);
+//
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+//         res.sendStatus(200);
-    }
+//     } catch (e) {
-});
+//         res.status(500).send(e.message);
+//     }
+// });

Backend/src/models/prices/prices.service.ts

@@ -15,7 +15,7 @@ const pool = mariadb.createPool({
  * Data Model Interfaces
  */
 
-import {Deal, Price} from './price.interface';
+import {Price} from './price.interface';
 import {Prices} from './prices.interface';
 
 
@@ -23,15 +23,12 @@ import {Prices} from './prices.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known prices
- */
 export const findAll = async (): Promise<Prices> => {
     let conn;
     let priceRows = [];
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT price_id, product_id, v.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE active_listing = true AND v.isActive = true');
+        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices');
         for (let row in rows) {
             if (row !== 'meta') {
                 let price: Price = {
@@ -63,16 +60,12 @@ export const findAll = async (): Promise<Prices> => {
     return priceRows;
 };
 
-/**
- * Fetches and returns the price with the specified id
- * @param id The id of the price to fetch
- */
 export const find = async (id: number): Promise<Price> => {
     let conn;
     let price: any;
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE price_id = ? AND active_listing = true AND v.isActive = true', id);
+        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE price_id = ?', id);
         for (let row in rows) {
             if (row !== 'meta') {
                 price = rows[row];
@@ -90,16 +83,12 @@ export const find = async (id: number): Promise<Price> => {
     return price;
 };
 
-/**
- * Fetches and returns all prices that belong to the specified product
- * @param product the product to fetch the prices for
- */
 export const findByProduct = async (product: number): Promise<Prices> => {
     let conn;
     let priceRows = [];
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND active_listing = true AND v.isActive = true', product);
+        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ?', product);
         for (let row in rows) {
             if (row !== 'meta') {
                 priceRows.push(rows[row]);
@@ -117,286 +106,35 @@ export const findByProduct = async (product: number): Promise<Prices> => {
     return priceRows;
 };
 
-/**
+// export const create = async (newItem: Product): Promise<void> => {
- * Fetches and returns prices that belong to the specified product.
+//     let conn;
- * If type is newest, only the newest prices for each vendor will be returned.
+//     try {
- * If type is lowest, the lowest daily price for the product is returned.
+//         conn = await pool.getConnection();
- * Otherwise, all prices for this product are returned.
+//         await conn.query("");
- * @param product The product to fetch the prices for
+//
- * @param type The type of prices, e.g. newest / lowest
+//     } catch (err) {
- */
+//         throw err;
-export const findByType = async (product: string, type: string): Promise<Prices> => {
+//     } finally {
-    let conn;
+//         if (conn) conn.end();
-    let priceRows = [];
+//     }
-    try {
+// };
-        conn = await pool.getConnection();
+//
-        let rows = [];
+// export const update = async (updatedItem: Product): Promise<void> => {
-        if (type === 'newest') {
+//     if (models.products[updatedItem.product_id]) {
-            // Used to get the newest price for this product per vendor
+//         models.products[updatedItem.product_id] = updatedItem;
-            rows = await conn.query(('WITH summary AS ( ' +
+//         return;
-                'SELECT p.product_id, ' +
+//     }
-                'p.vendor_id, ' +
+//
-                'p.price_in_cents, ' +
+//     throw new Error("No record found to update");
-                'p.timestamp, ' +
+// };
-                'ROW_NUMBER() OVER( ' +
+//
-                'PARTITION BY p.vendor_id ' +
+// export const remove = async (id: number): Promise<void> => {
-                'ORDER BY p.timestamp DESC) AS rk ' +
+//     const record: Product = models.products[id];
-                'FROM prices p ' +
+//
-                'LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id ' +
+//     if (record) {
-                'WHERE product_id = ? AND p.vendor_id != 1 AND active_listing = true AND v.isActive = true) ' +
+//         delete models.products[id];
-                'SELECT s.* ' +
+//         return;
-                'FROM summary s ' +
+//     }
-                'WHERE s.rk = 1 '), product);
+//
-        } else if (type === 'lowest') {
+//     throw new Error("No record found to delete");
-            // Used to get the lowest prices for this product over a period of time
+// };
-            rows = await conn.query('SELECT price_id, product_id, p.vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND v.vendor_id != 1 AND active_listing = true AND v.isActive = true GROUP BY DAY(timestamp) ORDER BY timestamp', product);
-        } else {
-            // If no type is given, return all prices for this product
-            rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND p.vendor_id != 1 AND active_listing = true AND v.isActive = true', product);
-        }
-
-        for (let row in rows) {
-            if (row !== 'meta') {
-                priceRows.push(rows[row]);
-            }
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return priceRows;
-};
-
-/**
- * Fetches and returns prices that belong to the specified product and vendor.
- * If type is newest, only the newest known price for the product at the vendor is returned.
- * If type is lowest, only the lowest ever known price for the product at the vendor is returned.
- * Otherwise, all prices for this product are returned.
- * @param product The product to fetch the prices for
- * @param vendor The vendor to fetch the prices for
- * @param type The type of prices, e.g. newest / lowest
- */
-export const findByVendor = async (product: string, vendor: string, type: string): Promise<Prices> => {
-    let conn;
-    let priceRows = [];
-    try {
-        conn = await pool.getConnection();
-        let rows = [];
-        if (type === 'newest') {
-            // Used to get the newest price for this product and vendor
-            rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND p.vendor_id = ? AND active_listing = true AND v.isActive = true ORDER BY timestamp DESC LIMIT 1', [product, vendor]);
-        } else if (type === 'lowest') {
-            // Used to get the lowest prices for this product and vendor in all time
-            rows = await conn.query('SELECT price_id, product_id, p.vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND p.vendor_id = ? AND active_listing = true AND v.isActive = true LIMIT 1', [product, vendor]);
-        } else {
-            // If no type is given, return all prices for this product and vendor
-            rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND p.vendor_id = ? AND active_listing = true AND v.isActive = true', [product, vendor]);
-        }
-
-        for (let row in rows) {
-            if (row !== 'meta') {
-                priceRows.push(rows[row]);
-            }
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return priceRows;
-};
-
-/**
- * Fetches and returns the best current deals, i.e. the non-amazon prices that have the biggest difference to amazon prices.
- * Only the latest known prices for every vendor are taken into consideration so we only get up-to-date-deals.
- * @param amount The amount of deals to return
- */
-export const getBestDeals = async (amount: number): Promise<Prices> => {
-    let conn;
-    let priceRows = [];
-    try {
-        conn = await pool.getConnection();
-
-        let allPrices: Record<number, Price[]> = {};
-
-        // Get newest prices for every product at every vendor
-        const rows = await conn.query(
-            'WITH summary AS (\n' +
-            '    SELECT p.product_id,\n' +
-            '           p.vendor_id,\n' +
-            '           p.price_in_cents,\n' +
-            '           p.timestamp,\n' +
-            '           ROW_NUMBER() OVER(\n' +
-            '               PARTITION BY p.product_id, p.vendor_id\n' +
-            '               ORDER BY p.timestamp DESC) AS rk\n' +
-            '    FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE active_listing = true AND v.isActive = true)\n' +
-            'SELECT s.*\n' +
-            'FROM summary s\n' +
-            'WHERE s.rk = 1');
-
-        // Write returned values to allPrices map with product id as key and a list of prices as value
-        for (let row in rows) {
-            if (row !== 'meta') {
-                if (!allPrices[parseInt(rows[row].product_id)]) {
-                    allPrices[parseInt(rows[row].product_id)] = [];
-                }
-
-                allPrices[parseInt(rows[row].product_id)].push(rows[row]);
-            }
-        }
-
-        // Iterate over all prices to find the products with the biggest difference between amazon and other vendor
-        let deals: Deal[] = [];
-
-        Object.keys(allPrices).forEach(productId => {
-            if (allPrices[parseInt(productId)]) {
-                let pricesForProd = allPrices[parseInt(productId)];
-
-                // Get amazon price and lowest price from other vendor
-                let amazonPrice = {} as Price;
-                let lowestPrice = {} as Price;
-                pricesForProd.forEach(function(price, priceIndex) {
-                    if (price.vendor_id === 1) {
-                        amazonPrice = price;
-                    } else {
-                        // If there is no lowest price yet or the price of the current iteration is lower, set / replace it
-                        if (!lowestPrice.price_in_cents || lowestPrice.price_in_cents > price.price_in_cents) {
-                            lowestPrice = price;
-                        }
-                    }
-                });
-
-                // Create deal object and add it to list
-                let deal = {
-                    'product_id': lowestPrice.product_id,
-                    'vendor_id': lowestPrice.vendor_id,
-                    'price_in_cents': lowestPrice.price_in_cents,
-                    'timestamp': lowestPrice.timestamp,
-                    'amazonDifference': (amazonPrice.price_in_cents - lowestPrice.price_in_cents),
-                    'amazonDifferencePercent': ((1 - (lowestPrice.price_in_cents / amazonPrice.price_in_cents)) * 100),
-                };
-
-                // Push only deals were the amazon price is actually higher
-                if (deal.amazonDifferencePercent > 0) {
-                    deals.push(deal as Deal);
-                }
-            }
-        });
-
-        // Sort to have the best deals on the top
-        deals.sort((a, b) => a.amazonDifferencePercent! < b.amazonDifferencePercent! ? 1 : -1);
-
-        // Return only as many records as requested or the maximum amount of found deals, whatever is less
-        let maxAmt = Math.min(amount, deals.length);
-
-        for (let dealIndex = 0; dealIndex < maxAmt; dealIndex++) {
-            priceRows.push(deals[dealIndex] as Price);
-        }
-    } catch (err) {
-        console.log(err);
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return priceRows;
-};
-
-/**
- * Fetches and returns the lowest, latest, non-amazon price for each given product
- * @param productIds the ids of the products
- */
-export const findListByProducts = async (productIds: [number]): Promise<Prices> => {
-    let conn;
-    let priceRows: Price[] = [];
-    try {
-        conn = await pool.getConnection();
-
-        let allPrices: Record<number, Price[]> = {};
-
-        // Get newest prices for every given product at every vendor
-        const rows = await conn.query(
-            'WITH summary AS (\n' +
-            '    SELECT p.product_id,\n' +
-            '           p.vendor_id,\n' +
-            '           p.price_in_cents,\n' +
-            '           p.timestamp,\n' +
-            '           ROW_NUMBER() OVER(\n' +
-            '               PARTITION BY p.product_id, p.vendor_id\n' +
-            '               ORDER BY p.timestamp DESC) AS rk\n' +
-            '    FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id ' +
-            '    WHERE p.product_id IN (?) AND v.isActive = true' +
-            '    AND p.vendor_id != 1 AND active_listing = true)\n' +
-            'SELECT s.*\n' +
-            'FROM summary s\n' +
-            'WHERE s.rk = 1', [productIds]);
-
-        // Write returned values to allPrices map with product id as key and a list of prices as value
-        for (let row in rows) {
-            if (row !== 'meta') {
-                if (!allPrices[parseInt(rows[row].product_id)]) {
-                    allPrices[parseInt(rows[row].product_id)] = [];
-                }
-
-                allPrices[parseInt(rows[row].product_id)].push(rows[row]);
-            }
-        }
-
-        // Iterate over all products to find lowest price
-        Object.keys(allPrices).forEach(productId => {
-            if (allPrices[parseInt(productId)]) {
-                let pricesForProd = allPrices[parseInt(productId)];
-
-                // Sort ascending by price so index 0 has the lowest price
-                pricesForProd.sort((a, b) => a.price_in_cents > b.price_in_cents ? 1 : -1);
-
-                // Push the lowest price to the return list
-                priceRows.push(pricesForProd[0]);
-            }
-        });
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return priceRows;
-};
-
-export const createPriceEntry = async (user_id: number, vendor_id: number, product_id: number, price_in_cents: number): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Check if the user is authorized to manage the requested vendor
-        const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
-        if (user_vendor_rows.length !== 1) {
-            return false;
-        }
-
-        // Create price entry
-        const res = await conn.query('INSERT INTO prices (product_id, vendor_id, price_in_cents) VALUES (?,?,?)', [product_id, vendor_id, price_in_cents]);
-
-        // If there are more / less than 1 affected rows, return false
-        return res.affectedRows === 1;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};

Backend/src/models/products/products.router.ts

@@ -19,19 +19,20 @@ export const productsRouter = express.Router();
  * Controller Definitions
  */
 
-// GET products/
+// GET items/
+
 productsRouter.get('/', async (req: Request, res: Response) => {
     try {
         const products: Products = await ProductService.findAll();
 
         res.status(200).send(products);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET products/:id
+// GET items/:id
+
 productsRouter.get('/:id', async (req: Request, res: Response) => {
     const id: number = parseInt(req.params.id, 10);
 
@@ -45,12 +46,12 @@ productsRouter.get('/:id', async (req: Request, res: Response) => {
 
         res.status(200).send(product);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET products/search/:term
+// GET items/:name
+
 productsRouter.get('/search/:term', async (req: Request, res: Response) => {
     const term: string = req.params.term;
 
@@ -64,68 +65,48 @@ productsRouter.get('/search/:term', async (req: Request, res: Response) => {
 
         res.status(200).send(products);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET products/list/[1,2,3]
-productsRouter.get('/list/:ids', async (req: Request, res: Response) => {
-    const ids: [number] = JSON.parse(req.params.ids);
 
-    if (!ids) {
+// POST items/
-        res.status(400).send('Missing parameters.');
-        return;
-    }
 
-    try {
+// productsRouter.post('/', async (req: Request, res: Response) => {
-        const products: Products = await ProductService.findList(ids);
+//     try {
-
+//         const product: Product = req.body.product;
-        res.status(200).send(products);
+//
-    } catch (e) {
+//         await ProductService.create(product);
-        console.log('Error handling a request: ' + e.message);
+//
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+//         res.sendStatus(201);
-    }
+//     } catch (e) {
-});
+//         res.status(404).send(e.message);
-
+//     }
-// GET products/vendor/:id
+// });
-productsRouter.get('/vendor/:id', async (req: Request, res: Response) => {
+//
-    const id: number = parseInt(req.params.id, 10);
+// // PUT items/
-
+//
-    if (!id) {
+// productsRouter.put('/', async (req: Request, res: Response) => {
-        res.status(400).send('Missing parameters.');
+//     try {
-        return;
+//         const product: Product = req.body.product;
-    }
+//
-
+//         await ProductService.update(product);
-    try {
+//
-        const products: Products = await ProductService.findByVendor(id);
+//         res.sendStatus(200);
-
+//     } catch (e) {
-        res.status(200).send(products);
+//         res.status(500).send(e.message);
-    } catch (e) {
+//     }
-        console.log('Error handling a request: ' + e.message);
+// });
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+//
-    }
+// // DELETE items/:id
-});
+//
-
+// productsRouter.delete('/:id', async (req: Request, res: Response) => {
-// POST products/
+//     try {
-productsRouter.post('/', async (req: Request, res: Response) => {
+//         const id: number = parseInt(req.params.id, 10);
-    const asin: string = req.body.asin;
+//         await ProductService.remove(id);
-
+//
-    if (!asin) {
+//         res.sendStatus(200);
-        res.status(400).send('Missing parameters.');
+//     } catch (e) {
-        return;
+//         res.status(500).send(e.message);
-    }
+//     }
-
+// });
-    try {
-        const result: boolean = await ProductService.addNewProduct(asin);
-
-        if (result) {
-            res.status(201).send({});
-        } else {
-            res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/products/products.service.ts

@@ -17,16 +17,12 @@ const pool = mariadb.createPool({
 
 import {Product} from './product.interface';
 import {Products} from './products.interface';
-import * as http from 'http';
 
 
 /**
  * Service Methods
  */
 
-/**
- * Fetches and returns all known products
- */
 export const findAll = async (): Promise<Products> => {
     let conn;
     let prodRows = [];
@@ -78,10 +74,6 @@ export const findAll = async (): Promise<Products> => {
     return prodRows;
 };
 
-/**
- * Fetches and returns the product with the specified id
- * @param id The id of the product to fetch
- */
 export const find = async (id: number): Promise<Product> => {
     let conn;
     let prod: any;
@@ -105,10 +97,6 @@ export const find = async (id: number): Promise<Product> => {
     return prod;
 };
 
-/**
- * Fetches and returns all products that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Products> => {
     let conn;
     let prodRows = [];
@@ -134,96 +122,35 @@ export const findBySearchTerm = async (term: string): Promise<Products> => {
     return prodRows;
 };
 
-/**
+// export const create = async (newItem: Product): Promise<void> => {
- * Fetches and returns the product details for the given list of product ids
+//     let conn;
- * @param ids The list of product ids to fetch the details for
+//     try {
- */
+//         conn = await pool.getConnection();
-export const findList = async (ids: [number]): Promise<Products> => {
+//         await conn.query("");
-    let conn;
+//
-    let prodRows = [];
+//     } catch (err) {
-    try {
+//         throw err;
-        conn = await pool.getConnection();
+//     } finally {
-        const rows = await conn.query('SELECT product_id, name, asin, is_active, short_description, long_description, image_guid, date_added, last_modified, manufacturer_id, selling_rank, category_id FROM products WHERE product_id IN (?)', [ids]);
+//         if (conn) conn.end();
-        for (let row in rows) {
+//     }
-            if (row !== 'meta') {
+// };
-                prodRows.push(rows[row]);
+//
-            }
+// export const update = async (updatedItem: Product): Promise<void> => {
-        }
+//     if (models.products[updatedItem.product_id]) {
-
+//         models.products[updatedItem.product_id] = updatedItem;
-    } catch (err) {
+//         return;
-        throw err;
+//     }
-    } finally {
+//
-        if (conn) {
+//     throw new Error("No record found to update");
-            conn.end();
+// };
-        }
+//
-    }
+// export const remove = async (id: number): Promise<void> => {
-
+//     const record: Product = models.products[id];
-    return prodRows;
+//
-};
+//     if (record) {
-
+//         delete models.products[id];
-/**
+//         return;
- * Fetches and returns the products that the given vendor has price entries for
+//     }
- * @param id The id of the vendor to fetch the products for
+//
- */
+//     throw new Error("No record found to delete");
-export const findByVendor = async (id: number): Promise<Products> => {
+// };
-    let conn;
-    let prodRows = [];
-    try {
-        conn = await pool.getConnection();
-
-        // Get the relevant product ids
-        let relevant_prod_ids = [];
-        const relevantProds = await conn.query('SELECT product_id FROM prices WHERE vendor_id = ? GROUP BY product_id', id);
-        for (let row in relevantProds) {
-            if (row !== 'meta') {
-                relevant_prod_ids.push(relevantProds[row].product_id);
-            }
-        }
-
-        // Fetch products
-        const rows = await conn.query('SELECT product_id, name, asin, is_active, short_description, long_description, image_guid, date_added, last_modified, manufacturer_id, selling_rank, category_id FROM products WHERE product_id IN (?)', [relevant_prod_ids]);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                prodRows.push(rows[row]);
-            }
-        }
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return prodRows;
-};
-
-/**
- * Makes a callout to a crawler instance to search for the requested product
- * @param asin The amazon asin of the product to look for
- */
-export const addNewProduct = async (asin: string): Promise<boolean> => {
-    try {
-        let options = {
-            host: 'crawl.p4ddy.com',
-            path: '/searchNew',
-            port: '443',
-            method: 'POST'
-        };
-
-        let req = http.request(options, res => {
-            return res.statusCode === 202;
-        });
-        req.write(JSON.stringify({
-            asin: asin,
-            key: process.env.CRAWLER_ACCESS_KEY
-        }));
-        req.end();
-    } catch (err) {
-        console.log(err);
-        throw(err);
-    }
-
-    return false;
-};

Backend/src/models/users/session.interface.ts

@@ -1,10 +0,0 @@
-export interface Session {
-    session_id: number;
-    session_key: string;
-    session_key_hash: string;
-    createdDate?: Date;
-    lastLogin?: Date;
-    validUntil?: Date;
-    validDays?: number;
-    last_IP: string;
-}

Backend/src/models/users/user.interface.ts

@@ -1,9 +0,0 @@
-export interface User {
-    user_id: number;
-    username: string;
-    email: string;
-    password_hash: string;
-    registration_date: Date;
-    last_login_date: Date;
-    is_admin: boolean;
-}

Backend/src/models/users/users.interface.ts

@@ -1,5 +0,0 @@
-import {User} from './user.interface';
-
-export interface Users {
-    [key: number]: User;
-}

Backend/src/models/users/users.router.ts

@@ -1,121 +0,0 @@
-/**
- * Required External Modules and Interfaces
- */
-
-import express, {Request, Response} from 'express';
-import * as UserService from './users.service';
-import {User} from './user.interface';
-import {Users} from './users.interface';
-import {Session} from './session.interface';
-
-
-/**
- * Router Definition
- */
-
-export const usersRouter = express.Router();
-
-
-/**
- * Controller Definitions
- */
-
-// POST users/register
-usersRouter.post('/register', async (req: Request, res: Response) => {
-    try {
-        const username: string = req.body.username;
-        const password: string = req.body.password;
-        const email: string = req.body.email;
-        const ip: string = req.connection.remoteAddress ?? '';
-
-        if (!username || !password || !email) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Check if username and / or email are already used
-        const status = await UserService.checkUsernameAndEmail(username, email);
-
-        if (status.hasProblems) {
-            // Username and/or email are duplicates, return error
-            res.status(400).send(JSON.stringify({messages: status.messages, codes: status.codes}));
-            return;
-        }
-
-        // Create the user and a session
-        const session: Session = await UserService.createUser(username, password, email, ip);
-
-        // Send the session details back to the user
-        res.status(201).send({
-            session_id: session.session_id,
-            session_key: session.session_key
-        });
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// POST users/login
-usersRouter.post('/login', async (req: Request, res: Response) => {
-    try {
-        const username: string = req.body.username;
-        const password: string = req.body.password;
-        const ip: string = req.connection.remoteAddress ?? '';
-
-        if (!username || !password) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Update the user entry and create a session
-        const session: Session = await UserService.login(username, password, ip);
-
-        if (!session.session_id) {
-            // Error logging in, probably wrong username / password
-            res.status(401).send(JSON.stringify({messages: ['Wrong username and / or password'], codes: [1, 4]}));
-            return;
-        }
-
-        // Send the session details back to the user
-        res.status(200).send({
-            session_id: session.session_id,
-            session_key: session.session_key
-        });
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// POST users/checkSessionValid
-usersRouter.post('/checkSessionValid', async (req: Request, res: Response) => {
-    try {
-        const ip: string = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-
-        if(!session_id || !session_key) {
-            // Error logging in, probably wrong username / password
-            res.status(401).send(JSON.stringify({messages: ['No session detected'], codes: [5]}));
-            return;
-        }
-
-        // Update the user entry and create a session
-        const user: User = await UserService.checkSession(session_id, session_key, ip);
-
-        if (!user.user_id) {
-            // Error logging in, probably wrong username / password
-            res.status(401).send(JSON.stringify({messages: ['Invalid session'], codes: [5]}));
-            return;
-        }
-
-        // Send the session details back to the user
-        res.status(200).send(user);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/users/users.service.ts

@@ -1,316 +0,0 @@
-import * as dotenv from 'dotenv';
-import * as bcrypt from 'bcrypt';
-import {Guid} from 'guid-typescript';
-
-
-dotenv.config();
-
-const mariadb = require('mariadb');
-const pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    connectionLimit: 5
-});
-
-/**
- * Data Model Interfaces
- */
-
-import {User} from './user.interface';
-import {Users} from './users.interface';
-import {Session} from './session.interface';
-
-
-/**
- * Service Methods
- */
-
-/**
- * Creates a user record in the database, also creates a session. Returns the session if successful.
- */
-export const createUser = async (username: string, password: string, email: string, ip: string): Promise<Session> => {
-    let conn;
-    try {
-        // Hash password and generate + hash session key
-        const pwHash = bcrypt.hashSync(password, 10);
-        const sessionKey = Guid.create().toString();
-        const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
-
-        // Create user entry in SQL
-        conn = await pool.getConnection();
-        const userQuery = 'INSERT INTO users (username, email, bcrypt_password_hash) VALUES (?, ?, ?) RETURNING user_id';
-        const userIdRes = await conn.query(userQuery, [username, email, pwHash]);
-        await conn.commit();
-
-        // Get user id of the created user
-        let userId: number = -1;
-        for (const row in userIdRes) {
-            if (row !== 'meta' && userIdRes[row].user_id != null) {
-                userId = userIdRes[row].user_id;
-            }
-        }
-
-        // Create session
-        const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, createdDate, lastLogin, validUntil, validDays, last_IP) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 30 DAY),30,?) RETURNING session_id';
-        const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip]);
-        await conn.commit();
-
-        // Get session id of the created session
-        let sessionId: number = -1;
-        for (const row in sessionIdRes) {
-            if (row !== 'meta' && sessionIdRes[row].session_id != null) {
-                sessionId = sessionIdRes[row].session_id;
-            }
-        }
-
-        return {
-            session_id: sessionId,
-            session_key: sessionKey,
-            session_key_hash: 'HIDDEN',
-            last_IP: ip
-        };
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return {} as Session;
-};
-
-/**
- * Checks if the given credentials are valid and creates a new session if they are.
- * Returns the session information in case of a successful login
- */
-export const login = async (username: string, password: string, ip: string): Promise<Session> => {
-    let conn;
-    try {
-        // Get saved password hash
-        conn = await pool.getConnection();
-        const query = 'SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?';
-        const userRows = await conn.query(query, username);
-        let savedHash = '';
-        let userId = -1;
-        for (const row in userRows) {
-            if (row !== 'meta' && userRows[row].user_id != null) {
-                savedHash = userRows[row].bcrypt_password_hash;
-                userId = userRows[row].user_id;
-            }
-        }
-
-        // Check for correct password
-        if (!bcrypt.compareSync(password, savedHash)) {
-            // Wrong password, return invalid
-            return {} as Session;
-        }
-        // Password is valid, continue
-
-        // Generate + hash session key
-        const sessionKey = Guid.create().toString();
-        const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
-
-        // Update user entry in SQL
-        const userQuery = 'UPDATE users SET last_login_date = NOW() WHERE user_id = ?';
-        const userIdRes = await conn.query(userQuery, userId);
-        await conn.commit();
-
-        // Create session
-        const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, createdDate, lastLogin, validUntil, validDays, last_IP) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 30 DAY),30,?) RETURNING session_id';
-        const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip]);
-        await conn.commit();
-
-        // Get session id of the created session
-        let sessionId: number = -1;
-        for (const row in sessionIdRes) {
-            if (row !== 'meta' && sessionIdRes[row].session_id != null) {
-                sessionId = sessionIdRes[row].session_id;
-            }
-        }
-
-        return {
-            session_id: sessionId,
-            session_key: sessionKey,
-            session_key_hash: 'HIDDEN',
-            last_IP: ip
-        };
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return {} as Session;
-};
-
-/**
- * Checks if the given session information are valid and returns the user information if they are
- */
-export const checkSession = async (sessionId: string, sessionKey: string, ip: string): Promise<User> => {
-    let conn;
-    try {
-        // Get saved session key hash
-        conn = await pool.getConnection();
-        const query = 'SELECT user_id, session_key_hash, validUntil FROM sessions WHERE session_id = ?';
-        const sessionRows = await conn.query(query, sessionId);
-        let savedHash = '';
-        let userId = -1;
-        let validUntil = new Date();
-        for (const row in sessionRows) {
-            if (row !== 'meta' && sessionRows[row].user_id != null) {
-                savedHash = sessionRows[row].session_key_hash;
-                userId = sessionRows[row].user_id;
-                validUntil = sessionRows[row].validUntil;
-            }
-        }
-
-        // Check for correct key
-        if (!bcrypt.compareSync(sessionKey, savedHash)) {
-            // Wrong key, return invalid
-            return {} as User;
-        }
-        // Key is valid, continue
-
-        // Check if the session is still valid
-        if (validUntil <= new Date()) {
-            // Session expired, return invalid
-            return {} as User;
-        }
-        // Session still valid, continue
-
-        // Update session entry in SQL
-        const updateSessionsQuery = 'UPDATE sessions SET lastLogin = NOW(), last_IP = ? WHERE session_id = ?';
-        const updateUsersQuery = 'UPDATE users SET last_login_date = NOW() WHERE user_id = ?';
-        const userIdRes = await conn.query(updateSessionsQuery, [ip, sessionId]);
-        await conn.query(updateUsersQuery, userId);
-        await conn.commit();
-
-        // Get the other required user information and update the user
-        const userQuery = 'SELECT user_id, username, email, registration_date, last_login_date, is_admin FROM users WHERE user_id = ?';
-        const userRows = await conn.query(userQuery, userId);
-        let username = '';
-        let email = '';
-        let registrationDate = new Date();
-        let lastLoginDate = new Date();
-        let is_admin = false;
-        for (const row in userRows) {
-            if (row !== 'meta' && userRows[row].user_id != null) {
-                username = userRows[row].username;
-                email = userRows[row].email;
-                registrationDate = userRows[row].registration_date;
-                lastLoginDate = userRows[row].last_login_date;
-                is_admin = userRows[row].is_admin;
-            }
-        }
-
-        // Everything is fine, return user information
-        return {
-            user_id: userId,
-            username: username,
-            email: email,
-            password_hash: 'HIDDEN',
-            registration_date: registrationDate,
-            last_login_date: lastLoginDate,
-            is_admin: is_admin
-        };
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Calls the checkSession method after extracting the required information from the authentication cookie
- * @param cookie The betterauth cookie
- * @param ip The users IP address
- */
-export const checkSessionWithCookie = async (cookie: any, ip: string): Promise<User> => {
-    const parsedCookie = JSON.parse(cookie);
-    const session_id = parsedCookie.id;
-    const session_key = parsedCookie.key;
-
-
-    return checkSession(session_id, session_key, '');
-};
-
-/**
- * Used in the checkUsernameAndEmail method as return value
- */
-export interface Status {
-    hasProblems: boolean;
-    messages: string[];
-    codes: number[]; // 0 = all good, 1 = wrong username, 2 = wrong email, 3 = server error, 4 = wrong password, 5 = wrong session
-}
-
-/**
- * Checks if the given username and email are not used yet by another user
- * @param username The username to check
- * @param email The email to check
- */
-export const checkUsernameAndEmail = async (username: string, email: string): Promise<Status> => {
-    let conn;
-    try {
-        // Create user entry in SQL
-        conn = await pool.getConnection();
-        const usernameQuery = 'SELECT username FROM users WHERE username = ?';
-        const emailQuery = 'SELECT email FROM users WHERE email = ?';
-        const usernameRes = await conn.query(usernameQuery, username);
-        const emailRes = await conn.query(emailQuery, email);
-
-        let res: Status = {
-            hasProblems: false,
-            messages: [],
-            codes: []
-        };
-
-        const usernameRegex = RegExp('^[a-zA-Z0-9\\-\\_]{4,20}$'); // Can contain a-z, A-Z, 0-9, -, _ and has to be 4-20 chars long
-        if (!usernameRegex.test(username)) {
-            // Username doesn't match requirements
-            res.hasProblems = true;
-            res.messages.push('Invalid username');
-            res.codes.push(1);
-        }
-
-        const emailRegex = RegExp('^[a-zA-Z0-9\\-\\_.]{1,30}\\@[a-zA-Z0-9\\-.]{1,20}\\.[a-z]{1,20}$'); // Normal email regex, user@betterzon.xyz
-        if (!emailRegex.test(email)) {
-            // Username doesn't match requirements
-            res.hasProblems = true;
-            res.messages.push('Invalid email');
-            res.codes.push(2);
-        }
-
-        if (usernameRes.length > 0) {
-            // Username is a duplicate
-            res.hasProblems = true;
-            res.messages.push('Duplicate username');
-            res.codes.push(1);
-        }
-
-        if (emailRes.length > 0) {
-            // Email is a duplicate
-            res.hasProblems = true;
-            res.messages.push('Duplicate email');
-            res.codes.push(2);
-        }
-
-        return res;
-
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};

Backend/src/models/vendors/vendors.router.ts

@@ -6,7 +6,6 @@ import express, {Request, Response} from 'express';
 import * as VendorService from './vendors.service';
 import {Vendor} from './vendor.interface';
 import {Vendors} from './vendors.interface';
-import * as UserService from '../users/users.service';
 
 
 /**
@@ -20,37 +19,20 @@ export const vendorsRouter = express.Router();
  * Controller Definitions
  */
 
-// GET vendors/
+// GET items/
+
 vendorsRouter.get('/', async (req: Request, res: Response) => {
     try {
         const vendors: Vendors = await VendorService.findAll();
 
         res.status(200).send(vendors);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET vendors/managed
+// GET items/:id
-vendorsRouter.get('/managed', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = (req.query.session_id ?? '').toString();
-        const session_key = (req.query.session_key ?? '').toString();
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
 
-        const vendors = await VendorService.getManagedShops(user.user_id);
-
-        res.status(200).send(vendors);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// GET vendors/:id
 vendorsRouter.get('/:id', async (req: Request, res: Response) => {
     const id: number = parseInt(req.params.id, 10);
 
@@ -64,12 +46,12 @@ vendorsRouter.get('/:id', async (req: Request, res: Response) => {
 
         res.status(200).send(vendor);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// GET vendors/search/:term
+// GET items/:name
+
 vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
     const term: string = req.params.term;
 
@@ -83,83 +65,48 @@ vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
 
         res.status(200).send(vendors);
     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+        res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });
 
-// PUT vendors/manage/deactivatelisting
-vendorsRouter.put('/manage/deactivatelisting', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
 
-        // Get required parameters
+// POST items/
-        const vendor_id = req.body.vendor_id;
-        const product_id = req.body.product_id;
 
-        const success = await VendorService.deactivateListing(user.user_id, vendor_id, product_id);
+// vendorsRouter.post('/', async (req: Request, res: Response) => {
-
+//     try {
-        if (success) {
+//         const category: Category = req.body.category;
-            res.status(200).send({});
+//
-        } else {
+//         await CategoryService.create(category);
-            res.status(500).send({});
+//
-        }
+//         res.sendStatus(201);
-    } catch (e) {
+//     } catch (e) {
-        console.log('Error handling a request: ' + e.message);
+//         res.status(404).send(e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+//     }
-    }
+// });
-});
+//
-
+// // PUT items/
-// PUT vendors/manage/shop/deactivate/:id
+//
-vendorsRouter.put('/manage/shop/deactivate/:id', async (req: Request, res: Response) => {
+// vendorsRouter.put('/', async (req: Request, res: Response) => {
-    try {
+//     try {
-        // Authenticate user
+//         const category: Category = req.body.category;
-        const user_ip = req.connection.remoteAddress ?? '';
+//
-        const session_id = req.body.session_id;
+//         await CategoryService.update(category);
-        const session_key = req.body.session_key;
+//
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
+//         res.sendStatus(200);
-
+//     } catch (e) {
-        // Get required parameters
+//         res.status(500).send(e.message);
-        const vendor_id = parseInt(req.params.id, 10);
+//     }
-
+// });
-        const success = await VendorService.setShopStatus(user.user_id, vendor_id, false);
+//
-
+// // DELETE items/:id
-        if (success) {
+//
-            res.status(200).send({});
+// vendorsRouter.delete('/:id', async (req: Request, res: Response) => {
-        } else {
+//     try {
-            res.status(500).send({});
+//         const id: number = parseInt(req.params.id, 10);
-        }
+//         await CategoryService.remove(id);
-    } catch (e) {
+//
-        console.log('Error handling a request: ' + e.message);
+//         res.sendStatus(200);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+//     } catch (e) {
-    }
+//         res.status(500).send(e.message);
-});
+//     }
-
+// });
-// PUT vendors/manage/shop/activate/:id
-vendorsRouter.put('/manage/shop/activate/:id', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const session_id = req.body.session_id;
-        const session_key = req.body.session_key;
-        const user = await UserService.checkSession(session_id, session_key, user_ip);
-
-        // Get required parameters
-        const vendor_id = parseInt(req.params.id, 10);
-
-        const success = await VendorService.setShopStatus(user.user_id, vendor_id, true);
-
-        if (success) {
-            res.status(200).send({});
-        } else {
-            res.status(500).send({});
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/vendors/vendors.service.ts

@@ -17,22 +17,18 @@ const pool = mariadb.createPool({
 
 import {Vendor} from './vendor.interface';
 import {Vendors} from './vendors.interface';
-import {User} from '../users/user.interface';
 
 
 /**
  * Service Methods
  */
 
-/**
- * Fetches and returns all known vendors
- */
 export const findAll = async (): Promise<Vendors> => {
     let conn;
     let vendorRows = [];
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE isActive = true');
+        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors');
         for (let row in rows) {
             if (row !== 'meta') {
                 let vendor: Vendor = {
@@ -70,16 +66,12 @@ export const findAll = async (): Promise<Vendors> => {
     return vendorRows;
 };
 
-/**
- * Fetches and returns the vendor with the specified id
- * @param id The id of the vendor to fetch
- */
 export const find = async (id: number): Promise<Vendor> => {
     let conn;
     let vendor: any;
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE vendor_id = ? AND isActive = true', id);
+        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE vendor_id = ?', id);
         for (let row in rows) {
             if (row !== 'meta') {
                 vendor = rows[row];
@@ -97,17 +89,13 @@ export const find = async (id: number): Promise<Vendor> => {
     return vendor;
 };
 
-/**
- * Fetches and returns all vendors that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Vendors> => {
     let conn;
     let vendorRows = [];
     try {
         conn = await pool.getConnection();
         term = '%' + term + '%';
-        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE name LIKE ? AND isActive = true', term);
+        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE name LIKE ?', term);
         for (let row in rows) {
             if (row !== 'meta') {
                 vendorRows.push(rows[row]);
@@ -125,92 +113,35 @@ export const findBySearchTerm = async (term: string): Promise<Vendors> => {
     return vendorRows;
 };
 
-/**
+// export const create = async (newItem: Product): Promise<void> => {
- * Get all vendors that have the given user as admin
+//     let conn;
- * @param user The user to return the managed shops for
+//     try {
- */
+//         conn = await pool.getConnection();
-export const getManagedShops = async (user_id: number): Promise<Vendors> => {
+//         await conn.query("");
-    let conn;
+//
-    let vendorRows = [];
+//     } catch (err) {
-    try {
+//         throw err;
-        conn = await pool.getConnection();
+//     } finally {
-        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE admin_id LIKE ?', user_id);
+//         if (conn) conn.end();
-        for (let row in rows) {
+//     }
-            if (row !== 'meta') {
+// };
-                vendorRows.push(rows[row]);
+//
-            }
+// export const update = async (updatedItem: Product): Promise<void> => {
-        }
+//     if (models.products[updatedItem.product_id]) {
-
+//         models.products[updatedItem.product_id] = updatedItem;
-    } catch (err) {
+//         return;
-        throw err;
+//     }
-    } finally {
+//
-        if (conn) {
+//     throw new Error("No record found to update");
-            conn.end();
+// };
-        }
+//
-    }
+// export const remove = async (id: number): Promise<void> => {
-
+//     const record: Product = models.products[id];
-    return vendorRows;
+//
-};
+//     if (record) {
-
+//         delete models.products[id];
-/**
+//         return;
- * Deactivates a product listing for a specific vendor
+//     }
- * @param user_id The user id of the issuing user
+//
- * @param vendor_id The vendor id of the vendor to deactivate the listing for
+//     throw new Error("No record found to delete");
- * @param product_id The product id of the product to deactivate the listing for
+// };
- */
-export const deactivateListing = async (user_id: number, vendor_id: number, product_id: number): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Check if the user is authorized to manage the requested vendor
-        const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
-        if (user_vendor_rows.length !== 1) {
-            return false;
-        }
-
-        const status = await conn.query('UPDATE prices SET active_listing = false WHERE vendor_id = ? and product_id = ?', [vendor_id, product_id]);
-
-        return status.affectedRows > 0;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return false;
-};
-
-/**
- * Set the specified shop to either active or not active
- * @param user_id The user id of the issuing user
- * @param vendor_id The vendor id of the shop to update
- * @param isActive The new active state
- */
-export const setShopStatus = async (user_id: number, vendor_id: number, isActive: boolean): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Check if the user is authorized to manage the requested vendor
-        const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
-        if (user_vendor_rows.length !== 1) {
-            return false;
-        }
-
-        // Update the vendor state
-        const status = await conn.query('UPDATE vendors SET isActive = ? WHERE vendor_id = ?', [isActive, vendor_id]);
-
-        return status.affectedRows > 0;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return false;
-};

Backend/webpack.config.ts

@@ -1,32 +1,32 @@
-const webpack = require('webpack');
+const webpack = require("webpack");
-const path = require('path');
+const path = require("path");
-const nodeExternals = require('webpack-node-externals');
+const nodeExternals = require("webpack-node-externals");
 
 module.exports = {
-    entry: ['webpack/hot/poll?100', './src/index.ts'],
+    entry: ["webpack/hot/poll?100", "./src/index.ts"],
     watch: false,
-    target: 'node',
+    target: "node",
     externals: [
         nodeExternals({
-            whitelist: ['webpack/hot/poll?100']
+            whitelist: ["webpack/hot/poll?100"]
         })
     ],
     module: {
         rules: [
             {
                 test: /.tsx?$/,
-                use: 'ts-loader',
+                use: "ts-loader",
                 exclude: /node_modules/
             }
         ]
     },
-    mode: 'development',
+    mode: "development",
     resolve: {
-        extensions: ['.tsx', '.ts', '.js']
+        extensions: [".tsx", ".ts", ".js"]
     },
     plugins: [new webpack.HotModuleReplacementPlugin()],
     output: {
-        path: path.join(__dirname, 'dist'),
+        path: path.join(__dirname, "dist"),
-        filename: 'index.js'
+        filename: "index.js"
     }
 };

Crawler-Loadbalancer/Crawler-Loadbalancer.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

Crawler-Loadbalancer/dailycrawl.py

@@ -1,59 +0,0 @@
-import json
-import requests
-import os
-
-import sql
-
-
-def call_crawlers() -> bool:
-    """
-    Fetches the list of all shops, does some load balancing magic and calls all registered crawler
-    instances to start them
-    :return: If the calls have been successful
-    """
-    product_ids = sql.getProductsToCrawl()
-
-    # crawler_urls = ['crawl.p4ddy.com', 'crawl.betterzon.xyz']
-    crawler_urls = ['http://localhost:22026']
-
-    balanced_lists = []
-
-    products_per_crawler = len(product_ids) // len(crawler_urls)
-    rest = len(product_ids) % len(crawler_urls)
-
-    # Distrubute available products over available crawler instances
-    for crawler_id in range(len(crawler_urls)):
-        amount_of_prods = products_per_crawler
-
-        # If we e.g. have 7 products but 2 crawlers, the first needs to crawl 4 products and the 2nd 3
-        if crawler_id < rest:
-            amount_of_prods += 1
-
-        # Assign the required amount of product ids to the current crawler and remove them from the
-        # list of all product ids
-        balanced_lists.append(product_ids[:amount_of_prods])
-        product_ids = product_ids[amount_of_prods:]
-
-    # Make the callouts to the instances
-    successful = 0
-    for crawler_id in range(len(crawler_urls)):
-        prods = balanced_lists[crawler_id]
-        url = crawler_urls[crawler_id]
-
-        # Send request
-        data = {
-            'key': os.environ['CRAWLER_ACCESS_KEY'],
-            'products': prods
-        }
-        headers = {'content-type': 'application/json', 'accept': 'application/json'}
-
-        resp = requests.post(url=url, data=json.dumps(data), headers=headers)
-
-        if resp.status_code == 200:
-            successful += 1
-
-    return successful == len(crawler_urls)
-
-
-if __name__ == '__main__':
-    call_crawlers()

Crawler-Loadbalancer/requirements.txt

@@ -1 +0,0 @@
-pymysql

Crawler-Loadbalancer/sql.py

@@ -1,59 +0,0 @@
-import pymysql
-import os
-import logging
-
-
-def __getConnection__() -> pymysql.Connection:
-    """
-    Opens a new pymysql connection and returns it
-    :return: A pymysql Connection object
-    """
-    logger = logging.getLogger()
-    try:
-        conn = pymysql.connect(
-            user=os.environ['BETTERZON_CRAWLER_USER'],
-            password=os.environ['BETTERZON_CRAWLER_PASSWORD'],
-            host=os.environ['BETTERZON_CRAWLER_HOST'],
-            port=3306,
-            database=os.environ['BETTERZON_CRAWLER_DB']
-        )
-
-        return conn
-    except pymysql.Error as e:
-        logger.error('SQL Connection error: %s', e)
-        return
-
-
-def getShopsToCrawl() -> [int]:
-    """
-    Queries the list of vendor IDs and returns them
-    :return: The list of IDs
-    """
-    conn = __getConnection__()
-    cur = conn.cursor()
-
-    query = 'SELECT vendor_id FROM vendors'
-
-    cur.execute(query)
-
-    # Extract the IDs from the returned tuples into a list
-    vendor_ids = list(map(lambda x: x[0], cur.fetchall()))
-
-    return vendor_ids
-
-def getProductsToCrawl() -> [int]:
-    """
-    Queries the list of product IDs and returns them
-    :return: The list of IDs
-    """
-    conn = __getConnection__()
-    cur = conn.cursor()
-
-    query = 'SELECT product_id FROM products'
-
-    cur.execute(query)
-
-    # Extract the IDs from the returned tuples into a list
-    product_ids = list(map(lambda x: x[0], cur.fetchall()))
-
-    return product_ids

Crawler/Crawler.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Python" name="Python">
-      <configuration sdkName="Python 3.9 (venv)" />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

Crawler/Dockerfile

@@ -1,20 +0,0 @@
-# Base image
-FROM python:3.9.5-buster
-
-# Create directories and copy files
-RUN echo 'Creating directory and copying files'
-RUN mkdir /crawler
-COPY . /crawler
-WORKDIR /crawler
-
-# Install dependencies
-RUN echo 'Installing dependencies'
-RUN pip install -r requirements.txt
-
-# Expose ports
-RUN echo 'Exposing ports'
-EXPOSE 22026
-
-# Start API
-RUN echo 'Starting API'
-CMD ["python3", "api.py"]

Crawler/api.py

@@ -1,35 +0,0 @@
-import os
-
-from flask import Flask
-from flask_restful import Resource, Api, reqparse
-
-import crawler
-
-app = Flask(__name__)
-api = Api(app)
-
-# To parse request data
-parser = reqparse.RequestParser()
-parser.add_argument('key', type=str)
-parser.add_argument('products', type=int, action='append')
-
-
-class CrawlerApi(Resource):
-    def get(self):
-        return {'Hallo': 'Betterzon'}
-
-    def post(self):
-        # Accept crawler request here
-        args = parser.parse_args()
-        access_key = os.getenv('CRAWLER_ACCESS_KEY')
-        if(args['key'] == access_key):
-            crawler.crawl(args['products'])
-            return {'message': 'success'}
-        else:
-            return {'message': 'Wrong access key'}
-
-
-api.add_resource(CrawlerApi, '/')
-
-if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=22026)

Crawler/crawler.py

@@ -1,107 +0,0 @@
-import sql
-import requests
-from bs4 import BeautifulSoup
-
-HEADERS = ({'User-Agent':
-                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 '
-                'Safari/537.36'})
-
-
-def crawl(product_ids: [int]) -> dict:
-    """
-    Crawls the given list of products and saves the results to sql
-    :param products: The list of product IDs to fetch
-    :return: A dict with the following fields:
-                total_crawls: number of total crawl tries (products * vendors per product)
-                successful_crawls: number of successful products
-                products_with_problems: list of products that have not been crawled successfully
-    """
-    total_crawls = 0
-    successful_crawls = 0
-    products_with_problems = []
-
-    # Iterate over every product that has to be crawled
-    for product_id in product_ids:
-        # Get all links for this product
-        product_links = sql.getProductLinksForProduct(product_id)
-
-        crawled_data = []
-
-        # Iterate over every link / vendor
-        for product_vendor_info in product_links:
-            total_crawls += 1
-
-            # Call the appropriate vendor crawling function and append the result to the list of crawled data
-            if product_vendor_info['vendor_id'] == 1:
-                # Amazon
-                data = __crawl_amazon__(product_vendor_info)
-                if data:
-                    crawled_data.append(data)
-            elif product_vendor_info['vendor_id'] == 2:
-                # Apple
-                data = __crawl_apple__(product_vendor_info)
-                if data:
-                    crawled_data.append(data)
-            elif product_vendor_info['vendor_id'] == 3:
-                # Media Markt
-                data = __crawl_mediamarkt__(product_vendor_info)
-                if data:
-                    crawled_data.append(data)
-            else:
-                products_with_problems.append(product_vendor_info)
-                continue
-
-            successful_crawls += 1
-
-        # Insert data to SQL
-        sql.insertData(crawled_data)
-
-    return {
-        'total_crawls': total_crawls,
-        'successful_crawls': successful_crawls,
-        'products_with_problems': products_with_problems
-    }
-
-
-def __crawl_amazon__(product_info: dict) -> tuple:
-    """
-    Crawls the price for the given product from amazon
-    :param product_info: A dict with product info containing product_id, vendor_id, url
-    :return: A tuple with the crawled data, containing (product_id, vendor_id, price_in_cents)
-    """
-    page = requests.get(product_info['url'], headers=HEADERS)
-    soup = BeautifulSoup(page.content, features="lxml")
-    try:
-        price = int(
-            soup.find(id='priceblock_ourprice').get_text().replace(".", "").replace(",", "").replace("€", "").strip())
-        if not price:
-            price = int(soup.find(id='price_inside_buybox').get_text().replace(".", "").replace(",", "").replace("€", "").strip())
-
-    except RuntimeError:
-        price = -1
-    except AttributeError:
-        price = -1
-
-    if price != -1:
-        return (product_info['product_id'], product_info['vendor_id'], price)
-    else:
-        return None
-
-
-def __crawl_apple__(product_info: dict) -> tuple:
-    """
-    Crawls the price for the given product from apple
-    :param product_info: A dict with product info containing product_id, vendor_id, url
-    :return: A tuple with the crawled data, containing (product_id, vendor_id, price_in_cents)
-    """
-    # return (product_info['product_id'], product_info['vendor_id'], 123)
-    pass
-
-
-def __crawl_mediamarkt__(product_info: dict) -> tuple:
-    """
-    Crawls the price for the given product from media markt
-    :param product_info: A dict with product info containing product_id, vendor_id, url
-    :return: A tuple with the crawled data, containing (product_id, vendor_id, price_in_cents)
-    """
-    pass

Crawler/requirements.txt

@@ -1,7 +0,0 @@
-pymysql
-flask==1.1.2
-flask-sqlalchemy
-flask_restful
-beautifulsoup4
-requests
-lxml

Crawler/sql.py

@@ -1,88 +0,0 @@
-import logging
-
-import pymysql
-import os
-
-
-def __getConnection__() -> pymysql.Connection:
-    """
-    Opens a new pymysql connection and returns it
-    :return: A pymysql Connection object
-    """
-    logger = logging.getLogger()
-    try:
-        conn = pymysql.connect(
-            user=os.environ['BETTERZON_CRAWLER_USER'],
-            password=os.environ['BETTERZON_CRAWLER_PASSWORD'],
-            host=os.environ['BETTERZON_CRAWLER_HOST'],
-            port=3306,
-            database=os.environ['BETTERZON_CRAWLER_DB']
-        )
-
-        return conn
-    except pymysql.Error as e:
-        logger.error('SQL Connection error: %s', e)
-        return
-
-
-def getProductsForVendor(vendor_id: int) -> [{}]:
-    """
-    Queries the product links for all products of the given shop
-    :param vendor_id: The vendor / shop to query products for
-    :return: A list of product objects, each having the following parameters:
-                product_id, vendor_id, url
-    """
-    conn = __getConnection__()
-    cur = conn.cursor()
-
-    query = 'SELECT product_id, url FROM product_links WHERE vendor_id = %s'
-
-    cur.execute(query, (vendor_id,))
-
-    products = list(map(lambda x: {'product_id': x[0], 'vendor_id': vendor_id, 'url': x[1]}, cur.fetchall()))
-
-    return products
-
-def getProductLinksForProduct(product_id: int) -> [dict]:
-    """
-    Queries all the product links for the given product
-    :param product_id: The product to query data for
-    :return: A list of product objects, each having the following parameters:
-                product_id, vendor_id, url
-    """
-    conn = __getConnection__()
-    cur = conn.cursor()
-
-    query = 'SELECT vendor_id, url FROM product_links WHERE product_id = %s'
-    cur.execute(query, (product_id,))
-
-    products = list(map(lambda x: {'product_id': product_id, 'vendor_id': x[0], 'url': x[1]}, cur.fetchall()))
-
-    return products
-
-
-
-def insertData(data_to_insert: [tuple]) -> bool:
-    """
-    Inserts the given list of tuples into the DB
-    :param dataToInsert: A list of tuples, where each tuple has to contain product id, vendor id and the price
-                         in exactly this order
-    :return: If the insert was successful
-    """
-    conn = __getConnection__()
-    cur = conn.cursor()
-
-    query = 'INSERT INTO prices (product_id, vendor_id, price_in_cents, timestamp) VALUES (%s, %s, %s, NOW())'
-
-    affectedRows = cur.executemany(query, data_to_insert)
-
-    if affectedRows != len(data_to_insert):
-        # Something went wrong, revert the changes
-        conn.rollback()
-    else:
-        conn.commit()
-
-    cur.close()
-    conn.close()
-
-    return affectedRows == len(data_to_insert)

Crawler/unused/scrapy/amazonspider.py

@@ -1,33 +0,0 @@
-import scrapy
-from scrapy.crawler import CrawlerProcess
-import re
-
-class AmazonSpider(scrapy.Spider):
-    name = 'amazon'
-    allowed_domains = ['amazon.de']
-    start_urls = ['https://amazon.de/dp/B083DRCPJG']
-
-    # def __init__(self, start_urls):
-    #   self.start_urls = start_urls
-
-    def parse(self, response):
-        price = response.xpath('//*[@id="priceblock_ourprice"]/text()').extract_first()
-        if not price:
-            price = response.xpath('//*[@data-asin-price]/@data-asin-price').extract_first() or \
-                    response.xpath('//*[@id="price_inside_buybox"]/text()').extract_first()
-
-        euros = re.match('(\d*),\d\d', price).group(1)
-        cents = re.match('\d*,(\d\d)', price).group(1)
-        priceincents = euros + cents
-
-        yield {'price': priceincents}
-
-
-def start_crawling():
-    process = CrawlerProcess(
-        settings={'COOKIES_ENABLED': 'False', 'CONCURRENT_REQUESTS_PER_IP': 1, 'ROBOTSTXT_OBEY': False,
-                  'USER_AGENT': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',
-                  'DOWNLOAD_DELAY': 3}
-        , install_root_handler=False)
-    process.crawl()
-    process.start()

Crawler/unused/scrapy/crawler/items.py

@@ -1,12 +0,0 @@
-# Define here the models for your scraped items
-#
-# See documentation in:
-# https://docs.scrapy.org/en/latest/topics/items.html
-
-import scrapy
-
-
-class CrawlerItem(scrapy.Item):
-    # define the fields for your item here like:
-    # name = scrapy.Field()
-    pass

Crawler/unused/scrapy/crawler/middlewares.py

@@ -1,103 +0,0 @@
-# Define here the models for your spider middleware
-#
-# See documentation in:
-# https://docs.scrapy.org/en/latest/topics/spider-middleware.html
-
-from scrapy import signals
-
-# useful for handling different item types with a single interface
-from itemadapter import is_item, ItemAdapter
-
-
-class CrawlerSpiderMiddleware:
-    # Not all methods need to be defined. If a method is not defined,
-    # scrapy acts as if the spider middleware does not modify the
-    # passed objects.
-
-    @classmethod
-    def from_crawler(cls, crawler):
-        # This method is used by Scrapy to create your spiders.
-        s = cls()
-        crawler.signals.connect(s.spider_opened, signal=signals.spider_opened)
-        return s
-
-    def process_spider_input(self, response, spider):
-        # Called for each response that goes through the spider
-        # middleware and into the spider.
-
-        # Should return None or raise an exception.
-        return None
-
-    def process_spider_output(self, response, result, spider):
-        # Called with the results returned from the Spider, after
-        # it has processed the response.
-
-        # Must return an iterable of Request, or item objects.
-        for i in result:
-            yield i
-
-    def process_spider_exception(self, response, exception, spider):
-        # Called when a spider or process_spider_input() method
-        # (from other spider middleware) raises an exception.
-
-        # Should return either None or an iterable of Request or item objects.
-        pass
-
-    def process_start_requests(self, start_requests, spider):
-        # Called with the start requests of the spider, and works
-        # similarly to the process_spider_output() method, except
-        # that it doesn’t have a response associated.
-
-        # Must return only requests (not items).
-        for r in start_requests:
-            yield r
-
-    def spider_opened(self, spider):
-        spider.logger.info('Spider opened: %s' % spider.name)
-
-
-class CrawlerDownloaderMiddleware:
-    # Not all methods need to be defined. If a method is not defined,
-    # scrapy acts as if the downloader middleware does not modify the
-    # passed objects.
-
-    @classmethod
-    def from_crawler(cls, crawler):
-        # This method is used by Scrapy to create your spiders.
-        s = cls()
-        crawler.signals.connect(s.spider_opened, signal=signals.spider_opened)
-        return s
-
-    def process_request(self, request, spider):
-        # Called for each request that goes through the downloader
-        # middleware.
-
-        # Must either:
-        # - return None: continue processing this request
-        # - or return a Response object
-        # - or return a Request object
-        # - or raise IgnoreRequest: process_exception() methods of
-        #   installed downloader middleware will be called
-        return None
-
-    def process_response(self, request, response, spider):
-        # Called with the response returned from the downloader.
-
-        # Must either;
-        # - return a Response object
-        # - return a Request object
-        # - or raise IgnoreRequest
-        return response
-
-    def process_exception(self, request, exception, spider):
-        # Called when a download handler or a process_request()
-        # (from other downloader middleware) raises an exception.
-
-        # Must either:
-        # - return None: continue processing this exception
-        # - return a Response object: stops process_exception() chain
-        # - return a Request object: stops process_exception() chain
-        pass
-
-    def spider_opened(self, spider):
-        spider.logger.info('Spider opened: %s' % spider.name)

Crawler/unused/scrapy/crawler/pipelines.py

@@ -1,13 +0,0 @@
-# Define your item pipelines here
-#
-# Don't forget to add your pipeline to the ITEM_PIPELINES setting
-# See: https://docs.scrapy.org/en/latest/topics/item-pipeline.html
-
-
-# useful for handling different item types with a single interface
-from itemadapter import ItemAdapter
-
-
-class CrawlerPipeline:
-    def process_item(self, item, spider):
-        return item

Crawler/unused/scrapy/crawler/settings.py

@@ -1,88 +0,0 @@
-# Scrapy settings for crawler project
-#
-# For simplicity, this file contains only settings considered important or
-# commonly used. You can find more settings consulting the documentation:
-#
-#     https://docs.scrapy.org/en/latest/topics/settings.html
-#     https://docs.scrapy.org/en/latest/topics/downloader-middleware.html
-#     https://docs.scrapy.org/en/latest/topics/spider-middleware.html
-
-BOT_NAME = 'crawler'
-
-SPIDER_MODULES = ['crawler.spiders']
-NEWSPIDER_MODULE = 'crawler.spiders'
-
-
-# Crawl responsibly by identifying yourself (and your website) on the user-agent
-USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36'
-
-# Obey robots.txt rules
-ROBOTSTXT_OBEY = False
-
-# Configure maximum concurrent requests performed by Scrapy (default: 16)
-#CONCURRENT_REQUESTS = 32
-
-# Configure a delay for requests for the same website (default: 0)
-# See https://docs.scrapy.org/en/latest/topics/settings.html#download-delay
-# See also autothrottle settings and docs
-DOWNLOAD_DELAY = 3
-# The download delay setting will honor only one of:
-#CONCURRENT_REQUESTS_PER_DOMAIN = 16
-CONCURRENT_REQUESTS_PER_IP = 1
-
-# Disable cookies (enabled by default)
-COOKIES_ENABLED = False
-
-# Disable Telnet Console (enabled by default)
-#TELNETCONSOLE_ENABLED = False
-
-# Override the default request headers:
-#DEFAULT_REQUEST_HEADERS = {
-#   'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-#   'Accept-Language': 'en',
-#}
-
-# Enable or disable spider middlewares
-# See https://docs.scrapy.org/en/latest/topics/spider-middleware.html
-#SPIDER_MIDDLEWARES = {
-#    'crawler.middlewares.CrawlerSpiderMiddleware': 543,
-#}
-
-# Enable or disable downloader middlewares
-# See https://docs.scrapy.org/en/latest/topics/downloader-middleware.html
-#DOWNLOADER_MIDDLEWARES = {
-#    'crawler.middlewares.CrawlerDownloaderMiddleware': 543,
-#}
-
-# Enable or disable extensions
-# See https://docs.scrapy.org/en/latest/topics/extensions.html
-#EXTENSIONS = {
-#    'scrapy.extensions.telnet.TelnetConsole': None,
-#}
-
-# Configure item pipelines
-# See https://docs.scrapy.org/en/latest/topics/item-pipeline.html
-#ITEM_PIPELINES = {
-#    'crawler.pipelines.CrawlerPipeline': 300,
-#}
-
-# Enable and configure the AutoThrottle extension (disabled by default)
-# See https://docs.scrapy.org/en/latest/topics/autothrottle.html
-AUTOTHROTTLE_ENABLED = True
-# The initial download delay
-AUTOTHROTTLE_START_DELAY = 5
-# The maximum download delay to be set in case of high latencies
-#AUTOTHROTTLE_MAX_DELAY = 60
-# The average number of requests Scrapy should be sending in parallel to
-# each remote server
-#AUTOTHROTTLE_TARGET_CONCURRENCY = 1.0
-# Enable showing throttling stats for every response received:
-#AUTOTHROTTLE_DEBUG = False
-
-# Enable and configure HTTP caching (disabled by default)
-# See https://docs.scrapy.org/en/latest/topics/downloader-middleware.html#httpcache-middleware-settings
-#HTTPCACHE_ENABLED = True
-#HTTPCACHE_EXPIRATION_SECS = 0
-#HTTPCACHE_DIR = 'httpcache'
-#HTTPCACHE_IGNORE_HTTP_CODES = []
-#HTTPCACHE_STORAGE = 'scrapy.extensions.httpcache.FilesystemCacheStorage'

Crawler/unused/scrapy/scrapy.cfg

@@ -1,11 +0,0 @@
-# Automatically created by: scrapy startproject
-#
-# For more information about the [deploy] section see:
-# https://scrapyd.readthedocs.io/en/latest/deploy.html
-
-[settings]
-default = crawler.settings
-
-[deploy]
-#url = http://localhost:6800/
-project = crawler

Crawler/unused/scrapy/spiders/__init__.py

@@ -1,4 +0,0 @@
-# This package will contain the spiders of your Scrapy project
-#
-# Please refer to the documentation for information on how to create and manage
-# your spiders.

Crawler/unused/scrapy/spiders/amazon.py

@@ -1,25 +0,0 @@
-import scrapy
-import re
-
-class AmazonSpider(scrapy.Spider):
-    name = 'amazon'
-    allowed_domains = ['amazon.de']
-    start_urls = ['https://amazon.de/dp/B083DRCPJG']
-
-    def parse(self, response):
-        price = response.xpath('//*[@id="priceblock_ourprice"]/text()').extract_first()
-        if not price:
-            price = response.xpath('//*[@data-asin-price]/@data-asin-price').extract_first() or \
-                    response.xpath('//*[@id="price_inside_buybox"]/text()').extract_first()
-
-        euros = re.match('(\d*),\d\d', price).group(1)
-        cents = re.match('\d*,(\d\d)', price).group(1)
-        priceincents = euros + cents
-
-        yield {'price': priceincents}
-
-
-
-
-
-

CucumberTests/CucumberTests.iml

@@ -10,24 +10,17 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resource" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="openjdk-16" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-java:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-core:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: info.cukes:cucumber-html:0.2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-jvm-deps:1.0.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:gherkin:5.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:tag-expressions:1.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-junit:2.3.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-java:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-core:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-gherkin:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-gherkin-messages:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:messages:15.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:tag-expressions:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-expressions:10.3.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:datatable:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-plugin:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:docstring:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:html-formatter:13.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:create-meta:4.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-junit:6.10.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-compiler-plugin:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0" level="project" />
@@ -60,25 +53,5 @@
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-compiler-api:2.8.4" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-compiler-manager:2.8.4" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.plexus:plexus-compiler-javac:2.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-opera-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.8.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:25.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
   </component>
 </module>

CucumberTests/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>xyz.betterzon</groupId>
+    <groupId>de.taskhub</groupId>
     <artifactId>CucumberTests</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
@@ -13,30 +13,21 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>io.cucumber</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>cucumber-java</artifactId>
-            <version>4.12</version>
+            <version>2.3.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-            <version>6.10.3</version>
-        </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
-            <version>6.10.3</version>
+            <version>2.3.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.8.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>3.141.59</version>
-        </dependency>
     </dependencies>
 </project>

CucumberTests/src/test/java/RunTest.java

@@ -1,10 +1,6 @@
-import io.cucumber.junit.Cucumber;
+import cucumber.api.CucumberOptions;
-import io.cucumber.junit.CucumberOptions;
+import cucumber.api.junit.Cucumber;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import stepdefs.Preconditions;
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
@@ -13,13 +9,4 @@ import stepdefs.Preconditions;
 )
 
 public class RunTest {
-    @BeforeClass
-    public static void setup() {
-        Preconditions.driver= new FirefoxDriver();
-    }
-
-    @AfterClass
-    public static void teardown() {
-        Preconditions.driver.close();
-    }
 }

CucumberTests/src/test/java/stepdefs/Preconditions.java

@@ -1,7 +0,0 @@
-package stepdefs;
-
-import org.openqa.selenium.WebDriver;
-
-public class Preconditions {
-    public static WebDriver driver;
-}

CucumberTests/src/test/java/stepdefs/PriceAlarm.java

@@ -1,68 +1,67 @@
 package stepdefs;
 
-import io.cucumber.java.PendingException;
+import cucumber.api.java.en.Given;
-import io.cucumber.java.en.Given;
+import cucumber.api.java.en.Then;
-import io.cucumber.java.en.Then;
+import cucumber.api.java.en.When;
-import io.cucumber.java.en.When;
 
 public class PriceAlarm {
-    @Given("^the user has at least (\\d+) price alarm set$")
+  @Given("^the user has at least (\\d+) price alarm set$")
-    public void the_user_has_at_least_price_alarm_set(int arg1) throws Exception {
+  public void the_user_has_at_least_price_alarm_set(int arg1) throws Exception {
-    }
+  }
 
-    @When("^the user clicks on the profile icon$")
+  @When("^the user clicks on the profile icon$")
-    public void the_user_clicks_on_the_profile_icon() throws Exception {
+  public void the_user_clicks_on_the_profile_icon() throws Exception {
-    }
+  }
 
-    @Then("^the profile details popup should open$")
+  @Then("^the profile details popup should open$")
-    public void the_profile_details_popup_should_open() throws Exception {
+  public void the_profile_details_popup_should_open() throws Exception {
-    }
+  }
 
-    @When("^the user clicks on price alarms$")
+  @When("^the user clicks on price alarms$")
-    public void the_user_clicks_on_price_alarms() throws Exception {
+  public void the_user_clicks_on_price_alarms() throws Exception {
-    }
+  }
 
-    @Then("^the price alarm list should open$")
+  @Then("^the price alarm list should open$")
-    public void the_price_alarm_list_should_open() throws Exception {
+  public void the_price_alarm_list_should_open() throws Exception {
-    }
+  }
 
-    @Then("^the price alarm list should contain at least (\\d+) entry$")
+  @Then("^the price alarm list should contain at least (\\d+) entry$")
-    public void the_price_alarm_list_should_contain_at_least_entry(int arg1) throws Exception {
+  public void the_price_alarm_list_should_contain_at_least_entry(int arg1) throws Exception {
-    }
+  }
 
-    @Then("^the price alarm list should contain a maximum of (\\d+) entries per page$")
+  @Then("^the price alarm list should contain a maximum of (\\d+) entries per page$")
-    public void the_price_alarm_list_should_contain_a_maximum_of_entries_per_page(int arg1) throws Exception {
+  public void the_price_alarm_list_should_contain_a_maximum_of_entries_per_page(int arg1) throws Exception {
-    }
+  }
 
-    @Given("^the user is on the price alarm list page$")
+  @Given("^the user is on the price alarm list page$")
-    public void the_user_is_on_the_price_alarm_list_page() throws Exception {
+  public void the_user_is_on_the_price_alarm_list_page() throws Exception {
-    }
+  }
 
-    @When("^the user clicks on the \"([^\"]*)\" button next to a price alarm$")
+  @When("^the user clicks on the \"([^\"]*)\" button next to a price alarm$")
-    public void the_user_clicks_on_the_button_next_to_a_price_alarm(String arg1) throws Exception {
+  public void the_user_clicks_on_the_button_next_to_a_price_alarm(String arg1) throws Exception {
-    }
+  }
 
-    @Then("^a popup should open asking the user to confirm the removal$")
+  @Then("^a popup should open asking the user to confirm the removal$")
-    public void a_popup_should_open_asking_the_user_to_confirm_the_removal() throws Exception {
+  public void a_popup_should_open_asking_the_user_to_confirm_the_removal() throws Exception {
-    }
+  }
 
-    @When("^the user confirms the removal of the price alarm$")
+  @When("^the user confirms the removal of the price alarm$")
-    public void the_user_confirms_the_removal_of_the_price_alarm() throws Exception {
+  public void the_user_confirms_the_removal_of_the_price_alarm() throws Exception {
-    }
+  }
 
-    @Then("^the price alarm should be removed from the database$")
+  @Then("^the price alarm should be removed from the database$")
-    public void the_price_alarm_should_be_removed_from_the_database() throws Exception {
+  public void the_price_alarm_should_be_removed_from_the_database() throws Exception {
-    }
+  }
 
-    @Then("^a popup should open where the user can edit the alarm$")
+  @Then("^a popup should open where the user can edit the alarm$")
-    public void a_popup_should_open_where_the_user_can_edit_the_alarm() throws Exception {
+  public void a_popup_should_open_where_the_user_can_edit_the_alarm() throws Exception {
-    }
+  }
 
-    @When("^the user clicks on the \"([^\"]*)\" button$")
+  @When("^the user clicks on the \"([^\"]*)\" button$")
-    public void the_user_clicks_on_the_button(String arg1) throws Exception {
+  public void the_user_clicks_on_the_button(String arg1) throws Exception {
-    }
+  }
 
-    @Then("^the price alarm should be updated in the database$")
+  @Then("^the price alarm should be updated in the database$")
-    public void the_price_alarm_should_be_updated_in_the_database() throws Exception {
+  public void the_price_alarm_should_be_updated_in_the_database() throws Exception {
-    }
+  }
 }

CucumberTests/src/test/java/stepdefs/SearchProduct.java

@@ -1,72 +1,52 @@
 package stepdefs;
 
-import io.cucumber.java.PendingException;
+import cucumber.api.PendingException;
-import io.cucumber.java.en.Given;
+import cucumber.api.java.en.Given;
-import io.cucumber.java.en.Then;
+import cucumber.api.java.en.Then;
-import io.cucumber.java.en.When;
+import cucumber.api.java.en.When;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
 public class SearchProduct {
-    @Given("^the user is on the landing page$")
+  @Given("^the user is on the landing page$")
-    public void the_user_is_on_the_landing_page() throws Exception {
+  public void the_user_is_on_the_landing_page() throws Exception {
-        //throw new PendingException();
+  }
-        Preconditions.driver.get("https://betterzon.xyz");
-        WebElement logo = (new WebDriverWait(Preconditions.driver, 10))
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".logo")));
-    }
 
-    @When("^the user enters the search term \"([^\"]*)\" and clicks search$")
+  @When("^the user enters the search term \"([^\"]*)\" and clicks search$")
-    public void the_user_enters_the_search_term_and_clicks_search(String searchTerm) throws Exception {
+  public void the_user_enters_the_search_term_and_clicks_search(String arg0) throws Exception {
-        WebElement searchField = Preconditions.driver.findElement(By.cssSelector(".ng-untouched.ng-pristine.ng-valid"));
+  }
-        searchField.sendKeys(searchTerm);
-        searchField.sendKeys(Keys.ENTER);
-        WebElement logo = (new WebDriverWait(Preconditions.driver, 10))
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".logo")));
-    }
 
-    @Then("^the user should see the error page \"([^\"]*)\"$")
+  @Then("^the user should see the error page \"([^\"]*)\"$")
-    public void the_user_should_see_the_error_page(String arg0) throws Exception {
+  public void the_user_should_see_the_error_page(String arg0) throws Exception {
-        WebElement noProdsFoundMsg = (new WebDriverWait(Preconditions.driver, 10))
+  }
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".ng-star-inserted")));
-        assert(noProdsFoundMsg.getText().contains("No Products found!"));
-    }
 
-    @Given("^the user is not logged in$")
+  @Given("^the user is not logged in$")
-    public void the_user_is_not_logged_in() throws Exception {
+  public void the_user_is_not_logged_in() throws Exception {
-    }
+  }
 
-    @Given("^the user is logged in$")
+  @Given("^the user is logged in$")
-    public void the_user_is_logged_in() throws Exception {
+  public void the_user_is_logged_in() throws Exception {
-    }
+  }
 
-    @Then("^the user should see a list of products$")
+  @Then("^the user should see a list of products$")
-    public void the_user_should_see_a_list_of_products() throws Exception {
+  public void the_user_should_see_a_list_of_products() throws Exception {
-        WebElement product = (new WebDriverWait(Preconditions.driver, 10))
+  }
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".productItem.ng-star-inserted")));
-        assert(product.isDisplayed());
-    }
 
-    @When("^the user clicks on the first product$")
+  @When("^the user clicks on the first product$")
-    public void the_user_clicks_on_the_first_product() throws Exception {
+  public void the_user_clicks_on_the_first_product() throws Exception {
-    }
+  }
 
-    @Then("^the user should see the product detail page$")
+  @Then("^the user should see the product detail page$")
-    public void the_user_should_see_the_product_detail_page() throws Exception {
+  public void the_user_should_see_the_product_detail_page() throws Exception {
-    }
+  }
 
-    @Then("^the set price alarm box should show \"([^\"]*)\"$")
+  @Then("^the set price alarm box should show \"([^\"]*)\"$")
-    public void the_set_price_alarm_box_should_show(String arg0) throws Exception {
+  public void the_set_price_alarm_box_should_show(String arg0) throws Exception {
-    }
+  }
 
-    @When("^the user sets a price alarm$")
+  @When("^the user sets a price alarm$")
-    public void the_user_sets_a_price_alarm() throws Exception {
+  public void the_user_sets_a_price_alarm() throws Exception {
-    }
+  }
 
-    @Then("^the user should receive an email confirming the price alarm$")
+  @Then("^the user should receive an email confirming the price alarm$")
-    public void the_user_should_receive_an_email_confirming_the_price_alarm() throws Exception {
+  public void the_user_should_receive_an_email_confirming_the_price_alarm() throws Exception {
-    }
+  }
 }

CucumberTests/src/test/resource/priceAlarms.feature

@@ -1,28 +1,28 @@
 Feature: Price Alarms
 
-    Scenario: Show a list of price alarms
+  Scenario: Show a list of price alarms
-        Given the user is on the landing page
+    Given the user is on the landing page
-        And the user is logged in
+    And the user is logged in
-        And the user has at least 1 price alarm set
+    And the user has at least 1 price alarm set
-        When the user clicks on the profile icon
+    When the user clicks on the profile icon
-        Then the profile details popup should open
+    Then the profile details popup should open
-        When the user clicks on price alarms
+    When the user clicks on price alarms
-        Then the price alarm list should open
+    Then the price alarm list should open
-        And the price alarm list should contain at least 1 entry
+    And the price alarm list should contain at least 1 entry
-        And the price alarm list should contain a maximum of 20 entries per page
+    And the price alarm list should contain a maximum of 20 entries per page
 
-    Scenario: Remove a price alarm
+  Scenario: Remove a price alarm
-        Given the user is on the price alarm list page
+    Given the user is on the price alarm list page
-        And the user is logged in
+    And the user is logged in
-        When the user clicks on the "remove" button next to a price alarm
+    When the user clicks on the "remove" button next to a price alarm
-        Then a popup should open asking the user to confirm the removal
+    Then a popup should open asking the user to confirm the removal
-        When the user confirms the removal of the price alarm
+    When the user confirms the removal of the price alarm
-        Then the price alarm should be removed from the database
+    Then the price alarm should be removed from the database
 
-    Scenario: Edit a price alarm
+  Scenario: Edit a price alarm
-        Given the user is on the price alarm list page
+    Given the user is on the price alarm list page
-        And the user is logged in
+    And the user is logged in
-        When the user clicks on the "edit" button next to a price alarm
+    When the user clicks on the "edit" button next to a price alarm
-        Then a popup should open where the user can edit the alarm
+    Then a popup should open where the user can edit the alarm
-        When the user clicks on the "save changes" button
+    When the user clicks on the "save changes" button
-        Then the price alarm should be updated in the database
+    Then the price alarm should be updated in the database

CucumberTests/src/test/resource/searchProduct.feature

@@ -1,26 +1,26 @@
 Feature: Search a Product
 
-    Scenario: User searches for unknown product
+  Scenario: User searches for unknown product
-        Given the user is on the landing page
+    Given the user is on the landing page
-        When the user enters the search term "iPhone 13" and clicks search
+    When the user enters the search term "iPhone 13" and clicks search
-        Then the user should see the error page "No products found"
+    Then the user should see the error page "No products found"
 
-    Scenario: User is not logged in, searches for known product
+  Scenario: User is not logged in, searches for known product
-        Given the user is on the landing page
+    Given the user is on the landing page
-        And the user is not logged in
+    And the user is not logged in
-        When the user enters the search term "iPhone 12" and clicks search
+    When the user enters the search term "iPhone 12" and clicks search
-        Then the user should see a list of products
+    Then the user should see a list of products
-        When the user clicks on the first product
+    When the user clicks on the first product
-        Then the user should see the product detail page
+    Then the user should see the product detail page
-        And the set price alarm box should show "Log in to continue"
+    And the set price alarm box should show "Log in to continue"
 
-    Scenario: User is logged in, searches for known product
+  Scenario: User is logged in, searches for known product
-        Given the user is on the landing page
+    Given the user is on the landing page
-        And the user is logged in
+    And the user is logged in
-        When the user enters the search term "iPhone 12" and clicks search
+    When the user enters the search term "iPhone 12" and clicks search
-        Then the user should see a list of products
+    Then the user should see a list of products
-        When the user clicks on the first product
+    When the user clicks on the first product
-        Then the user should see the product detail page
+    Then the user should see the product detail page
-        And the set price alarm box should show "Set price alarm"
+    And the set price alarm box should show "Set price alarm"
-        When the user sets a price alarm
+    When the user sets a price alarm
-        Then the user should receive an email confirming the price alarm
+    Then the user should receive an email confirming the price alarm

Frontend/Frontend.iml

@@ -8,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/coverage" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

Frontend/angular.json

@@ -1,144 +1,124 @@
 {
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "version": 1,
+  "version": 1,
-    "newProjectRoot": "projects",
+  "newProjectRoot": "projects",
-    "projects": {
+  "projects": {
-        "Betterzon": {
+    "Betterzon": {
-            "projectType": "application",
+      "projectType": "application",
-            "schematics": {},
+      "schematics": {},
-            "root": "",
+      "root": "",
-            "sourceRoot": "src",
+      "sourceRoot": "src",
-            "prefix": "app",
+      "prefix": "app",
-            "architect": {
+      "architect": {
-                "build": {
+        "build": {
-                    "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:browser",
-                    "options": {
+          "options": {
-                        "outputPath": "dist/Betterzon",
+            "outputPath": "dist/Betterzon",
-                        "index": "src/index.html",
+            "index": "src/index.html",
-                        "main": "src/main.ts",
+            "main": "src/main.ts",
-                        "polyfills": "src/polyfills.ts",
+            "polyfills": "src/polyfills.ts",
-                        "tsConfig": "tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
-                        "aot": true,
+            "aot": true,
-                        "assets": [
+            "assets": [
-                            "src/favicon.ico",
+              "src/favicon.ico",
-                            "src/assets"
+              "src/assets"
-                        ],
+            ],
-                        "styles": [
+            "styles": [
-                            {
+              "src/styles.css"
-                                "input": "src/themes.scss"
+            ],
-                            },
+            "scripts": []
-                            "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
+          },
-                            "src/styles.css",
+          "configurations": {
-                            "./node_modules/cookieconsent/build/cookieconsent.min.css"
+            "production": {
-                        ],
+              "fileReplacements": [
-                        "scripts": [
+                {
-                            "./node_modules/cookieconsent/build/cookieconsent.min.js"
+                  "replace": "src/environments/environment.ts",
-                        ]
+                  "with": "src/environments/environment.prod.ts"
-                    },
-                    "configurations": {
-                        "production": {
-                            "fileReplacements": [
-                                {
-                                    "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.prod.ts"
-                                }
-                            ],
-                            "optimization": true,
-                            "outputHashing": "all",
-                            "sourceMap": false,
-                            "extractCss": true,
-                            "namedChunks": false,
-                            "extractLicenses": true,
-                            "vendorChunk": false,
-                            "buildOptimizer": true,
-                            "budgets": [
-                                {
-                                    "type": "initial",
-                                    "maximumWarning": "2mb",
-                                    "maximumError": "5mb"
-                                },
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "6kb",
-                                    "maximumError": "10kb"
-                                }
-                            ]
-                        }
-                    }
-                },
-                "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
-                    "options": {
-                        "browserTarget": "Betterzon:build"
-                    },
-                    "configurations": {
-                        "production": {
-                            "browserTarget": "Betterzon:build:production"
-                        }
-                    }
-                },
-                "extract-i18n": {
-                    "builder": "@angular-devkit/build-angular:extract-i18n",
-                    "options": {
-                        "browserTarget": "Betterzon:build"
-                    }
-                },
-                "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
-                    "options": {
-                        "main": "src/test.ts",
-                        "polyfills": "src/polyfills.ts",
-                        "tsConfig": "tsconfig.spec.json",
-                        "karmaConfig": "karma.conf.js",
-                        "codeCoverage": true,
-                        "codeCoverageExclude": [
-                            "src/app/mocks/mock.service.ts",
-                            "src/app/services/api.service.ts"
-                        ],
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets"
-                        ],
-                        "styles": [
-                            "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
-                            {
-                                "input": "src/themes.scss"
-                            },
-                            "src/styles.css",
-                            "./node_modules/cookieconsent/build/cookieconsent.min.css"
-                        ],
-                        "scripts": [
-                            "./node_modules/cookieconsent/build/cookieconsent.min.js"
-                        ]
-                    }
-                },
-                "lint": {
-                    "builder": "@angular-devkit/build-angular:tslint",
-                    "options": {
-                        "tsConfig": [
-                            "tsconfig.app.json",
-                            "tsconfig.spec.json",
-                            "e2e/tsconfig.json"
-                        ],
-                        "exclude": [
-                            "**/node_modules/**"
-                        ]
-                    }
-                },
-                "e2e": {
-                    "builder": "@angular-devkit/build-angular:protractor",
-                    "options": {
-                        "protractorConfig": "e2e/protractor.conf.js",
-                        "devServerTarget": "Betterzon:serve"
-                    },
-                    "configurations": {
-                        "production": {
-                            "devServerTarget": "Betterzon:serve:production"
-                        }
-                    }
                 }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
             }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "Betterzon:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "Betterzon:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "Betterzon:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "Betterzon:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "Betterzon:serve:production"
+            }
+          }
         }
-    },
+      }
-    "defaultProject": "Betterzon"
+    }},
+  "defaultProject": "Betterzon"
 }

Frontend/karma.conf.js

@@ -7,7 +7,6 @@ module.exports = function (config) {
     frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
-      require('karma-firefox-launcher'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
@@ -26,7 +25,7 @@ module.exports = function (config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Firefox'],
+    browsers: ['Chrome'],
     singleRun: false,
     restartOnFileChange: true
   });

Frontend/package.json

@@ -7,32 +7,20 @@
         "build": "ng build",
         "test": "ng test",
         "lint": "ng lint",
-        "e2e": "ng e2e",
+        "e2e": "ng e2e"
-        "postinstall": "ngcc"
     },
     "private": true,
     "dependencies": {
         "@angular/animations": "^10.2.3",
-        "@angular/cdk": "~10.2.7",
         "@angular/cli": "^10.2.0",
         "@angular/common": "^10.2.3",
         "@angular/compiler": "^10.2.3",
         "@angular/core": "^10.2.3",
         "@angular/forms": "^10.2.3",
-        "@angular/localize": "^10.2.3",
-        "@angular/material": "~10.2.7",
         "@angular/platform-browser": "^10.2.3",
         "@angular/platform-browser-dynamic": "^10.2.3",
         "@angular/router": "^10.2.3",
-        "@ng-bootstrap/ng-bootstrap": "^8.0.4",
-        "apexcharts": "^3.22.3",
-        "bootstrap": "^4.5.0",
-        "cookieconsent": "^3.1.1",
-        "karma-firefox-launcher": "^2.1.0",
         "ng": "0.0.0",
-        "ng-apexcharts": "^1.5.6",
-        "ngx-bootstrap": "^6.2.0",
-        "ngx-cookieconsent": "^2.2.3",
         "rxjs": "~6.6.0",
         "tslib": "^2.0.3",
         "zone.js": "~0.10.2"
@@ -47,7 +35,7 @@
         "codelyzer": "^6.0.0",
         "jasmine-core": "~3.6.0",
         "jasmine-spec-reporter": "~5.0.0",
-        "karma": "^6.3.2",
+        "karma": "~5.0.0",
         "karma-chrome-launcher": "~3.1.0",
         "karma-coverage-istanbul-reporter": "~3.0.2",
         "karma-jasmine": "~4.0.0",

Frontend/src/app/api.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ApiService } from './api.service';
+
+describe('ApiService', () => {
+  let service: ApiService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ApiService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

Frontend/src/app/api.service.ts

@@ -0,0 +1,27 @@
+import {Injectable} from '@angular/core';
+import {HttpClient, HttpHeaders} from '@angular/common/http';
+import process from 'process';
+import {Product} from './models/product';
+import {Observable, of} from 'rxjs';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class ApiService {
+    apiUrl = 'https://backend.betterzon.xyz';
+
+    constructor(
+        private http: HttpClient
+    ) {
+    }
+
+    getProducts(): Observable<Product[]> {
+        try {
+            const prods = this.http.get<Product[]>((this.apiUrl + '/products'));
+            console.log(prods);
+            return prods;
+        } catch (exception) {
+            process.stderr.write(`ERROR received from ${this.apiUrl}: ${exception}\n`);
+        }
+    }
+}

Frontend/src/app/app.component.css

@@ -1,9 +0,0 @@
-.wrapper_app {
-    padding-bottom: 2.5rem;    /* Footer height */
-}
-.footer_app {
-    position: relative;
-    bottom: 0;
-    width: 100%;
-    height: 2.5rem;            /* Footer height */
-}

Frontend/src/app/app.component.html

@@ -1,8 +1 @@
 <router-outlet></router-outlet>
-
-
-
-
-
-
-

Frontend/src/app/app.component.spec.ts

@@ -1,49 +1,31 @@
-import {TestBed} from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
-import {AppComponent} from './app.component';
+import { AppComponent } from './app.component';
-import {RouterTestingModule} from "@angular/router/testing";
-import {NgcCookieConsentConfig, NgcCookieConsentModule} from "ngx-cookieconsent";
-import {FormsModule} from "@angular/forms";
-
-// For cookie consent module testing
-const cookieConfig: NgcCookieConsentConfig = {
-    cookie: {
-        domain: 'localhost'
-    }
-};
 
 describe('AppComponent', () => {
-    beforeEach(async () => {
+  beforeEach(async () => {
-        await TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
-            declarations: [
+      declarations: [
-                AppComponent
+        AppComponent
-            ],
+      ],
-            imports: [
+    }).compileComponents();
-                RouterTestingModule,
+  });
-                NgcCookieConsentModule.forRoot(cookieConfig),
-                FormsModule
-            ]
-        }).compileComponents();
-    });
 
-    it('should create the app', () => {
+  it('should create the app', () => {
-        const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(AppComponent);
-        const app = fixture.componentInstance;
+    const app = fixture.componentInstance;
-        app.ngOnInit();
+    expect(app).toBeTruthy();
-        expect(app).toBeTruthy();
+  });
-    });
 
-    it(`should have as title 'Betterzon'`, () => {
+  it(`should have as title 'Betterzon'`, () => {
-        const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(AppComponent);
-        const app = fixture.componentInstance;
+    const app = fixture.componentInstance;
-        expect(app.title).toEqual('Betterzon');
+    expect(app.title).toEqual('Betterzon');
-    });
+  });
 
-    it('should render title', () => {
+  it('should render title', () => {
-        // Has to be adjusted as we already made changes to this
+    const fixture = TestBed.createComponent(AppComponent);
-        // const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
-        // fixture.detectChanges();
+    const compiled = fixture.nativeElement;
-        // const compiled = fixture.nativeElement;
+    expect(compiled.querySelector('.content span').textContent).toContain('Betterzon app is running!');
-        // expect(compiled.querySelector('.content span').textContent).toContain('Betterzon app is running!');
+  });
-        expect(true).toEqual(true);
-    });
 });

Frontend/src/app/app.component.ts

@@ -1,69 +1,10 @@
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import { Component } from '@angular/core';
-import {NgcCookieConsentService, NgcInitializeEvent, NgcNoCookieLawEvent, NgcStatusChangeEvent} from 'ngx-cookieconsent';
-import {Subscription} from 'rxjs';
 
 @Component({
-    selector: 'app-root',
+  selector: 'app-root',
-    templateUrl: './app.component.html',
+  templateUrl: './app.component.html',
-    styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.css']
 })
-export class AppComponent implements OnInit, OnDestroy {
+export class AppComponent {
-    title = 'Betterzon';
+  title = 'Betterzon';
-
-    // Cookie popup stuff
-    // Docs on https://www.npmjs.com/package/ngx-cookieconsent
-    private popupOpenSubscription: Subscription;
-    private popupCloseSubscription: Subscription;
-    private initializeSubscription: Subscription;
-    private statusChangeSubscription: Subscription;
-    private revokeChoiceSubscription: Subscription;
-    private noCookieLawSubscription: Subscription;
-
-    constructor(
-        private ccService: NgcCookieConsentService
-    ) {
-    }
-
-    ngOnInit(): void {
-        // subscribe to cookieconsent observables to react to main events
-        this.popupOpenSubscription = this.ccService.popupOpen$.subscribe(
-            () => {
-                // you can use this.ccService.getConfig() to do stuff...
-            });
-
-        this.popupCloseSubscription = this.ccService.popupClose$.subscribe(
-            () => {
-                // you can use this.ccService.getConfig() to do stuff...
-            });
-
-        this.initializeSubscription = this.ccService.initialize$.subscribe(
-            (event: NgcInitializeEvent) => {
-                // you can use this.ccService.getConfig() to do stuff...
-            });
-
-        this.statusChangeSubscription = this.ccService.statusChange$.subscribe(
-            (event: NgcStatusChangeEvent) => {
-                // you can use this.ccService.getConfig() to do stuff...
-            });
-
-        this.revokeChoiceSubscription = this.ccService.revokeChoice$.subscribe(
-            () => {
-                // you can use this.ccService.getConfig() to do stuff...
-            });
-
-        this.noCookieLawSubscription = this.ccService.noCookieLaw$.subscribe(
-            (event: NgcNoCookieLawEvent) => {
-                // you can use this.ccService.getConfig() to do stuff...
-            });
-    }
-
-    ngOnDestroy(): void {
-        // unsubscribe to cookieconsent observables to prevent memory leaks
-        this.popupOpenSubscription.unsubscribe();
-        this.popupCloseSubscription.unsubscribe();
-        this.initializeSubscription.unsubscribe();
-        this.statusChangeSubscription.unsubscribe();
-        this.revokeChoiceSubscription.unsubscribe();
-        this.noCookieLawSubscription.unsubscribe();
-    }
 }

Frontend/src/app/app.module.ts

@@ -4,79 +4,10 @@ import {NgModule} from '@angular/core';
 
 import {AppComponent} from './app.component';
 import {AppRouting} from './app.routing';
-import {ProductListComponent} from './components/product-list/product-list.component';
+import {ProductListComponent} from './product-list/product-list.component';
-import {LandingpageComponent} from './pages/landingpage/landingpage.component';
+import { LandingpageComponent } from './landingpage/landingpage.component';
-import {ProductDetailPageComponent} from './pages/product-detail-page/product-detail-page.component';
+import { ProductDetailPageComponent } from './product-detail-page/product-detail-page.component';
-import {FooterComponent} from './components/footer/footer.component';
+import { FooterComponent } from './footer/footer.component';
-import {ProductDetailsComponent} from './components/product-details/product-details.component';
-import {NgApexchartsModule} from 'ng-apexcharts';
-import {ProductSearchPageComponent} from './pages/product-search-page/product-search-page.component';
-import {HeaderComponent} from './components/header/header.component';
-import {NewestPricesListComponent} from './components/newest-prices-list/newest-prices-list.component';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {PageNotFoundPageComponent} from './pages/page-not-found-page/page-not-found-page.component';
-import {MatMenuModule} from '@angular/material/menu';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {ImprintComponent} from './pages/imprint/imprint.component';
-import {PrivacyComponent} from './pages/privacy/privacy.component';
-import {NgcCookieConsentModule, NgcCookieConsentConfig} from 'ngx-cookieconsent';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {TopBarComponent} from './components/top-bar/top-bar.component';
-import {RouterModule} from '@angular/router';
-import {MatButtonModule} from "@angular/material/button";
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatIconModule} from '@angular/material/icon';
-import {MatSidenavModule} from '@angular/material/sidenav';
-import {MatListModule} from "@angular/material/list";
-import {BottomBarComponent} from './components/bottom-bar/bottom-bar.component';
-import { HotDealsWidgetComponent } from './components/hot-deals-widget/hot-deals-widget.component';
-import { SliderForProductsComponent } from './components/slider-for-products/slider-for-products.component';
-import { RegistrationComponent } from './components/auth/registration/registration.component';
-import { MatCardModule } from "@angular/material/card";
-import {SigninComponent} from "./components/auth/signin/signin.component";
-import { CopyrightComponent } from './components/copyright/copyright.component';
-import { GreetingInfoSliderComponent } from './components/greeting-info-slider/greeting-info-slider.component';
-import { KundenComponent } from './components/kunden/kunden.component';
-import { AboutUsComponent } from './components/about-us/about-us.component';
-
-// For cookie popup
-const cookieConfig: NgcCookieConsentConfig = {
-    cookie: {
-        domain: 'betterzon.xyz'
-    },
-    palette: {
-        popup: {
-            background: '#000'
-        },
-        button: {
-            background: '#f1d600'
-        }
-    },
-    theme: 'edgeless',
-    type: 'opt-out',
-    layout: 'my-custom-layout',
-    layouts: {
-        'my-custom-layout': '{{messagelink}}{{compliance}}'
-    },
-    elements: {
-        messagelink: `
-    <span id="cookieconsent:desc" class="cc-message">{{message}}
-      <a aria-label="learn more about cookies" tabindex="0" class="cc-link" href="{{whatAreCookiesHref}}" target="_blank">{{whatAreCookiesLink}}</a>
-      <a aria-label="learn more about our privacy policy" tabindex="1" class="cc-link" href="{{privacyPolicyHref}}" target="_blank">{{privacyPolicyLink}}</a>
-    </span>
-    `,
-    },
-    content: {
-        // Custom message
-        // message: 'By using our site, you acknowledge that you have read and understand our ',
-
-        whatAreCookiesLink: 'Learn more',
-        whatAreCookiesHref: 'https://www.cookiesandyou.com/',
-
-        privacyPolicyLink: 'Privacy Policy',
-        privacyPolicyHref: '/datenschutz',
-    }
-};
 
 @NgModule({
     declarations: [
@@ -84,46 +15,12 @@ const cookieConfig: NgcCookieConsentConfig = {
         ProductListComponent,
         LandingpageComponent,
         ProductDetailPageComponent,
-        FooterComponent,
+        FooterComponent
-        ProductDetailsComponent,
-        ProductSearchPageComponent,
-        HeaderComponent,
-        NewestPricesListComponent,
-        PageNotFoundPageComponent,
-        ImprintComponent,
-        PrivacyComponent,
-        TopBarComponent,
-        BottomBarComponent,
-        HotDealsWidgetComponent,
-        SliderForProductsComponent,
-        RegistrationComponent,
-        SigninComponent,
-        CopyrightComponent,
-        GreetingInfoSliderComponent,
-        KundenComponent,
-        AboutUsComponent,
     ],
     imports: [
         BrowserModule,
         AppRouting,
-        HttpClientModule,
+        HttpClientModule
-        NgApexchartsModule,
-        FormsModule,
-        MatMenuModule,
-        BrowserAnimationsModule,
-        NgcCookieConsentModule.forRoot(cookieConfig),
-        MatSlideToggleModule,
-        MatButtonModule,
-        MatToolbarModule,
-        MatSidenavModule,
-        MatListModule,
-        MatButtonModule,
-        MatIconModule,
-        RouterModule.forRoot([
-            {path: '', component: LandingpageComponent},
-        ]),
-        MatCardModule,
-        ReactiveFormsModule,
     ],
     providers: [],
     bootstrap: [AppComponent]

Frontend/src/app/app.routing.ts

@@ -2,26 +2,13 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {RouterModule, Routes} from '@angular/router';
 import {AppComponent} from './app.component';
-import {ProductListComponent} from './components/product-list/product-list.component';
+import {ProductListComponent} from './product-list/product-list.component';
-import {LandingpageComponent} from './pages/landingpage/landingpage.component';
+import {LandingpageComponent} from './landingpage/landingpage.component';
-import {ProductDetailPageComponent} from './pages/product-detail-page/product-detail-page.component';
+import {ProductDetailPageComponent} from './product-detail-page/product-detail-page.component';
-import {ProductSearchPageComponent} from './pages/product-search-page/product-search-page.component';
-import {PageNotFoundPageComponent} from './pages/page-not-found-page/page-not-found-page.component';
-import {ImprintComponent} from './pages/imprint/imprint.component';
-import {PrivacyComponent} from './pages/privacy/privacy.component';
-import {SigninComponent} from "./components/auth/signin/signin.component";
-import {RegistrationComponent} from "./components/auth/registration/registration.component";
 
 const routes: Routes = [
-    {path: '', component: LandingpageComponent, pathMatch: 'full'},
+    {path: '', component: LandingpageComponent},
-    {path: 'search', component: ProductSearchPageComponent},
+    {path: 'product', component: ProductDetailPageComponent}
-    {path: 'product/:id', component: ProductDetailPageComponent},
-    {path: 'impressum', component: ImprintComponent},
-    {path: 'datenschutz', component: PrivacyComponent},
-    {path: 'signin', component: SigninComponent},
-    {path: 'registration', component: RegistrationComponent},
-    {path: "product-detail", component: ProductDetailPageComponent},
-    {path: '**', component: PageNotFoundPageComponent}
 ];
 
 @NgModule({

Frontend/src/app/components/about-us/about-us.component.html

@@ -1,17 +0,0 @@
-<section class="page-section bg-primary text-white mb-0" id="about">
-    <div class="container">
-        <!-- About Section Heading-->
-        <h2 class="page-section-heading text-center text-uppercase text-white">About</h2>
-        <!-- Icon Divider-->
-        <div class="divider-custom divider-light">
-            <div class="divider-custom-line"></div>
-            <div class="divider-custom-icon"><i class="fas fa-star"></i></div>
-            <div class="divider-custom-line"></div>
-        </div>
-        <!-- About Section Content-->
-        <div class="row">
-            <div class="col-lg-4 ms-auto"><p class="lead">text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries</p></div>
-            <div class="col-lg-4 me-auto"><p class="lead">text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries</p></div>
-        </div>
-    </div>
-</section>

Frontend/src/app/components/about-us/about-us.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AboutUsComponent } from './about-us.component';
-
-describe('AboutUsComponent', () => {
-  let component: AboutUsComponent;
-  let fixture: ComponentFixture<AboutUsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AboutUsComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AboutUsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

Frontend/src/app/components/about-us/about-us.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-about-us',
-  templateUrl: './about-us.component.html',
-  styleUrls: ['./about-us.component.css']
-})
-export class AboutUsComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}

Frontend/src/app/components/auth/auth-routing.module.ts

@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import {RegistrationComponent} from "./registration/registration.component";
-import {SigninComponent} from "./signin/signin.component";
-import {ResetpasswortComponent} from "./resetpasswort/resetpasswort.component";
-
-const routes: Routes = [
-    {
-        path: 'registration',
-        component: RegistrationComponent
-    },
-    {
-        path: 'signin',
-        component: SigninComponent
-    },
-    {
-        path: 'resetpasswort',
-        component: ResetpasswortComponent
-    },
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class AuthRoutingModule { }

Frontend/src/app/components/auth/auth.module.ts

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { AuthRoutingModule } from './auth-routing.module';
-import { SigninComponent } from "./signin/signin.component";
-import { RegistrationComponent } from './registration/registration.component';
-import { ResetpasswortComponent } from './resetpasswort/resetpasswort.component';
-
-
-@NgModule({
-  declarations: [SigninComponent, RegistrationComponent, ResetpasswortComponent],
-  imports: [
-    CommonModule,
-    AuthRoutingModule,
-  ],
-  exports: [
-      SigninComponent,
-      RegistrationComponent,
-      ResetpasswortComponent,
-  ],
-})
-export class AuthModule { }

Frontend/src/app/components/auth/registration/registration.component.css

@@ -1,76 +0,0 @@
-.main-content{
-    width: 50%;
-    border-radius: 20px;
-    box-shadow: 0 5px 5px rgba(0,0,0,.4);
-    margin: 5em auto;
-    display: flex;
-}
-.company__info{
-    background-color: #008080;
-    border-top-left-radius: 20px;
-    border-bottom-left-radius: 20px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    color: #fff;
-}
-.fa-android{
-    font-size:3em;
-}
-@media screen and (max-width: 640px) {
-    .main-content{width: 90%;}
-    .company__info{
-        display: none;
-    }
-    .login_form{
-        border-top-left-radius:20px;
-        border-bottom-left-radius:20px;
-    }
-}
-@media screen and (min-width: 642px) and (max-width:800px){
-    .main-content{width: 70%;}
-}
-.row > h2{
-    color:#008080;
-}
-.login_form{
-    background-color: #fff;
-    border-top-right-radius:20px;
-    border-bottom-right-radius:20px;
-    border-top:1px solid #ccc;
-    border-right:1px solid #ccc;
-}
-form{
-    padding: 0 2em;
-}
-.form__input{
-    width: 100%;
-    border:0px solid transparent;
-    border-radius: 0;
-    border-bottom: 1px solid #aaa;
-    padding: 1em .5em .5em;
-    padding-left: 2em;
-    outline:none;
-    margin:1.5em auto;
-    transition: all .5s ease;
-}
-.form__input:focus{
-    border-bottom-color: #008080;
-    box-shadow: 0 0 5px rgba(0,80,80,.4);
-    border-radius: 4px;
-}
-.btn_signin{
-    transition: all .5s ease;
-    width: 100%;
-    border-radius: 30px;
-    color:#008080;
-    font-weight: 600;
-    background-color: #fff;
-    border: 1px solid #008080;
-    margin-top: 1.5em;
-    margin-bottom: 1em;
-}
-.btn_signin:hover, .btn:focus{
-    background-color: #008080;
-    color:#fff;
-}

Frontend/src/app/components/auth/registration/registration.component.html

@@ -1,43 +0,0 @@
-<div class="container">
-    <div class="row main-content bg-success text-center">
-        <div class="col-md-4 text-center company__info">
-            <span class="company__logo" routerLink=""><h2><img src="assets/images/Betterzon.svg"></h2></span>
-        </div>
-        <div class="col-md-8 col-xs-12 col-sm-12 login_form ">
-            <div class="container-fluid">
-                <div class="row">
-                    <h2>Konto erstellen</h2>
-                </div>
-                <div class="row">
-                    <form [formGroup]="form" class="form-group" (ngSubmit)="onSubmit()">
-                        <div class="row">
-                            <input type="text" formControlName="username" id="username" name="username" class="form__input" placeholder="Username">
-                            <div *ngIf="submitted && me.username.errors" class="invalid-feedback">
-                                <div *ngIf="me.username.errors.required">Username is required</div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <!-- <span class="fa fa-lock"></span> -->
-                            <input type="email" formControlName="email" name="email" id="email" class="form__input" placeholder= "E-Mail">
-                        </div>
-                        <div class="row">
-                            <!-- <span class="fa fa-lock"></span> -->
-                            <input type="password" formControlName="password" name="password" id="password" class="form__input" placeholder="Kennwort">
-                        </div>
-                        <!--
-                        <div class="row">
-                            <input type="password" name="password" id="password_repeated" class="form__input" placeholder="Kennwort bestätigen">
-                        </div> -->
-                        <div class="row">
-                            <input type="submit" value="Erstellen" class="btn_signin">
-                        </div>
-                        <div class="row">
-                            <a href="/signin">Sich anmelden</a>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-

Frontend/src/app/components/auth/registration/registration.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { RegistrationComponent } from './registration.component';
-
-describe('RegistrationComponent', () => {
-  let component: RegistrationComponent;
-  let fixture: ComponentFixture<RegistrationComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ RegistrationComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegistrationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

Frontend/src/app/components/auth/registration/registration.component.ts

@@ -1,37 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import {ApiService} from "../../../services/api.service";
-
-
-@Component({
-  selector: 'app-registration',
-  templateUrl: './registration.component.html',
-  styleUrls: ['./registration.component.css']
-})
-export class RegistrationComponent implements OnInit {
-    form: any;
-    loading = false;
-    submitted = false;
-
-  constructor(
-      private formBuilder: FormBuilder,
-      private api : ApiService
-  ) { }
-
-  ngOnInit(): void {
-      this.form = this.formBuilder.group({
-          username: ['', Validators.required],
-          email: ['', Validators.required],
-          password: ['', [
-              Validators.required,
-              Validators.minLength(8)]
-          ],
-      });
-  }
-
-  get me() { return this.form.controls; }
-
-  onSubmit() {
-      this.api.registerUser(this.form.value.username, this.form.value.password, this.form.value.email).subscribe(res=>console.log(res));
-  }
-}

Frontend/src/app/components/auth/resetpasswort/resetpasswort.component.html

@@ -1 +0,0 @@
-<p>resetpasswort works!</p>

Frontend/src/app/components/auth/resetpasswort/resetpasswort.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResetpasswortComponent } from './resetpasswort.component';
-
-describe('ResetpasswortComponent', () => {
-  let component: ResetpasswortComponent;
-  let fixture: ComponentFixture<ResetpasswortComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ResetpasswortComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ResetpasswortComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

Frontend/src/app/components/auth/resetpasswort/resetpasswort.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-resetpasswort',
-  templateUrl: './resetpasswort.component.html',
-  styleUrls: ['./resetpasswort.component.css']
-})
-export class ResetpasswortComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}

Frontend/src/app/components/auth/signin/signin.component.css

@@ -1,76 +0,0 @@
-.main-content{
-    width: 50%;
-    border-radius: 20px;
-    box-shadow: 0 5px 5px rgba(0,0,0,.4);
-    margin: 5em auto;
-    display: flex;
-}
-.company__info{
-    background-color: #008080;
-    border-top-left-radius: 20px;
-    border-bottom-left-radius: 20px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    color: #fff;
-}
-.fa-android{
-    font-size:3em;
-}
-@media screen and (max-width: 640px) {
-    .main-content{width: 90%;}
-    .company__info{
-        display: none;
-    }
-    .login_form{
-        border-top-left-radius:20px;
-        border-bottom-left-radius:20px;
-    }
-}
-@media screen and (min-width: 642px) and (max-width:800px){
-    .main-content{width: 70%;}
-}
-.row > h2{
-    color:#008080;
-}
-.login_form{
-    background-color: #fff;
-    border-top-right-radius:20px;
-    border-bottom-right-radius:20px;
-    border-top:1px solid #ccc;
-    border-right:1px solid #ccc;
-}
-form{
-    padding: 0 2em;
-}
-.form__input{
-    width: 100%;
-    border:0px solid transparent;
-    border-radius: 0;
-    border-bottom: 1px solid #aaa;
-    padding: 1em .5em .5em;
-    padding-left: 2em;
-    outline:none;
-    margin:1.5em auto;
-    transition: all .5s ease;
-}
-.form__input:focus{
-    border-bottom-color: #008080;
-    box-shadow: 0 0 5px rgba(0,80,80,.4);
-    border-radius: 4px;
-}
-.btn_signin{
-    transition: all .5s ease;
-    width: 100%;
-    border-radius: 30px;
-    color:#008080;
-    font-weight: 600;
-    background-color: #fff;
-    border: 1px solid #008080;
-    margin-top: 1.5em;
-    margin-bottom: 1em;
-}
-.btn_signin:hover, .btn:focus{
-    background-color: #008080;
-    color:#fff;
-}

Frontend/src/app/components/auth/signin/signin.component.html

@@ -1,34 +0,0 @@
-<div class="container">
-    <div class="row main-content bg-success text-center">
-        <div class="col-md-4 text-center company__info">
-            <span class="company__logo" routerLink=""><h2><img src="assets/images/Betterzon.svg"></h2></span>
-        </div>
-        <div class="col-md-8 col-xs-12 col-sm-12 login_form ">
-            <div class="container-fluid">
-                <div class="row">
-                    <h2>Anmelden</h2>
-                </div>
-                <div class="row">
-                    <form [formGroup]="loginForm" class="form-group" (ngSubmit)="onSubmit()">
-                        <div class="row">
-                            <input type="text" formControlName="username" name="username" id="username" class="form__input" placeholder="Username">
-                        </div>
-                        <div class="row">
-                            <!-- <span class="fa fa-lock"></span> -->
-                            <input type="password" formControlName="password" name="password" id="password" class="form__input" placeholder="Password">
-                        </div>
-                        <div class="row">
-                            <input type="submit" value="Anmelden" class="btn_signin">
-                        </div>
-                    </form>
-                </div>
-                <div class="row">
-                    <a href="/registration">Konto erstellen</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-

Frontend/src/app/components/auth/signin/signin.component.ts

@@ -1,56 +0,0 @@
-import {Component, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {ApiService} from '../../../services/api.service';
-import {Router} from '@angular/router';
-
-@Component({
-    selector: 'app-signin',
-    templateUrl: './signin.component.html',
-    styleUrls: ['./signin.component.css']
-})
-
-export class SigninComponent implements OnInit {
-
-    loginForm: FormGroup;
-    loading = false;
-    submitted = false;
-    private isSuccessful: boolean;
-    private isSignUpFailed: boolean;
-    private errorMessage: '';
-
-
-    constructor(
-        private formBuilder: FormBuilder,
-        private api: ApiService,
-        private router: Router
-    ) {
-    }
-
-    ngOnInit(): void {
-        this.loginForm = this.formBuilder.group({
-            username: ['', Validators.required],
-            password: ['', [Validators.required, Validators.minLength(8)]]
-        });
-    }
-
-    onSubmit(): void {
-        this.submitted = true;
-
-        if (this.loginForm.invalid) {
-            return;
-        }
-
-        this.api.loginUser(this.loginForm.value.username, this.loginForm.value.password)
-            .subscribe(
-                data => {
-                    this.router.navigate(['']);
-                    this.isSuccessful = true;
-                    this.isSignUpFailed = false;
-                    this.api.saveSessionInfoToLocalStorage(data);
-                },
-                err => {
-                    this.errorMessage = err.error.message;
-                    this.isSignUpFailed = true;
-                });
-    }
-}

Frontend/src/app/components/bottom-bar/bottom-bar.component.css

@@ -1,63 +0,0 @@
-.bottom-bar-wrapper {
-    display: grid;
-    grid-template-columns: 546px 546px 546px;
-    grid-template-rows: 70px 70px 70px;
-    grid-column-gap: 0px;
-    grid-row-gap: 0px;
-}
-
-.folge-uns-item {
-    grid-column: 2; grid-row: 1;
-    justify-self: center;
-}
-
-.link-items {
-    grid-column: 2; grid-row: 2;
-    justify-self: center;
-}
-
-.footer-links li {
-    display: inline;
-    margin-right: 60px;
-}
-
-#footer-line {
-    grid-area: 3/1/3/4;
-    width: 100%;
-    background-color: #000000;
-    height: 2px;
-}
-
-.bottom-logo {
-    grid-column: 1; grid-row: 3;
-}
-
-.bottom-info {
-    grid-column: 3; grid-row: 3;
-    justify-self: right;
-}
-
-#folge {
-    font-size: 46px;
-    font-weight: bold;
-    color: #E53167;
-    margin-right: 10px;
-}
-
-#uns {
-    font-size: 32px;
-    font-weight: bold;
-    color: #000000;
-}
-
-#better {
-    font-size: 28px;
-    font-weight: bold;
-    color: #3480E3;
-}
-
-#zon {
-    font-size: 28px;
-    font-weight: bold;
-    color: #E53167;
-}

Frontend/src/app/components/bottom-bar/bottom-bar.component.html

@@ -1,31 +0,0 @@
-<footer class="footer text-center">
-    <div class="container">
-        <div class="row">
-            <!-- Footer Location-->
-            <div class="col-lg-4 mb-5 mb-lg-0">
-                <h4 class="text-uppercase mb-4">Location</h4>
-                <p class="lead mb-0">
-                    70376 Stuttgart
-                    <br />
-
-                </p>
-            </div>
-            <!-- Footer Social Icons-->
-            <div class="col-lg-4 mb-5 mb-lg-0">
-                <h4 class="text-uppercase mb-4">FOLGE UNS</h4>
-                <a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-github"></i></a>
-                <a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-twitter"></i></a>
-                <a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-linkedin-in"></i></a>
-                <a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-dribbble"></i></a>
-            </div>
-            <!-- Footer About Text-->
-            <div class="col-lg-4">
-                <h4 class="text-uppercase mb-4">SOME INFO</h4>
-                <p class="lead mb-0">
-                    text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries
-                </p>
-            </div>
-        </div>
-    </div>
-</footer>
-

Frontend/src/app/components/bottom-bar/bottom-bar.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-bottom-bar',
-  templateUrl: "./bottom-bar.component.html",
-  styleUrls: ["./bottom-bar.component.css"]
-})
-export class BottomBarComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}

Frontend/src/app/components/copyright/copyright.component.html

@@ -1,3 +0,0 @@
-<div class="copyright py-4 text-center text-white">
-    <div class="container"><small>Copyright &copy; Your Website 2021</small></div>
-</div>