Release v1.0.21

app-generator · May 11, 2024 · 0e92c9a · 0e92c9a
1 parent 8150984
commit 0e92c9a
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 39 deletions.
diff --git a/.env b/.env
@@ -14,3 +14,6 @@ EMAIL_PORT=587
 EMAIL_USE_TLS=True
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
+
+# Uncomment for local Redis
+#CELERY_BROKER_URL=redis://localhost:6379
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [1.0.21] 2024-05-11
+### Changes
+
+- Remove Browser Reload
+- Update Docker (added Redis) 
+- Update DOCS (readme)
+
 ## [1.0.20] 2024-04-29
 ### Changes
 

diff --git a/Dockerfile b/Dockerfile
@@ -24,9 +24,10 @@ RUN set -uex; \
     apt-get update; \
     apt-get install nodejs -y;
 
-# Install modules and webpack
+# Install Modules, Webpack and Tailwind set up
 RUN npm i
 RUN npm run build
+RUN npx tailwindcss -i ./static/assets/style.css -o ./static/dist/css/output.css
 
 # Manage Assets & DB 
 RUN python manage.py collectstatic --no-input 

diff --git a/README.md b/README.md
@@ -40,13 +40,13 @@
 | [Free Version](https://appseed.us/product/rocket/django/)           | [PRO Version](https://appseed.us/product/rocket-pro/django/) | [Custom Development](https://appseed.us/custom-development/) |  
 | --------------------------------------| --------------------------------------| --------------------------------------|
 | ✓ **Django 4.2.9**                                                  | **Everything in Free**, plus:                                                       | **Everything in PRO**, plus:         |
-| ✓ **Hot Reload** (templates & static)                               | ✅ **OAuth** `Google`, `GitHub`                                                     | ✅ **1mo Custom Development**       | 
+| ✓ **best Practices**, Modular Codebase                              | ✅ **OAuth** `Google`, `GitHub`                                                     | ✅ **1mo Custom Development**       | 
 | ✓ **TailwindCSS**/`Flowbite`                                        | ✅ **Enhanced** [Charts](https://rocket-django-pro.onrender.com/charts/)            | ✅ **Team**: PM, Developer, Tester  |
 | ✓ Extended User Model                                               | ✅ **Enhanced** [DataTables](https://rocket-django-pro.onrender.com/tables/)        | ✅ Weekly Sprints                   |
 | ✓ [Charts](https://rocket-django.onrender.com/charts/)              | ✅ **[Media Files Manager](https://rocket-django-pro.onrender.com/file-manager/)**  | ✅ Technical SPECS                  |
 | ✓ [DataTables](https://rocket-django.onrender.com/tables/)          | ✅ **Stripe** Payments                                                              | ✅ Documentation                    |
 | ✓ [API](https://rocket-django.onrender.com/api/product/) via `DRF`  | ✅ **React** / `ApexCharts` Integration                                             | ✅ **30 days Delivery Warranty**    |
-| ✓ [Celery Beat](https://rocket-django.onrender.com/tasks/)          | ✅ **Multi-Language** (i18n) Support                                                |  -                                   |
+| ✓ [Celery](https://rocket-django.onrender.com/tasks/)               | ✅ **Multi-Language** (i18n) Support                                                |  -                                   |
 | ✓ `Docker`                                                          | ✅ **Sentry** `Error Reporting`                                                     |  -                                   |
 | ✓ `CI/CD` Flow via Render                                           | ✅ **PRO Support** - [Email & Discord](https://appseed.us/support/)                 |  -                                   |
 | ✓ `Free Support` (GitHub Issues)                                    | ✅ `Unlimited Projects`                                                             |  -                                   |
@@ -96,21 +96,6 @@ $ cd rocket-django
 DEBUG=False
 
 SECRET_KEY=<STRONG_KEY_HERE>
-
-# For Myql or PgSQL Persistence 
-# DB_ENGINE=mysql
-# DB_HOST=localhost
-# DB_NAME=appseed_rocket_django
-# DB_USERNAME=root
-# DB_PASS=
-# DB_PORT=3306
-
-# SMTP configaration
-# EMAIL_HOST=smtp.gmail.com
-# EMAIL_PORT=587
-# EMAIL_USE_TLS=True
-# EMAIL_HOST_USER=
-# EMAIL_HOST_PASSWORD=
 ```
 
 

diff --git a/build.sh b/build.sh
@@ -2,11 +2,9 @@
 # exit on error
 set -o errexit
 
-# Install & Execute WebPack 
+# Install Modules, Webpack and Tailwind set up
 npm i
 npm run build
-
-# Tailwind 
 npx tailwindcss -i ./static/assets/style.css -o ./static/dist/css/output.css
 
 # Install modules 

diff --git a/celerybeat-schedule b/celerybeat-schedule
diff --git a/core/settings.py b/core/settings.py
@@ -1,7 +1,7 @@
 """
 Django settings for core project.
 
-Generated by 'django-admin startproject' using Django 4.2.5.
+Generated by 'django-admin startproject' using Django 4.2.9
 
 For more information on this file, see
 https://docs.djangoproject.com/en/4.2/topics/settings/
@@ -27,7 +27,7 @@
 # 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  ) for i in range( 32 ))
+    SECRET_KEY = 'SuperSecret776'
 
 # Enable/Disable DEBUG Mode
 DEBUG = str2bool(os.environ.get('DEBUG'))
@@ -66,7 +66,6 @@
     'rest_framework.authtoken', 
     'drf_spectacular',
     'django_api_gen',
-    'django_browser_reload',
 
     "debug_toolbar",
 ]
@@ -80,7 +79,6 @@
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django_browser_reload.middleware.BrowserReloadMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
 ]
 
@@ -194,8 +192,8 @@
 CELERY_LOGS_URL           = "/tasks_logs/"
 CELERY_LOGS_DIR           = os.path.join(BASE_DIR, "tasks_logs"    )
 
-CELERY_BROKER_URL         = os.environ.get("CELERY_BROKER", "redis://localhost:6379")
-CELERY_RESULT_BACKEND     = os.environ.get("CELERY_BROKER", "redis://localhost:6379")
+CELERY_BROKER_URL         = os.environ.get("CELERY_BROKER", "redis://redis:6379")
+CELERY_RESULT_BACKEND     = os.environ.get("CELERY_BROKER", "redis://redis:6379")
 
 CELERY_TASK_TRACK_STARTED = True
 CELERY_TASK_TIME_LIMIT    = 30 * 60
@@ -212,8 +210,6 @@
 LOGIN_REDIRECT_URL = '/'
 # EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
-
-
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = os.environ.get('EMAIL_HOST', 'smtp.gmail.com')
 EMAIL_PORT = os.environ.get('EMAIL_PORT', 587)

diff --git a/core/urls.py b/core/urls.py
@@ -30,7 +30,6 @@
     path("tasks/", include("apps.tasks.urls")),
     path('api/docs/schema', SpectacularAPIView.as_view(), name='schema'),
     path('api/docs/'      , SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
-    path("__reload__/", include("django_browser_reload.urls")),
     path("__debug__/", include("debug_toolbar.urls")),
 ]
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,12 +1,15 @@
-version: '3.8'
+version: "3.8"
 services:
-  rocket-django:
-    container_name: rocket_django
+  appseed-app:
+    container_name: appseed-app
     restart: always
-    build: .
+    build:
+      context: .
     networks:
       - db_network
       - web_network
+    volumes:
+      - ./db.sqlite3:/db.sqlite3
   nginx:
     container_name: nginx
     restart: always
@@ -17,11 +20,31 @@ services:
       - ./nginx:/etc/nginx/conf.d
     networks:
       - web_network
-    depends_on: 
-      - rocket-django
+    depends_on:
+      - appseed-app
+  redis:
+    image: redis:7.0.12
+    container_name: redis
+    command: ["redis-server", "--port", "6379", "--slave-read-only", "no"]
+    restart: always
+    ports:
+      - 6379:6379
+    networks:
+      - db_network
+  celery:
+    container_name: celery
+    restart: always
+    build:
+      context: .
+    networks:
+      - db_network
+    environment:
+      DJANGO_SETTINGS_MODULE: "core.settings"
+    command: "celery -A home worker -l info -B"
+    depends_on:
+      - appseed-app
 networks:
   db_network:
     driver: bridge
   web_network:
     driver: bridge
-
diff --git a/env.sample b/env.sample
@@ -14,3 +14,6 @@ EMAIL_PORT=587
 EMAIL_USE_TLS=True
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
+
+# Uncomment for local Redis
+#CELERY_BROKER_URL=redis://localhost:6379
diff --git a/nginx/appseed-app.conf b/nginx/appseed-app.conf
@@ -1,5 +1,5 @@
 upstream webapp {
-    server rocket_django:5005;
+    server appseed-app:5005;
 }
 
 server {

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,6 @@ str2bool==1.1
 
 # Utils
 django-debug-toolbar==4.2.0
-django-browser-reload==1.12.1
 Pillow==10.0.1
 
 # Services