Draft production configuration

.github/workflows/django.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
+        pip install -r requirements.dev.txt
     - name: Run Tests
       run: |
         cd django

.gitignore

@@ -24,4 +24,5 @@ yarn-error.log*
 
 **/venv
 **/__pycache__
-**/*.sqlite3
+**/*.sqlite3
+**/static/*

Dockerfile

@@ -0,0 +1,23 @@
+FROM phusion/baseimage
+
+RUN mkdir -p /easytrack/react
+COPY ./django ./static ./requirements.*.txt /easytrack/
+COPY ./react/build /easytrack/react
+
+RUN apt-get -y update
+RUN apt-get install -qy \
+    nginx \
+    postgresql-client \
+    python3 \
+    python3-pip
+RUN pip3 install --upgrade pip
+RUN pip3 install -r /easytrack/requirements.dev.txt
+COPY runit/uwsgi /etc/service/uwsgi
+COPY nginx/easytrack.conf /etc/nginx/sites-available/easytrack.conf
+RUN rm /etc/nginx/sites-enabled/*
+RUN ln -s /etc/nginx/sites-available/easytrack.conf /etc/nginx/sites-enabled/easytrack.conf
+COPY runit/nginx /etc/service/nginx
+
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+EXPOSE 80

django/config/settings_dev.py

@@ -13,14 +13,13 @@
 ]
 
 DATABASES['default'].update({
-    'ENGINE': 'django.db.backends.sqlite3',
-    'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    'NAME': 'easytrack',
+    'USER': 'easytrack_dev',
+    'PASSWORD': 'development',
+    'HOST': 'localhost',
+    'PORT': '5432',
 })
 
-CORS_ORIGIN_WHITELIST = [
-    'http://localhost:3000'
-]
-
 # python -m smtpd -n -c DebuggingServer localhost:1025
 EMAIL_HOST='localhost'
 EMAIL_PORT=1025
@@ -31,3 +30,6 @@
 INTERNAL_IPS = [
     '127.0.0.1',
 ]
+
+
+STATIC_ROOT='static'

django/uwsgi.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+module=config.wsgi:application
+#http=127.0.0.1:8000
+socket=127.0.0.1:8000

nginx/easytrack.conf

@@ -0,0 +1,29 @@
+upstream django {
+    #server unix:///home/evgene-petrenko/Projects/easy-track/django/easytrack.sock;
+    server 127.0.0.1:8000;
+}
+
+server {
+        listen 8080;
+        server_name _;
+
+        charset utf-8;
+
+        location /static {
+                root /home/evgene-petrenko/Projects/easy-track/;
+        }
+
+        location /api/ {
+                include uwsgi_params;
+                uwsgi_pass django;
+        }
+
+        location /admin {
+                include uwsgi_params;
+                uwsgi_pass django;
+        }
+
+        location / {
+                root /home/evgene-petrenko/Projects/easy-track/react/build;
+        }
+}

react/src/AppContainer.js

@@ -51,6 +51,7 @@ export default class AppContainer extends Component {
                 authenticationAttemptFailed: false,
                 registrationFailed: null
             },
+            needToFetchData: true,
             folders: [],
             trackedItems: [],
             trackEntries: [],
@@ -66,15 +67,11 @@ export default class AppContainer extends Component {
     }
 
     populateStateIfNecessary = () => {
-        const { auth: { isAuthenticated }, folders, trackedItems, trackEntries } = this.state;
+        const { auth: { isAuthenticated }, needToFetchData } = this.state;
         if (
-            isAuthenticated 
-            && (
-                folders.length === 0 
-                || trackedItems.length === 0 
-                || trackEntries.length === 0
-            )
+            isAuthenticated && needToFetchData
         ) {
+            this.setState({needToFetchData: false});
             actOrRefreshToken(
                 populateState, this.state.auth.refresh, this.accessRefresher
             )(this.state.auth.access)

react/src/asyncOperations.js

@@ -1,4 +1,4 @@
-const baseAPIUrl = 'http://localhost:8000/api/v1/';
+const baseAPIUrl = '/api/v1/';
 
 
 export class AccessTokenExpiredError extends Error {

requirements.common.txt

@@ -1,5 +1,5 @@
 django==3.0.7
-django-cors-headers==3.3.0
+# django-cors-headers==3.3.0
 djangorestframework==3.11.0
 unidecode==1.1.1
 djangorestframework-simplejwt==4.4.0

runit/nginx/run

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec /usr/sbin/nginx -c /etc/nginx/nginx.conf -g "daemon off;"

runit/uwsgi/run

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+source /mymdb/venv/bin/activate
+
+export PGPASSWORD="$DJANGO_DB_PASSWORD"
+psql \
+    -h "$DJANGO_DB_HOST" \
+    -p "$DJANGO_DB_PORT" \
+    -U "$DJANGO_DB_USER" \
+    -d "$DJANGO_DB_NAME"
+
+if [[ $? != 0 ]]; then
+    echo "no db server"
+    exit 1
+fi
+
+pushd /mymdb/django
+
+python manage.py migrate
+
+if [[ $? != 0 ]]; then
+    "echo can't migrate"
+    exit 2
+fi
+
+popd
+
+exec /sbin/setuser www-data uwsgi --ini /etc/uwsgi/apps-enabled/mymdb.ini