Added middleware to allow 'is_ajax' method with recent django version

Author: BenFaruna

CHANGELOG.md

@@ -1,4 +1,14 @@
 # Change Log
 
+## [1.0.1] 2023-06-02
+### Changes
+
+- Update DEPS
+- Update Docker
+- Update Settings for `Django` (latest version)
+
 ## [1.0.0] 2020-11-22
-### Initial Release
+### Changes
+
+- STABLE Version
+

Dockerfile

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

README.md

@@ -157,63 +157,12 @@ $ cd django-datatables-sample
 > Start the app in Docker
 
 ```bash
-$ sudo docker-compose pull && sudo docker-compose build && sudo docker-compose up -d
+$ docker-compose up --build
 ```
 
-Visit `http://localhost:5005` in your browser. The app should be up & running.
+Visit `http://localhost:5085` in your browser. The app should be up & running.
 
 <br />
 
-### [Gunicorn](https://gunicorn.org/)
 ---
-
-Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX.
-
-> Install using pip
-
-```bash
-$ pip install gunicorn
-```
-> Start the app using gunicorn binary
-
-```bash
-$ gunicorn --bind=0.0.0.0:8001 core.wsgi:application
-Serving on http://localhost:8001
-```
-
-Visit `http://localhost:8001` in your browser. The app should be up & running.
-
-
-<br />
-
-### [Waitress](https://docs.pylonsproject.org/projects/waitress/en/stable/)
----
-
-Waitress (Gunicorn equivalent for Windows) is meant to be a production-quality pure-Python WSGI server with very acceptable performance. It has no dependencies except ones that live in the Python standard library.
-
-> Install using pip
-
-```bash
-$ pip install waitress
-```
-> Start the app using [waitress-serve](https://docs.pylonsproject.org/projects/waitress/en/stable/runner.html)
-
-```bash
-$ waitress-serve --port=8001 core.wsgi:application
-Serving on http://localhost:8001
-```
-
-Visit `http://localhost:8001` in your browser. The app should be up & running.
-
-<br />
-
-## Credits & Links
-
-- [Django](https://www.djangoproject.com/) - The official website
-- [Boilerplate Code](https://appseed.us/boilerplate-code) - Index provided by **AppSeed**
-- [Boilerplate Code](https://github.com/app-generator/boilerplate-code) - Index published on Github
-
-<br />
-
----
-[Django Datatables Sample](https://django-datatables-sample.appseed.us/) - Provided by **AppSeed** [Web App Generator](https://appseed.us/app-generator).
+[Django Datatables Sample](https://django-datatables-sample.appseed.us/) - Provided by [AppSeed](https://appseed.us).

authentication/forms.py

@@ -12,16 +12,14 @@ class LoginForm(forms.Form):
         widget=forms.TextInput(
             attrs={
                 "placeholder" : "Username",                
-                "class": "form-control",
-                "value": "test"
+                "class": "form-control"
             }
         ))
     password = forms.CharField(
         widget=forms.PasswordInput(
             attrs={
                 "placeholder" : "Password",                
-                "class": "form-control",
-                "value": "ApS12_ZZs8"
+                "class": "form-control"
             }
         ))
 

core/settings.py

@@ -18,13 +18,16 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.environ.get('SECRET_KEY')
 if not SECRET_KEY:
-    SECRET_KEY = ''.join(random.choice( string.ascii_lowercase  ))
+    SECRET_KEY = ''.join(random.choice( string.ascii_lowercase  ) for i in range( 32 ))
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.getenv('DEBUG', False)
 
-# load production server from .env
-ALLOWED_HOSTS = ['localhost', '127.0.0.1', os.getenv('SERVER', '127.0.0.1')]
+# HOSTs List
+ALLOWED_HOSTS = ['localhost', '127.0.0.1']
+
+# Add here your deployment HOSTS
+CSRF_TRUSTED_ORIGINS = ['http://localhost:8000', 'http://localhost:5085', 'http://127.0.0.1:8000', 'http://127.0.0.1:5085']
 
 # Application definition
 

core/templates/accounts/login.html

@@ -28,7 +28,7 @@ <h1 class="mb-0 h3">
                                     {% if msg %}
                                         {{ msg | safe }}
                                     {% else %}
-                                        Use default credentials: test / ApS12_ZZs8
+                                        Add your credentials
                                     {% endif %}                                     
                                 </p>    
                             </div>
@@ -70,7 +70,7 @@ <h1 class="mb-0 h3">
                                     </div>
 
                                 </div>
-                                <button type="submit" name="login" class="btn btn-block btn-primary">Sign in</button>
+                                <button type="submit" name="login" class="btn btn-block btn-primary">Sign IN</button>
                             </form>
 
                             <div class="d-flex justify-content-center align-items-center mt-4">

core/templates/accounts/register.html

@@ -33,6 +33,12 @@ <h1 class="mb-0 h3">
                                 </p>    
                             </div>
 
+                            {% if success %}
+
+                                <a href="{% url 'login' %}" class="btn btn-block btn-primary">Sign IN</a>
+
+                            {% else %}
+
                             <form method="post" action="">
 
                                 {% csrf_token %}
@@ -95,8 +101,12 @@ <h1 class="mb-0 h3">
                                     </div>
 
                                 </div>
-                                <button type="submit" name="register" class="btn btn-block btn-primary">Sign in</button>
+                                <button type="submit" name="register" class="btn btn-block btn-primary">Sign UP</button>
                             </form>
+
+                            {% endif %}
+
+
                             <div class="d-flex justify-content-center align-items-center mt-4">
                                 <span class="font-weight-normal">
                                     &copy; <a  href="https://themesberg.com" target="_blank">Themesberg</a> 

docker-compose.yml

@@ -1,19 +1,18 @@
-version: '3'
+version: '3.8'
 services:
   appseed-app:
+    container_name: appseed_app
     restart: always
-    env_file: .env
     build: .
-    ports:
-      - "5005:5005"
     networks:
       - db_network
       - web_network
   nginx:
+    container_name: nginx
     restart: always
     image: "nginx:latest"
     ports:
-      - "85:85"
+      - "5085:5085"
     volumes:
       - ./nginx:/etc/nginx/conf.d
     networks:

nginx/appseed-app.conf

@@ -1,8 +1,13 @@
+upstream webapp {
+    server appseed_app:5005;
+}
+
 server {
-    listen      85;
+    listen 5085;
+    server_name localhost;
 
     location / {
-        proxy_pass http://localhost:5005/;
+        proxy_pass http://webapp;
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }