Commit Graph

212 Commits

Author SHA1 Message Date
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
e7543e6430
BETTERZON-107: Refactoring code with Proxy as design pattern (#49) 2021-05-20 10:23:41 +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
Patrick
1581184b57
BETTERZON-96: Adding API endpoint for delisting a whole vendor (#54) 2021-05-19 09:08:52 +02:00
henningxtro
26ba21156a
BETTERZON-58 (#53)
* BETTERZON-58: Basic Functionality with scrapy

* Added independent crawler function, yielding price

* moved logic to amazon.py

* .

* moved scrapy files to unused folder

* Added basic amazon crawler using beautifulsoup4

* Connected Api to Crawler

* Fixed string concatenation for sql statement in getProductLinksForProduct

* BETTERZON-58: Fixing SQL insert

* BETTERZON-58: Adding access key verification

* BETTERZON-58: Fixing API endpoint of the crawler
- The list of products in the API request was treated like a string and henceforth, only the first product has been crawled

* Added another selector for price on amazon (does not work for books)

Co-authored-by: root <root@DESKTOP-ARBPL82.localdomain>
Co-authored-by: Patrick Müller <patrick@mueller-patrick.tech>
Co-authored-by: Patrick <50352812+Mueller-Patrick@users.noreply.github.com>
2021-05-19 00:46:14 +02:00
Patrick
3ae68b3df3
BETTERZON-95: Adding API endpoint for getting, inserting and updating contact persons (#52) 2021-05-18 21:14:00 +02:00
Patrick
8f17ae7896
BETTERZON-98: Adding API endpoint for adding price entries as a registered vendor manager (#51) 2021-05-18 00:40:24 +02:00
Patrick
16ed1070c2
BETTERZON-97: Adding API endpoint to get all products listed by a specific vendor (#50) 2021-05-18 00:24:00 +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
Patrick
061d1a46e0
BETTERZON-94: Adding API endpoint to deactivate price listings as a vendor manager (#48) 2021-05-16 13:11:22 +02:00
Patrick
b185e4e5e3
BETTERZON-93: Adding API endpoint to get managed shops (#47) 2021-05-16 12:28:11 +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
cb55cae692
BETTERZON-100: Switching to cookies for session management (#46)
* BETTERZON-100: Switching session handling to cookies

* BETTERZON-100: Some code reformatting

* BETTERZON-100: Some more code reformatting
2021-05-13 18:47:50 +02:00
Patrick
5cc91654c3
BETTERZON-99: Adding some basic cucumber tests (#45) 2021-05-13 16:42:55 +02:00
Patrick
0be394fc1d
BETTERZON-92: Adding API endpoint to edit (update) price alarms (#44) 2021-05-13 00:48:56 +02:00
Patrick
cd0c11dbc7
BETTERZON-91: Adding API endpoint to GET all price alarms for the currently logged in user (#43) 2021-05-13 00:29:01 +02:00
Patrick
f333bbfc05
BETTERZON-90: Adding API endpoint for creating price alarms (#42) 2021-05-12 23:57:24 +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
536acc06ee
Merge branch 'develop' into BETTERZON-78 2021-05-08 20:01:12 +02:00
Patrick
ac237a6ba1
Apply suggestions from code review
Switching from single to double quotes
2021-05-08 20:00:30 +02:00
Patrick
08de32770d
Adding Codacy code quality badge to README 2021-05-07 09:20:53 +02:00
Patrick
058230e9a9
Merge branch 'develop' into BETTERZON-78 2021-05-06 22:47:22 +02:00
Patrick
2f74519da3
BETTERZON-76: Adding method descriptions for backend service methods (#40) 2021-05-05 23:20:57 +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
e1da64cac3
BETTERZON-77: Changing error behavior as the previous behavior cloud have opened up security vulnerabilities (#38) 2021-05-03 19:51:46 +02:00
Patrick
816036dbdf
BETTERZON-84: Adding service method to check if a session is valid (#37) 2021-05-03 16:29:25 +02:00
Patrick
a42c7da9a5
BETTERZON-79: Adding API endpoint for logging in (#36) 2021-05-03 15:14:22 +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
Patrick
a3ac897818
BETTERZON-75: User registration API endpoint (#34)
* BETTERZON-75: Adding backend functions to enable user registration

* BETTERZON-75: Adding regex to check email and username
2021-04-29 09:42:34 +02:00
Patrick
f7c045b5a3
BETTERZON-73: Adding API endpoint that returns the lowest non-amazon prices for a given list of product ids (#32) 2021-04-29 09:41:11 +02:00
henningxtro
9e9b442f35
BETTERZON-58: Basic Functionality with scrapy (#33) 2021-04-28 22:24:13 +02:00
825f744af9 BETTERZON-74
simple top-bar has been created.
2021-04-28 17:53:56 +02:00
21d5294a57 Merge branch 'develop' of https://github.com/Mueller-Patrick/Betterzon into develop 2021-04-17 12:04:08 +02:00
87756fdd65 Adding new ACs as PNG 2021-04-17 12:04:04 +02:00
Patrick
2159792e59 Update AC_Administration.drawio 2021-04-17 12:01:00 +02:00