Bump Codebase Version & Improvements

Author: App Generator

.gitignore

@@ -24,3 +24,7 @@ package-lock.json
 staticfiles/*
 !staticfiles/.gitkeep 
 .vscode/symbols.json
+
+core/static/assets/node_modules
+core/static/assets/yarn.lock
+core/static/assets/.temp

Dockerfile

@@ -1,14 +1,18 @@
-FROM python:3.6
+FROM python:3.9
 
-COPY manage.py gunicorn-cfg.py requirements.txt .env ./
-COPY app app
-COPY authentication authentication
-COPY core core
+COPY . .
 
-RUN pip install -r requirements.txt
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
 
-RUN python manage.py makemigrations
+# install python dependencies
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir -r requirements.txt
+
+# running migrations
 RUN python manage.py migrate
 
-EXPOSE 5005
+# gunicorn
 CMD ["gunicorn", "--config", "gunicorn-cfg.py", "core.wsgi"]
+

staticfiles/.gitkeep renamed to apps/__init__.py

@@ -5,5 +5,7 @@
 
 from django.apps import AppConfig
 
+
 class MyConfig(AppConfig):
-    name = 'cfg'
+    name = 'apps.app'
+    label = 'apps_app'

app/__init__.py renamed to apps/app/__init__.py

@@ -4,7 +4,7 @@
 """
 
 from django.urls import path, re_path
-from app import views
+from apps.app import views
 
 urlpatterns = [
 

app/admin.py renamed to apps/app/admin.py

@@ -3,40 +3,42 @@
 Copyright (c) 2019 - present AppSeed.us
 """
 
+from django import template
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render, get_object_or_404, redirect
+from django.http import HttpResponse, HttpResponseRedirect
 from django.template import loader
-from django.http import HttpResponse
-from django import template
+from django.urls import reverse
+
 
 @login_required(login_url="/login/")
 def index(request):
-    
-    context = {}
-    context['segment'] = 'index'
+    context = {'segment': 'index'}
 
-    html_template = loader.get_template( 'index.html' )
+    html_template = loader.get_template('index.html')
     return HttpResponse(html_template.render(context, request))
 
+
 @login_required(login_url="/login/")
 def pages(request):
     context = {}
     # All resource paths end in .html.
     # Pick out the html file name from the url. And load that template.
     try:
-        
-        load_template      = request.path.split('/')[-1]
+
+        load_template = request.path.split('/')[-1]
+
+        if load_template == 'admin':
+            return HttpResponseRedirect(reverse('admin:index'))
         context['segment'] = load_template
-        
-        html_template = loader.get_template( load_template )
+
+        html_template = loader.get_template(load_template)
         return HttpResponse(html_template.render(context, request))
-        
+
     except template.TemplateDoesNotExist:
 
-        html_template = loader.get_template( 'page-404.html' )
+        html_template = loader.get_template('page-404.html')
         return HttpResponse(html_template.render(context, request))
 
     except:
-    
-        html_template = loader.get_template( 'page-500.html' )
+        html_template = loader.get_template('page-500.html')
         return HttpResponse(html_template.render(context, request))

app/config.py renamed to apps/app/config.py

@@ -5,5 +5,7 @@
 
 from django.apps import AppConfig
 
+
 class AuthConfig(AppConfig):
-    name = 'authcfg'
+    name = 'apps.auth'
+    label = 'apps_auth'

app/migrations/__init__.py renamed to apps/app/migrations/__init__.py

@@ -7,48 +7,50 @@
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 
+
 class LoginForm(forms.Form):
     username = forms.CharField(
         widget=forms.TextInput(
             attrs={
-                "placeholder" : "Username",                
+                "placeholder": "Username",
                 "class": "form-control"
             }
         ))
     password = forms.CharField(
         widget=forms.PasswordInput(
             attrs={
-                "placeholder" : "Password",                
+                "placeholder": "Password",
                 "class": "form-control"
             }
         ))
 
+
 class SignUpForm(UserCreationForm):
     username = forms.CharField(
         widget=forms.TextInput(
             attrs={
-                "placeholder" : "Username",                
+                "placeholder": "Username",
                 "class": "form-control"
             }
         ))
     email = forms.EmailField(
         widget=forms.EmailInput(
             attrs={
-                "placeholder" : "Email",                
+                "placeholder": "Email",
                 "class": "form-control"
             }
         ))
     password1 = forms.CharField(
         widget=forms.PasswordInput(
             attrs={
-                "placeholder" : "Password",                
+                "placeholder": "Password",
                 "class": "form-control"
             }
         ))
     password2 = forms.CharField(
         widget=forms.PasswordInput(
             attrs={
-                "placeholder" : "Password check",                
+                "placeholder": "Password check",
                 "class": "form-control"
             }
         ))

app/models.py renamed to apps/app/models.py

@@ -3,16 +3,12 @@
 Copyright (c) 2019 - present AppSeed.us
 """
 
-from django.shortcuts import render
-
 # Create your views here.
 from django.shortcuts import render, redirect
 from django.contrib.auth import authenticate, login
-from django.contrib.auth.models import User
-from django.forms.utils import ErrorList
-from django.http import HttpResponse
 from .forms import LoginForm, SignUpForm
 
+
 def login_view(request):
     form = LoginForm(request.POST or None)
 
@@ -27,16 +23,16 @@ def login_view(request):
             if user is not None:
                 login(request, user)
                 return redirect("/")
-            else:    
-                msg = 'Invalid credentials'    
+            else:
+                msg = 'Invalid credentials'
         else:
-            msg = 'Error validating the form'    
+            msg = 'Error validating the form'
 
-    return render(request, "accounts/login.html", {"form": form, "msg" : msg})
+    return render(request, "accounts/login.html", {"form": form, "msg": msg})
 
-def register_user(request):
 
-    msg     = None
+def register_user(request):
+    msg = None
     success = False
 
     if request.method == "POST":
@@ -47,14 +43,14 @@ def register_user(request):
             raw_password = form.cleaned_data.get("password1")
             user = authenticate(username=username, password=raw_password)
 
-            msg     = 'User created - please <a href="/login">login</a>.'
+            msg = 'User created - please <a href="/login">login</a>.'
             success = True
-            
-            #return redirect("/login/")
+
+            # return redirect("/login/")
 
         else:
-            msg = 'Form is not valid'    
+            msg = 'Form is not valid'
     else:
         form = SignUpForm()
 
-    return render(request, "accounts/register.html", {"form": form, "msg" : msg, "success" : success })
+    return render(request, "accounts/register.html", {"form": form, "msg": msg, "success": success})

app/tests.py renamed to apps/app/tests.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class AppsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'apps'
+    label = 'apps'

app/urls.py renamed to apps/app/urls.py

@@ -6,7 +6,6 @@
 import os
 from decouple import config
 from unipath import Path
-import dj_database_url
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = Path(__file__).parent
@@ -30,7 +29,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'app'  # Enable the inner app 
+    'apps.app'  # Enable the inner app
 ]
 
 MIDDLEWARE = [
@@ -45,7 +44,7 @@
 ]
 
 ROOT_URLCONF = 'core.urls'
-LOGIN_REDIRECT_URL = "home"   # Route defined in app/urls.py
+LOGIN_REDIRECT_URL = "home"  # Route defined in app/urls.py
 LOGOUT_REDIRECT_URL = "home"  # Route defined in app/urls.py
 TEMPLATE_DIR = os.path.join(CORE_DIR, "core/templates")  # ROOT dir for templates
 
@@ -73,7 +72,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME'  : 'db.sqlite3',
+        'NAME': 'db.sqlite3',
     }
 }
 
@@ -95,7 +94,6 @@
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/