|
|
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 |
|
|
|
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 |
|
|
|
7d693939fa
|
Added pm2 environment file
|
2020-12-01 19:24:29 +01:00 |
|
|
|
7d9fcfd310
|
BETTERZON-33: Created product list component
|
2020-12-01 18:31:45 +01:00 |
|
Patrick
|
8c45162736
|
Update README.md
|
2020-12-01 10:05:08 +01:00 |
|
Patrick
|
09b01a1fe5
|
Merge pull request #6 from Mueller-Patrick/develop
Backend Deployment
|
2020-11-30 18:27:35 +01:00 |
|
Patrick
|
717afca067
|
Merge pull request #5 from Mueller-Patrick/BETTERZON-38
Betterzon 38: Basic REST Backend for first use case
|
2020-11-29 22:45:06 +01:00 |
|
|
|
0419f5d277
|
BETTERZON-38: Added all products field to API return objects
|
2020-11-29 13:52:50 +01:00 |
|
|
|
0f2e2be246
|
BETTERZON-38: Added all currently required models with required service classes and routers
|
2020-11-29 13:05:25 +01:00 |
|
|
|
3de28d8835
|
BETTERZON-38: Added ability to search for a product by its name
|
2020-11-27 19:01:01 +01:00 |
|
|
|
64cb6959cb
|
BETTERZON-38: products findAll now returns the actual products from the DB
|
2020-11-26 20:32:07 +01:00 |
|
|
|
82b3521f9e
|
BETTERZON-38: Enabling DB access
|
2020-11-25 22:21:29 +01:00 |
|
|
|
6b8acdab46
|
BETTERZON-38: Added error handler, preparation for DB accessing
|
2020-11-25 00:38:16 +01:00 |
|
|
|
5b04b810dc
|
BETTERZON-38: Added products example API endpoint
|
2020-11-22 20:48:50 +01:00 |
|
|
|
00baf5939e
|
BETTERZON-38: Switched Backend to TypeScript
|
2020-11-22 16:42:17 +01:00 |
|
Patrick
|
09793fbb40
|
Delete test.txt
|
2020-11-21 17:56:52 +01:00 |
|
|
|
e103e4f7f8
|
Update ERM.drawio
|
2020-11-21 17:54:46 +01:00 |
|
Patrick
|
03008553ea
|
Added Frontend_Components_Diagram.png
|
2020-11-21 15:30:16 +01:00 |
|
Patrick
|
28f5a95bd0
|
Update Frontend_Components_Diagram.drawio
|
2020-11-21 15:29:37 +01:00 |
|
Patrick
|
a489325aaf
|
Added Frontend_Components_Diagram.drawio
|
2020-11-21 14:42:58 +01:00 |
|
|
|
185ab1d377
|
Added ERM.drawio
|
2020-11-21 12:13:59 +01:00 |
|
Patrick
|
fe3efb0ca3
|
Merge pull request #4 from Mueller-Patrick/DemoBranch
Demo PR for e portfolio
|
2020-11-19 09:32:37 +01:00 |
|
|
|
471b0e006a
|
Extremely critical bug fix
|
2020-11-19 09:31:33 +01:00 |
|
|
|
7b3aedade5
|
Demo commit for e portfolio
|
2020-11-18 17:33:03 +01:00 |
|
|
|
cf5f3f4ef8
|
Removing GitHub Actions pipeline as we use Jenkins anyways
|
2020-11-18 09:53:20 +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 |
|
|
|
21b4f19c33
|
Merge branch 'BETTERZON-29' into master
|
2020-11-13 21:09:24 +01:00 |
|
|
|
1a6e9d4691
|
BETTERZON-29: Fuck me
|
2020-11-13 21:08:45 +01:00 |
|
Patrick
|
65d8c5e583
|
Merge pull request #2 from Mueller-Patrick/BETTERZON-29
Betterzon 29
|
2020-11-13 21:07:40 +01:00 |
|
Patrick
|
5bfe237feb
|
Merge pull request #1 from Mueller-Patrick/BETTERZON-29
BETTERZON-29: Testing stuff
|
2020-11-13 21:01:36 +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 |
|
|
|
1c9387a496
|
BETTERZON-29: Reformatting Backend Code
|
2020-11-13 19:10:59 +01:00 |
|
|
|
acdcf1b509
|
BETTERZON-5: Testing automatic deployment and web server
|
2020-11-13 16:05:45 +01:00 |
|
|
|
a64af67d24
|
Adding IntelliJ module descriptor file
|
2020-11-12 12:12:00 +01:00 |
|
Patrick
|
4f09a53f30
|
Adding Backend Module
|
2020-11-12 10:56:01 +01:00 |
|
Patrick
|
414c2a4385
|
Fixing GitHub actions pipeline
|
2020-11-12 10:39:17 +01:00 |
|
Patrick
|
421f64ea7e
|
Restructuring project to have different Modules for Frontend, Tests, Backend etc...
|
2020-11-12 10:32:49 +01:00 |
|
