Commit Graph

198 Commits

Author SHA1 Message Date
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
1b1cdb59f6
BETTERZON-48: Adding API functionality to get best available deals (#20) 2021-04-05 16:34:11 +02:00
Patrick
997b68abf4
Merge pull request #21 from Mueller-Patrick/BETTERZON-36
BETTERZON-36: Adding imprint and privacy policy
2021-04-05 16:32:05 +02:00
Patrick
4a37fd3619
Merge branch 'develop' into BETTERZON-36 2021-04-05 16:30:29 +02:00
Patrick
2dfa4e9a96
BETTERZON-53: Styling clickable stuff on hover (#22) 2021-04-05 16:30:17 +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
a4b8af7d64 Merge branch 'develop' of https://github.com/Mueller-Patrick/Betterzon into develop 2021-04-01 11:38:40 +02:00
8055f811d7 BETTERZON-49: Adding module .iml 2021-04-01 11:38:03 +02:00
bebf1b1236 BETTERZON-49: Adding module .iml 2021-04-01 11:37:20 +02:00
Patrick
be50069bc0
Merge pull request #19 from Mueller-Patrick/BETTERZON-48
BETTERZON-49: Creating Module for Crawler
2021-04-01 10:35:44 +02:00
05d4795f9d BETTERZON-49: Creating Module for Crawler 2021-04-01 10:34:35 +02:00
Patrick
3a3422ea05
Update README.md 2020-12-11 09:43:14 +01:00
Patrick
ca9f27bbf6
Merge pull request #18 from Mueller-Patrick/develop
Fix deployment
2020-12-09 22:25:50 +01:00
Patrick
31af553f5e
Merge pull request #17 from Mueller-Patrick/BETTERZON-42
Fixing Footer
2020-12-09 22:23:23 +01:00
6ab3fd8bc3 BETTERZON-26: Fixing footer 2020-12-09 22:22:36 +01:00
Patrick
e23ab82812
Merge pull request #16 from Mueller-Patrick/develop
Deploying prototype
2020-12-09 21:40:51 +01:00
Patrick
29aa02e07d
Merge pull request #15 from Mueller-Patrick/BETTERZON-42
Prototype for Midterm UC Demo
2020-12-09 21:39:38 +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
6338060b78 BETTERZON-38: Adjusted prices API 2020-12-09 17:26:56 +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
Patrick
8d0469a907
Merge pull request #14 from Mueller-Patrick/BETTERZON-33
Images and Style for Product List Component
2020-12-08 22:26: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
Patrick
d4487e0095
Merge pull request #13 from Mueller-Patrick/develop
Deploying dev
2020-12-06 23:08:37 +01:00
Patrick
4f3a755f78
Doku merge (#12)
* Added AC-ManageVendorShop.drawio

* Update AC-ManageVendorShop.drawio

* Added AC-ManageVendorShop.png

* Added AC_VendorShop.drawio

* Added Deployment_View.drawio

* Update Deployment_View.drawio

* Added AC_FavoriteShopList.drawio

* Added Deployment_View.png

* Added AC_FavoriteShopList.png

* Added ERM.png

* Adding architectural view

Co-authored-by: henningxtro <Henning.Sextro@gmail.com>
2020-12-06 23:06:58 +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
Patrick
04308e187e
Merge pull request #11 from Mueller-Patrick/doku
doku
2020-12-03 10:59:37 +01:00
1ef672cc23 Revert "Added pm2 environment file"
This reverts commit 7d693939
2020-12-03 10:58:05 +01:00
3e7020d60b updated use case diagram 2020-12-03 10:52:40 +01:00
Patrick
242904c5f5
Merge pull request #10 from Mueller-Patrick/BETTERZON-35
BETTERZON-35 added footer
2020-12-02 22:58:37 +01:00
rebooooorn
cce7b58497 BETTERZON-35 added footer 2020-12-02 22:23:10 +01:00
Patrick
38b20d28cb
Merge pull request #8 from Mueller-Patrick/BETTERZON-35
Betterzon 35
2020-12-02 19:11:20 +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
Patrick
bbf6a39cb8
Merge pull request #9 from Mueller-Patrick/BETTERZON-33
Betterzon 33
2020-12-02 19:03:14 +01:00
rebooooorn
1005ec9b3e Merge branch 'BETTERZON-35' of https://github.com/Mueller-Patrick/Betterzon into BETTERZON-35 2020-12-02 19:00:03 +01:00
rebooooorn
3755402781 resolved conflicts 2020-12-02 18:59:54 +01:00
dab6217436 Fixing conflict 2020-12-02 18:54:38 +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