Added Makefile (#40)

* Adding the front and moving the back in his directory

* Renamed front -> frontend

* Removed node modules and added folder to gitignore

* Moved files to frontend folder

* Moved black config to root

* Started on a Makefile

Will fix #38

* Updated makefile and moved files back to normal dir

* Removed useless file

* Some adjustments

* Added venv source

* New travis setup

* fix Makefile on the source

* npm install fix

* Should be working

* Testing

* Added back build

* Renamed folders

* Moved home react route to base init file

* Added more specifications for 3.7 python and source

* Testing new stuff for venv

* Testing with caps

* Added cors

* [FIX] error 404 on /

* Trying new travis install technique (not using the makefile)

* Forgot the folder

* Changed makefile prereqs

* Removed useless install on tests

* [FIX] Npm wasn't fully installed after last change

* Added test to see if build was correctly creared

* [FIX] Added a env var test for CI so python doesnt install on travis

* [FIX] build backend

* Apply suggestions from code review

Co-authored-by: gmorer <gmorer@users.noreply.github.com>

Author: Seluj78

.travis.yml

@@ -9,17 +9,20 @@ language: python
 python:
   - 3.7
 
-install: pip install -r requirements-dev.txt
+install: pip install -r backend/requirements-dev.txt
 
-before_script:
-  - export FLASK_APP="$TRAVIS_BUILD_DIR/backend/app.py"
-  - export FLASK_ENV="dev"
-  - export CI=1
+#before_script:
+#  - make build
+#  - export FLASK_APP="$TRAVIS_BUILD_DIR/backend/app.py"
+#  - export FLASK_ENV="dev"
+#  - export CI=1
 
 script:
-  - export FLASK_DEBUG=1 && export FLASK_SECRET_KEY=ThisIsADevelopmentKey && pytest
-  - flake8
-  - black --check backend/app.py backend/PyMatcha/**/*.py
+  - make tests
+#  - cd backend
+#  - export FLASK_DEBUG=1 && export FLASK_SECRET_KEY=ThisIsADevelopmentKey && pytest
+#  - flake8
+#  - black --check backend/app.py backend/PyMatcha/**/*.py
 
 notifications:
   email:

Makefile

@@ -0,0 +1,64 @@
+SHELL := /bin/bash
+VENV = $(PWD)/venv
+PIP = $(VENV)/bin/pip
+PYTHON = $(VENV)/bin/python3
+FLASK = $(VENV)/bin/flask
+PYTEST = $(VENV)/bin/pytest
+FRONTEND = $(PWD)/frontend
+BACKEND = $(PWD)/backend
+
+all: install build prod
+	# TODO: Build and run the server
+
+install_python:
+ifndef TRAVIS
+		test -d $(VENV) || python3.7 -m venv $(VENV)
+		( \
+			source $(VENV)/bin/activate; \
+			pip install wheel; \
+			$(PIP) install -r $(BACKEND)/requirements.txt \
+		)
+endif
+	# TODO: Create envs, install everything
+
+install_react:
+	npm install --prefix $(FRONTEND)
+
+install: install_python install_react
+
+build: install
+	npm run build --prefix $(FRONTEND)
+
+dev: install
+	npm run start --prefix $(FRONTEND) &
+	# TODO: Run the whole server for dev
+
+run: build
+	( \
+		export DB_USER=EWARSESTHJ; \
+		export DB_PASSWORD=EWARSESTHJ; \
+		export FLASK_SECRET_KEY=EWARSESTHJ; \
+		export FLASK_DEBUG=EWARSESTHJ; \
+		source $(VENV)/bin/activate && \
+		python3 $(BACKEND)/app.py \
+	)
+	# TODO: Run the whole server for prod
+
+tests: build
+	test -d frontend/build
+	# TODO: Maybe move this to the build stage ? so if the build fails and the folder isn't here it fails immediatly and not at the test stage
+	# TODO: Run the tests
+
+docker:
+	# TODO
+
+clean:
+	rm -rf $(FRONTEND)/node_modules
+
+fclean: clean
+	rm -rf $(FRONTEND)/build
+	rm -rf $(VENV)
+
+re: clean all
+
+.PHONY : build backend frontend prod dev clean tests fclean all re

.flake8 backend/.flake8.flake8 renamed to backend/.flake8

@@ -24,10 +24,12 @@
 
 import peewee
 
-from flask import Flask
+from flask import Flask, send_from_directory
 
 from flask_admin import Admin
 
+from flask_cors import CORS
+
 
 if os.environ.get("FLASK_ENV", None) == "dev":
     os.environ["FLASK_DEBUG"] = "1"
@@ -49,7 +51,8 @@
     raise EnvironmentError("DB_PASSWORD is not set in the server's environment. Please fix and restart the server.")
 
 
-application = Flask(__name__)
+# TODO: Set static folder to env var or conf
+application = Flask(__name__, static_folder='../../frontend/build')
 application.debug = os.environ.get("FLASK_DEBUG", 1)
 application.secret_key = os.environ.get("FLASK_SECRET_KEY", "ThisIsADevelopmentKey")
 
@@ -64,16 +67,26 @@
 application.config["FLASK_ADMIN_SWATCH"] = "simplex"
 admin = Admin(application, name="PyMatcha Admin", template_mode="bootstrap3")
 
+CORS(application)
+
 from PyMatcha.models.user import User, UserAdmin
 
 admin.add_view(UserAdmin(User))
 
-from PyMatcha.routes.views.home import home_bp
 from PyMatcha.routes.api.ping_pong import ping_pong_bp
 
-application.register_blueprint(home_bp)
 application.register_blueprint(ping_pong_bp)
 
 if bool(int(os.environ.get("CI", 0))):
     User.drop_table()
     User.create_table()
+
+
+# Serve React App
+@application.route('/', defaults={'path': ''})
+@application.route('/<path:path>')
+def serve(path):
+    if path != "" and os.path.exists(application.static_folder + '/' + path):
+        return send_from_directory(application.static_folder, path)
+    else:
+        return send_from_directory(application.static_folder, 'index.html')

backend/PyMatcha/__init__.py

@@ -5,9 +5,11 @@ wtf-peewee
 peewee
 pymysql
 
+flask-cors
+
 pytest
 pytest-flask
 
 flake8
 black
-pre-commit
+pre-commit

backend/PyMatcha/routes/views/__init__.py

@@ -3,3 +3,5 @@ Flask-Admin
 wtf-peewee
 peewee
 pymysql
+
+flask-cors