| 
						
					 | 
					
						
						
						
						
							
						
						
							91af436019
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into doku
						
						
						
						
						
					 | 
					
						2020-12-06 23:09:31 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							15113dac3c
							
						
					 | 
					
						
						
							
							Adding architectural view
						
						
						
						
						
					 | 
					
						2020-12-06 23:02:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42e16cd5c7
							
						
					 | 
					
						
						
							
							Added ERM.png
						
						
						
						
						
					 | 
					
						2020-12-06 22:59:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a1bf46660
							
						
					 | 
					
						
						
							
							Added AC_FavoriteShopList.png
						
						
						
						
						
					 | 
					
						2020-12-06 22:54:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick
							
						 
					 | 
					
						
						
						
						
							
						
						
							383573acba
							
						
					 | 
					
						
						
							
							Added Deployment_View.png
						
						
						
						
						
					 | 
					
						2020-12-06 22:54:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							114fd8acba
							
						
					 | 
					
						
						
							
							Added AC_FavoriteShopList.drawio
						
						
						
						
						
					 | 
					
						2020-12-06 22:54:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick
							
						 
					 | 
					
						
						
						
						
							
						
						
							f83e93f954
							
						
					 | 
					
						
						
							
							Update Deployment_View.drawio
						
						
						
						
						
					 | 
					
						2020-12-06 22:53:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick
							
						 
					 | 
					
						
						
						
						
							
						
						
							4908bc1436
							
						
					 | 
					
						
						
							
							Added Deployment_View.drawio
						
						
						
						
						
					 | 
					
						2020-12-06 22:45:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae9d46cb92
							
						
					 | 
					
						
						
							
							Added AC_VendorShop.drawio
						
						
						
						
						
					 | 
					
						2020-12-03 12:44:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7b10b802e1
							
						
					 | 
					
						
						
							
							Added AC-ManageVendorShop.png
						
						
						
						
						
					 | 
					
						2020-12-03 12:41:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5228f01022
							
						
					 | 
					
						
						
							
							Update AC-ManageVendorShop.drawio
						
						
						
						
						
					 | 
					
						2020-12-03 12:41:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c6a0037d24
							
						
					 | 
					
						
						
							
							Added AC-ManageVendorShop.drawio
						
						
						
						
						
					 | 
					
						2020-12-03 11:26:38 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |