From 3a3422ea05ab1c5196c9eedf057aaf485f4140a5 Mon Sep 17 00:00:00 2001
From: Patrick <50352812+Mueller-Patrick@users.noreply.github.com>
Date: Fri, 11 Dec 2020 09:43:14 +0100
Subject: [PATCH 01/10] Update README.md
---
README.md | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 45510c8..8e3907e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@ Blog: https://blog.betterzon.xyz
Wiki: https://github.com/Mueller-Patrick/Betterzon/wiki
# Project Status
-[](https://github.com/Mueller-Patrick/Betterzon/actions?query=branch%3Amaster)
-
-# How to build
-Run ```ng build --prod``` to build a production version of the project
+
+
+
+[](https://www.betterzon.xyz)
+[](https://blog.betterzon.xyz)
From 05d4795f9dc11c854abf83de28fbf4c6fad601b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?=
Date: Thu, 1 Apr 2021 10:34:35 +0200
Subject: [PATCH 02/10] BETTERZON-49: Creating Module for Crawler
---
.idea/modules.xml | 1 +
Backend/src/models/categories/categories.router.ts | 6 +++---
Backend/src/models/products/products.router.ts | 8 +++++---
Crawler/requirements.txt | 1 +
4 files changed, 10 insertions(+), 6 deletions(-)
create mode 100644 Crawler/requirements.txt
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 66aebf2..44a6847 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
+
diff --git a/Backend/src/models/categories/categories.router.ts b/Backend/src/models/categories/categories.router.ts
index 409ca71..1af2db5 100644
--- a/Backend/src/models/categories/categories.router.ts
+++ b/Backend/src/models/categories/categories.router.ts
@@ -19,7 +19,7 @@ export const categoriesRouter = express.Router();
* Controller Definitions
*/
-// GET items/
+// GET categories/
categoriesRouter.get('/', async (req: Request, res: Response) => {
try {
@@ -31,7 +31,7 @@ categoriesRouter.get('/', async (req: Request, res: Response) => {
}
});
-// GET items/:id
+// GET categories/:id
categoriesRouter.get('/:id', async (req: Request, res: Response) => {
const id: number = parseInt(req.params.id, 10);
@@ -50,7 +50,7 @@ categoriesRouter.get('/:id', async (req: Request, res: Response) => {
}
});
-// GET items/:name
+// GET categories/search/:term
categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
const term: string = req.params.term;
diff --git a/Backend/src/models/products/products.router.ts b/Backend/src/models/products/products.router.ts
index 0c7cc5c..f2f3353 100644
--- a/Backend/src/models/products/products.router.ts
+++ b/Backend/src/models/products/products.router.ts
@@ -19,7 +19,7 @@ export const productsRouter = express.Router();
* Controller Definitions
*/
-// GET items/
+// GET products/
productsRouter.get('/', async (req: Request, res: Response) => {
try {
@@ -31,7 +31,7 @@ productsRouter.get('/', async (req: Request, res: Response) => {
}
});
-// GET items/:id
+// GET products/:id
productsRouter.get('/:id', async (req: Request, res: Response) => {
const id: number = parseInt(req.params.id, 10);
@@ -50,7 +50,7 @@ productsRouter.get('/:id', async (req: Request, res: Response) => {
}
});
-// GET items/:name
+// GET products/search/:term
productsRouter.get('/search/:term', async (req: Request, res: Response) => {
const term: string = req.params.term;
@@ -69,6 +69,8 @@ productsRouter.get('/search/:term', async (req: Request, res: Response) => {
}
});
+// GET products/bestDeals
+
// POST items/
diff --git a/Crawler/requirements.txt b/Crawler/requirements.txt
new file mode 100644
index 0000000..d4a7eda
--- /dev/null
+++ b/Crawler/requirements.txt
@@ -0,0 +1 @@
+pymysql
From bebf1b12365ad5714fd7f035509cc17f537d744c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?=
Date: Thu, 1 Apr 2021 11:37:20 +0200
Subject: [PATCH 03/10] BETTERZON-49: Adding module .iml
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 103250b..ff35e3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ speed-measure-plugin*.json
!Frontend.iml
!Backend.iml
!CucumberTests.iml
+!Crawler.iml
# Include IntelliJ modules
!/.idea/modules.xml
From 8055f811d76e1d86b41eef9f68e185c33c0941d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?=
Date: Thu, 1 Apr 2021 11:37:20 +0200
Subject: [PATCH 04/10] BETTERZON-49: Adding module .iml
---
.gitignore | 1 +
Crawler/Crawler.iml | 8 ++++++++
2 files changed, 9 insertions(+)
create mode 100644 Crawler/Crawler.iml
diff --git a/.gitignore b/.gitignore
index 103250b..ff35e3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ speed-measure-plugin*.json
!Frontend.iml
!Backend.iml
!CucumberTests.iml
+!Crawler.iml
# Include IntelliJ modules
!/.idea/modules.xml
diff --git a/Crawler/Crawler.iml b/Crawler/Crawler.iml
new file mode 100644
index 0000000..80cc739
--- /dev/null
+++ b/Crawler/Crawler.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
From fa4a14b6ad9f2290d4a14dd51ac123e8bd9da7d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?=
Date: Mon, 5 Apr 2021 12:56:21 +0200
Subject: [PATCH 05/10] BETTERZON-36: Adding imprint and privacy policy
---
Frontend/src/app/app.module.ts | 6 +-
Frontend/src/app/app.routing.ts | 4 +
.../components/footer/footer.component.css | 19 +-
.../components/footer/footer.component.html | 8 +-
.../app/components/footer/footer.component.ts | 10 +-
.../app/pages/imprint/imprint.component.css | 4 +
.../app/pages/imprint/imprint.component.html | 59 +++
.../pages/imprint/imprint.component.spec.ts | 25 ++
.../app/pages/imprint/imprint.component.ts | 15 +
.../app/pages/privacy/privacy.component.css | 4 +
.../app/pages/privacy/privacy.component.html | 408 ++++++++++++++++++
.../pages/privacy/privacy.component.spec.ts | 25 ++
.../app/pages/privacy/privacy.component.ts | 15 +
13 files changed, 597 insertions(+), 5 deletions(-)
create mode 100644 Frontend/src/app/pages/imprint/imprint.component.css
create mode 100644 Frontend/src/app/pages/imprint/imprint.component.html
create mode 100644 Frontend/src/app/pages/imprint/imprint.component.spec.ts
create mode 100644 Frontend/src/app/pages/imprint/imprint.component.ts
create mode 100644 Frontend/src/app/pages/privacy/privacy.component.css
create mode 100644 Frontend/src/app/pages/privacy/privacy.component.html
create mode 100644 Frontend/src/app/pages/privacy/privacy.component.spec.ts
create mode 100644 Frontend/src/app/pages/privacy/privacy.component.ts
diff --git a/Frontend/src/app/app.module.ts b/Frontend/src/app/app.module.ts
index eef8e23..a324b8d 100644
--- a/Frontend/src/app/app.module.ts
+++ b/Frontend/src/app/app.module.ts
@@ -15,6 +15,8 @@ import {HeaderComponent} from './components/header/header.component';
import {NewestPricesListComponent} from './components/newest-prices-list/newest-prices-list.component';
import {FormsModule} from '@angular/forms';
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';
@NgModule({
declarations: [
@@ -27,7 +29,9 @@ import {PageNotFoundPageComponent} from './pages/page-not-found-page/page-not-fo
ProductSearchPageComponent,
HeaderComponent,
NewestPricesListComponent,
- PageNotFoundPageComponent
+ PageNotFoundPageComponent,
+ ImprintComponent,
+ PrivacyComponent
],
imports: [
BrowserModule,
diff --git a/Frontend/src/app/app.routing.ts b/Frontend/src/app/app.routing.ts
index efb2a36..c38d9ba 100644
--- a/Frontend/src/app/app.routing.ts
+++ b/Frontend/src/app/app.routing.ts
@@ -7,11 +7,15 @@ import {LandingpageComponent} from './pages/landingpage/landingpage.component';
import {ProductDetailPageComponent} from './pages/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';
const routes: Routes = [
{path: '', component: LandingpageComponent},
{path: 'search', component: ProductSearchPageComponent},
{path: 'product/:id', component: ProductDetailPageComponent},
+ {path: 'impressum', component: ImprintComponent},
+ {path: 'datenschutz', component: PrivacyComponent},
{path: '**', component: PageNotFoundPageComponent}
];
diff --git a/Frontend/src/app/components/footer/footer.component.css b/Frontend/src/app/components/footer/footer.component.css
index c39569a..0d7949b 100644
--- a/Frontend/src/app/components/footer/footer.component.css
+++ b/Frontend/src/app/components/footer/footer.component.css
@@ -5,7 +5,6 @@
width: 100%;
background-color: dimgrey;
color: white;
- text-align: center;
}
.icon-3d {
@@ -13,5 +12,23 @@
color: #fff;
}
+#footer-icons {
+ text-align: center;
+}
+
+#imprintSection {
+ position: fixed;
+ right: 1em;
+ bottom: 1em;
+ width: 100%;
+ text-align: right;
+ padding-right: 1em;
+}
+
+#imprintSection a {
+ color: white;
+ text-decoration: none;
+}
+
diff --git a/Frontend/src/app/components/footer/footer.component.html b/Frontend/src/app/components/footer/footer.component.html
index e6d17d8..a57e963 100644
--- a/Frontend/src/app/components/footer/footer.component.html
+++ b/Frontend/src/app/components/footer/footer.component.html
@@ -3,12 +3,16 @@