| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d9fcfd310
							
						
					 | 
					
						
						
							
							BETTERZON-33: Created product list component
						
						
						
						
						
					 | 
					
						2020-12-01 18:31:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6b8acdab46
							
						
					 | 
					
						
						
							
							BETTERZON-38: Added error handler, preparation for DB accessing
						
						
						
						
						
					 | 
					
						2020-11-25 00:38:16 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a6e9d4691
							
						
					 | 
					
						
						
							
							BETTERZON-29: Fuck me
						
						
						
						
						
					 | 
					
						2020-11-13 21:08:45 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick
							
						 
					 | 
					
						
						
						
						
							
						
						
							421f64ea7e
							
						
					 | 
					
						
						
							
							Restructuring project to have different Modules for Frontend, Tests, Backend etc...
						
						
						
						
						
					 | 
					
						2020-11-12 10:32:49 +01:00 | 
					
					
						
						
							
							
							
						
					 |