Makefile update
This commit is contained in:
		
							
								
								
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -36,3 +36,8 @@ npm-debug.log*
 | 
				
			|||||||
yarn-debug.log*
 | 
					yarn-debug.log*
 | 
				
			||||||
yarn-error.log*
 | 
					yarn-error.log*
 | 
				
			||||||
.eslintcache
 | 
					.eslintcache
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# ALL
 | 
				
			||||||
 | 
					###############
 | 
				
			||||||
 | 
					*.log
 | 
				
			||||||
 | 
					nohup.out
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							@@ -49,10 +49,10 @@ run:
 | 
				
			|||||||
	$(MAKE) P="run-server run-client" make-p
 | 
						$(MAKE) P="run-server run-client" make-p
 | 
				
			||||||
 | 
					
 | 
				
			||||||
run-client:
 | 
					run-client:
 | 
				
			||||||
	serve -s fittrackee_client/build -l 3000
 | 
						serve -s fittrackee_client/build -l 3000 >> serve.log  2>&1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
run-server:
 | 
					run-server:
 | 
				
			||||||
	cd fittrackee_api && $(GUNICORN) -b 127.0.0.1:5000 "fittrackee_api:create_app()"
 | 
						cd fittrackee_api && $(GUNICORN) -b 127.0.0.1:5000 "fittrackee_api:create_app()" --error-logfile ../gunicorn-error.log
 | 
				
			||||||
 | 
					
 | 
				
			||||||
serve-python:
 | 
					serve-python:
 | 
				
			||||||
	$(FLASK) run --with-threads -h $(HOST) -p $(API_PORT)
 | 
						$(FLASK) run --with-threads -h $(HOST) -p $(API_PORT)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@ HOST = 0.0.0.0
 | 
				
			|||||||
API_PORT = 5000
 | 
					API_PORT = 5000
 | 
				
			||||||
CLIENT_PORT = 3000
 | 
					CLIENT_PORT = 3000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export REACT_APP_API_URL = http://$(HOST):$(API_PORT)
 | 
					 | 
				
			||||||
export FLASK_APP = $(PWD)/fittrackee_api/server.py
 | 
					export FLASK_APP = $(PWD)/fittrackee_api/server.py
 | 
				
			||||||
export APP_SETTINGS=fittrackee_api.config.DevelopmentConfig
 | 
					export APP_SETTINGS=fittrackee_api.config.DevelopmentConfig
 | 
				
			||||||
export FLASK_ENV=development
 | 
					export FLASK_ENV=development
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,4 @@
 | 
				
			|||||||
 | 
					export REACT_APP_API_URL = http://$(HOST):$(API_PORT)
 | 
				
			||||||
export REACT_APP_THUNDERFOREST_API_KEY=
 | 
					export REACT_APP_THUNDERFOREST_API_KEY=
 | 
				
			||||||
export WEATHER_API=
 | 
					export WEATHER_API=
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user