Updated backend and frontend. Fixed failing CI tests.

Author: beebus

backend/settings/common.py

@@ -51,7 +51,8 @@
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [
-            os.path.join(BASE_DIR, "templates")
+            os.path.join(BASE_DIR, "templates"),
+            os.path.join(BASE_DIR, os.pardir, "frontend", "dist"),
         ],
         "APP_DIRS": True,
         "OPTIONS": {

backend/settings/devl.py

@@ -1,6 +1,6 @@
 import os
 
-from .common import *
+from .common import BASE_DIR, STATICFILES_DIRS
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'django-insecure-dev-key-for-testing-only'
@@ -18,5 +18,7 @@
 INTERNAL_IPS = ['192.168.56.1', '127.0.0.1']
 
 STATICFILES_DIRS.append(
-    os.path.join(BASE_DIR, os.pardir, 'frontend', 'build'),
+    os.path.join(BASE_DIR, os.pardir, 'frontend', 'dist'),
 )
+
+STATIC_ROOT = os.path.join(BASE_DIR, os.pardir, 'staticfiles')

backend/urls.py

@@ -1,8 +1,8 @@
-from django.urls import re_path as url
-from django.urls import include
+from django.urls import path, include, re_path as url
 from django.contrib.auth.views import LogoutView, LoginView
 from django.contrib import admin
 from django.urls import reverse_lazy
+from django.views.generic import TemplateView
 
 from .views import app, index
 
@@ -13,4 +13,5 @@
     url('^auth/login/$', LoginView.as_view(template_name='auth/login.html'), name='login'),
     url('^auth/logout/$', LogoutView.as_view(next_page=reverse_lazy('login')), name='logout'),
     url('^$', index, name='index'),
+    path('app/', TemplateView.as_view(template_name="index.html"), name="app"),
 ]

backend/views.py

@@ -9,8 +9,7 @@
 def index(request):
     if request.user.is_authenticated:
         return redirect(reverse("app"))
-    else:
-        return redirect(settings.LOGIN_REDIRECT_URL)
+    return redirect(settings.LOGIN_REDIRECT_URL)
 
 
 @login_required

frontend/package.json

@@ -4,7 +4,7 @@
   "description": "A Django & React Template",
   "scripts": {
     "clean": "rimraf dist",
-    "build:webpack": "NODE_ENV=production webpack --config webpack.config.prod.js",
+    "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js",
     "build": "npm run clean && npm run build:webpack",
     "start": "webpack -c --progress -w --config webpack.config.dev.js",
     "lint": "eslint src/"
@@ -21,6 +21,7 @@
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
     "bootstrap": "^3.3.6",
+    "cross-env": "^10.0.0",
     "css-loader": "^0.23.1",
     "eslint": "^1.10.3",
     "eslint-plugin-babel": "^3.1.0",

frontend/src/app/components/higherOrder/hasPermission.js

@@ -1,5 +1,3 @@
-import React from "react";
-
 import EmptyComponent from "app/components/EmptyComponent";