Commit Graph

17 Commits

Author SHA1 Message Date
13939a91ca wip: DragScrollModule removed as it caused some dependencies-conflict. 2021-05-27 07:59:29 +02:00
df43febc45 wip: testing ng-carousel 2021-05-25 08:56:15 +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
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
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
Patrick
4d4a391f38
BETTERZON-37: Adding cookie notice popup (#23) 2021-04-07 09:43:32 +02:00
ee50296dc9 BETTERZON-31: Fixing dependencies 2021-04-06 20:18:17 +02:00
e83b2d7511 BETTERZON-42: Restructuring, creating necessary components, design of Product detail component 2020-12-09 07:51:08 +01:00
24c64dd709 BETTERZON-33: Implementing API service class 2020-12-02 09:57:03 +01:00
b5c9da6055 BETTERZON-33: Fixed issues with npm 2020-12-01 22:22:09 +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