7313de0c6d
Merge remote-tracking branch 'origin/BETTERZON-109' into BETTERZON-109
...
# Conflicts:
# Backend/package-lock.json
2021-05-25 09:47:32 +02:00
df43febc45
wip: testing ng-carousel
2021-05-25 08:56:15 +02:00
5712c5c69e
Merge remote-tracking branch 'origin/develop' into BETTERZON-109
...
# Conflicts:
# Frontend/src/app/app.component.html
# Frontend/src/app/app.module.ts
# Frontend/src/app/components/top-bar/top-bar.component.css
# Frontend/src/app/components/top-bar/top-bar.component.html
# Frontend/src/app/pages/landingpage/landingpage.component.html
# Frontend/src/styles.css
2021-05-20 10:35:41 +02:00
Reboooooorn
fc9c7f63cf
BETTERZON-78 ( #39 )
...
* BETTERZON-31, dependencies.
* BETTERZON-31: Fixing dependencies
* BETTERZON-31,
BETTERZON-50
info popover and footer had been changed.
* BETTERZON-74
simple top-bar has been created.
* WIP: creating footer using grid.
* BETTERZON-78 adding bottom bar and top bar
* Adding cookieconsent as dependency again since it was removed by a merge
* Adding cookieconsent as dependency again since it was removed by a merge
* Apply suggestions from code review
Switching from single to double quotes
* BETTERZON-78 - grid added, structured as in Adobe XD mockup
Co-authored-by: Patrick Müller <patrick@mueller-patrick.tech>
Co-authored-by: Patrick <50352812+Mueller-Patrick@users.noreply.github.com>
2021-05-20 10:26:10 +02:00
Patrick
ead1f10b25
BETTERZON-110: Refactoring, reformatting and commenting api service ( #56 )
2021-05-20 10:20:50 +02:00
Patrick
712f6c9034
BETTERZON-101: Adding service functions for pricealarms api ( #55 )
...
- Not properly tested though as login functionality is required to test but not yet implemented
2021-05-19 19:46:30 +02:00
0ff4a2e3c2
wip: component created and added to the app.module.ts
2021-05-17 11:11:17 +02:00
c936ec97c0
wip: all components were wrapped now. Grid structure has been applied to the main wrapper-class "container".
2021-05-16 23:49:57 +02:00
94c3f537bc
wip: new component created and added to the app.module.ts. Added a minimal grid layout.
2021-05-16 22:42:59 +02:00
e8bb639ebd
wip: component rewritten, simple grid applied.
2021-05-15 21:42:52 +02:00
ceef01899d
Merge remote-tracking branch 'origin/BETTERZON-78' into BETTERZON-78
2021-05-13 19:25:16 +02:00
464414cbe2
BETTERZON 78: logo and follow us edited, links added.
2021-05-13 19:24:53 +02:00
Patrick
0f19bd77cd
Merge branch 'develop' into BETTERZON-78
2021-05-11 21:59:02 +02:00
a3d9b826f0
BETTERZON-78 - grid added, structured as in Adobe XD mockup
2021-05-11 11:54:02 +02:00
Patrick
3874957d5a
BETTERZON-89: Refactoring / Reformatting and adding unit tests ( #41 )
2021-05-10 20:11:45 +02:00
Patrick
ac237a6ba1
Apply suggestions from code review
...
Switching from single to double quotes
2021-05-08 20:00:30 +02:00
f71f53c869
Adding cookieconsent as dependency again since it was removed by a merge
2021-05-05 19:59:02 +02:00
6982a139af
Adding cookieconsent as dependency again since it was removed by a merge
2021-05-05 18:48:53 +02:00
b0158198d4
Merge branch 'BETTERZON-78' of https://github.com/Mueller-Patrick/Betterzon into BETTERZON-78
2021-05-05 18:42:52 +02:00
7e5ef71924
BETTERZON-78 adding bottom bar and top bar
2021-05-05 18:40:22 +02:00
b17b92fcc3
Merge remote-tracking branch 'origin/develop' into BETTERZON-78
...
# Conflicts:
# Frontend/angular.json
# Frontend/package-lock.json
# Frontend/src/app/app.module.ts
# Frontend/src/styles.css
2021-05-05 18:39:04 +02:00
0c50162fdf
WIP: creating footer using grid.
2021-05-04 22:17:15 +02:00
Patrick
e9d03b9cbb
BETTERZON-83: FE unit testing ( #35 )
...
* BETTERZON-83: Making pre-generated unit tests work
* BETTERZON-83: Writing unit tests for angular to improve code coverage
2021-05-02 15:58:47 +02:00
825f744af9
BETTERZON-74
...
simple top-bar has been created.
2021-04-28 17:53:56 +02:00
Reboooooorn
632491c33d
BETTERZON-31, BETTERZON-50 ( #25 )
...
* BETTERZON-31, dependencies.
* BETTERZON-31: Fixing dependencies
* BETTERZON-31,
BETTERZON-50
info popover and footer had been changed.
Co-authored-by: Patrick Müller <patrick@mueller-patrick.tech>
2021-04-08 11:28:05 +02:00
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
