Commit Graph

40 Commits

Author SHA1 Message Date
e0f1724d95 Merge remote-tracking branch 'origin/develop' into BETTERZON-52
# Conflicts:
#	Frontend/angular.json
#	Frontend/package-lock.json
#	Frontend/package.json
#	Frontend/src/app/app.module.ts
#	Frontend/src/index.html
2021-04-08 10:52:52 +02:00
93b17bc65f BETTERZON-31,
BETTERZON-50

info popover and footer had been changed.
2021-04-08 10:42:45 +02:00
55a019d217
BETTERZON-49 (#24)
* BETTERZON-49: Creating Dockerfile

* BETTERZON-49: Added minimal Flask API as Docker container

Co-authored-by: Patrick Müller <patrick@mueller-patrick.tech>
2021-04-07 23:34:08 +02:00
Patrick
4d4a391f38
BETTERZON-37: Adding cookie notice popup (#23) 2021-04-07 09:43:32 +02:00
64074b48e8 Merge remote-tracking branch 'origin/develop' into BETTERZON-31
# Conflicts:
#	Frontend/src/app/app.module.ts
2021-04-06 20:19:40 +02:00
ee50296dc9 BETTERZON-31: Fixing dependencies 2021-04-06 20:18:17 +02:00
57c3f521d1 BETTERZON-31, dependencies. 2021-04-06 20:14:10 +02:00
Patrick
4a37fd3619
Merge branch 'develop' into BETTERZON-36 2021-04-05 16:30:29 +02:00
30f613c18a BETTERZON-53: Styling clickable stuff on hover 2021-04-05 13:40:55 +02:00
fa4a14b6ad BETTERZON-36: Adding imprint and privacy policy 2021-04-05 12:56:21 +02:00
6ab3fd8bc3 BETTERZON-26: Fixing footer 2020-12-09 22:22:36 +01:00
ab277b3311 BETTERZON-42: Fixing amazon price difference percentage 2020-12-09 21:33:37 +01:00
31423c630a BETTERZON-25: Finishing prototype of UC 2020-12-09 20:35:08 +01:00
acdc9a4e92 BETTERZON-42: Functionality and design of various components for the search product UC 2020-12-09 11:00:49 +01:00
e83b2d7511 BETTERZON-42: Restructuring, creating necessary components, design of Product detail component 2020-12-09 07:51:08 +01:00
76545e56ce BETTERZON-42: Adding main components to PDP 2020-12-08 22:24:40 +01:00
ad1e758325 BETTERZON-42: Refactoring components and creating product detail component 2020-12-07 21:37:12 +01:00
bb74e465da BETTERZON-33: Product List Component Layout beta ready 2020-12-04 16:26:29 +01:00
3dbfcaa84d Merge remote-tracking branch 'origin/develop' into BETTERZON-33 2020-12-03 11:32:37 +01:00
940bb85bcd BETTERZON-43: Product List Component style adjustments 2020-12-03 11:32:27 +01:00
87193310a8 BETTERZON-41: Added routing for product detail pages 2020-12-03 11:31:48 +01:00
rebooooorn
cce7b58497 BETTERZON-35 added footer 2020-12-02 22:23:10 +01:00
3ed77e0036 Merge remote-tracking branch 'origin/develop' into BETTERZON-35
# Conflicts:
#	Frontend/package-lock.json
#	Frontend/src/app/app.module.ts
#	Frontend/src/app/hello-world/hello-world.component.html
2020-12-02 19:06:45 +01:00
rebooooorn
3755402781 resolved conflicts 2020-12-02 18:59:54 +01:00
rebooooorn
692ace9701 BETTERZON-35 components created 2020-12-02 18:51:41 +01:00
rebooooorn
1037a5fdcf BETTERZON-35 components created 2020-12-02 18:49:46 +01:00
cbe8ad8f00 BETTERZON-41: Adding PDP Component 2020-12-02 18:36:30 +01:00
4100192f02 BETTERZON-34: Adding landing page component
- Also removing old stuff
2020-12-02 16:43:57 +01:00
23ae0555e5 BETTERZON-33: Styles and redirect upon click on product 2020-12-02 14:14:49 +01:00
24c64dd709 BETTERZON-33: Implementing API service class 2020-12-02 09:57:03 +01:00
e91a0085f6 BETTERZON-33: Added routing 2020-12-02 09:02:24 +01:00
b5c9da6055 BETTERZON-33: Fixed issues with npm 2020-12-01 22:22:09 +01:00
7d9fcfd310 BETTERZON-33: Created product list component 2020-12-01 18:31:45 +01:00
6b8acdab46 BETTERZON-38: Added error handler, preparation for DB accessing 2020-11-25 00:38:16 +01:00
e919d23625 BETTERZON-29: Removing attribute that causes build to crash 2020-11-18 09:21:41 +01:00
a9b60ad0f5 BETTERZON-29: Adding module .iml files 2020-11-15 11:07:43 +01:00
1a6e9d4691 BETTERZON-29: Fuck me 2020-11-13 21:08:45 +01:00
7ae9524d06 BETTERZON-29: Adding hyperlink to blog just for fun 2020-11-13 20:59:16 +01:00
f35bbafaa2 BETTERZON-29: Adding test component 2020-11-13 20:28:42 +01:00
Patrick
421f64ea7e Restructuring project to have different Modules for Frontend, Tests, Backend etc... 2020-11-12 10:32:49 +01:00