Skip to content

Commit

Permalink
Merge pull request #20 from texx00/frontend-react
Browse files Browse the repository at this point in the history
Introducing a new frontend based on React, Redux and Bootstrap4
  • Loading branch information
texx00 authored Dec 28, 2020
2 parents b9a9261 + c3a4488 commit 188c9b9
Show file tree
Hide file tree
Showing 153 changed files with 16,834 additions and 1,884 deletions.
9 changes: 5 additions & 4 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# The .env file is used to load environmental variables that are not necessary in a production environment (like FLASK_ENV=development)
# Check the wiki for the available environmental variables

FLASK_ENV=development
FLASK_DEBUG=0

# feeder logger level: 5 -> acks received from the device (and above), level 6 -> lines sent to the device (and above), other standard logging levels of python
FEEDER_LEVEL=5

# flask logger level: uses standard python loggin levels (10-debug, 20-info, 30-warning, 40-error, 50-critical). Can set to warning to hide standard http requests
FLASK_LEVEL=30
FLASK_LEVEL=30


# flask_env must be set in the .env file for pytests
FLASK_ENV=development
11 changes: 10 additions & 1 deletion .flaskenv
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# environment variable always used with flask
# for additional custom variables check the ".env.template" file
FLASK_APP=UIserver
FLASK_APP=server

# feeder logger level: 5 -> acks received from the device (and above), level 6 -> lines sent to the device (and above), other standard logging levels of python
FEEDER_LEVEL=30

# flask logger level: uses standard python loggin levels (10-debug, 20-info, 30-warning, 40-error, 50-critical). Can set to warning to hide standard http requests
FLASK_LEVEL=30

# can change this to 1 to make flask autoreload on files change (can set it from the launch.json file in vscode, for production must be 0 until a production server is setup)
FLASK_DEBUG=0
36 changes: 36 additions & 0 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Python application

on:
push:
branches: [ master, flask-tests ]
pull_request:
branches: [ master, flask-tests ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
# - name: Lint with flake8
# run: |
# # stop the build if there are Python syntax errors or undefined names
# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
python -m pytest server/tests
16 changes: 9 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@
env
instance
**/__pycache__
UIserver.egg-info
.pytest_cache
server.egg-info
*.db
sketches
build
src
dist
*.save
*.pyc
server.started

UIserver/static/js/bower_components
UIserver/static/js/node_modules
UIserver/saves/saved_settings.json
server/saves/saved_settings.json

start.bat
start.sh

.env
.env
node_modules

# server.started is a debug file to see if the server started automatically on boot (will create the file every time the server is started)
# this file is created only on linux
server.started
109 changes: 0 additions & 109 deletions UIserver/__init__.py

This file was deleted.

34 changes: 0 additions & 34 deletions UIserver/database.py

This file was deleted.

1 change: 0 additions & 1 deletion UIserver/saves/default_settings.json

This file was deleted.

80 changes: 0 additions & 80 deletions UIserver/sockets_interface/socketio_callbacks.py

This file was deleted.

9 changes: 0 additions & 9 deletions UIserver/static/css/_readme.css

This file was deleted.

6 changes: 0 additions & 6 deletions UIserver/static/css/base_style.css

This file was deleted.

1 change: 0 additions & 1 deletion UIserver/static/css/file_upload.css

This file was deleted.

1 change: 0 additions & 1 deletion UIserver/static/css/manual_control.css

This file was deleted.

Loading

0 comments on commit 188c9b9

Please sign in to comment.