Skip to content

Commit 0e92c9a

Browse files
committed
Release v1.0.21
1 parent 8150984 commit 0e92c9a

File tree

12 files changed

+53
-39
lines changed

12 files changed

+53
-39
lines changed

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ EMAIL_PORT=587
1414
EMAIL_USE_TLS=True
1515
EMAIL_HOST_USER=
1616
EMAIL_HOST_PASSWORD=
17+
18+
# Uncomment for local Redis
19+
#CELERY_BROKER_URL=redis://localhost:6379

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## [1.0.21] 2024-05-11
4+
### Changes
5+
6+
- Remove Browser Reload
7+
- Update Docker (added Redis)
8+
- Update DOCS (readme)
9+
310
## [1.0.20] 2024-04-29
411
### Changes
512

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ RUN set -uex; \
2424
apt-get update; \
2525
apt-get install nodejs -y;
2626

27-
# Install modules and webpack
27+
# Install Modules, Webpack and Tailwind set up
2828
RUN npm i
2929
RUN npm run build
30+
RUN npx tailwindcss -i ./static/assets/style.css -o ./static/dist/css/output.css
3031

3132
# Manage Assets & DB
3233
RUN python manage.py collectstatic --no-input

README.md

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
| [Free Version](https://appseed.us/product/rocket/django/) | [PRO Version](https://appseed.us/product/rocket-pro/django/) | [Custom Development](https://appseed.us/custom-development/) |
4141
| --------------------------------------| --------------------------------------| --------------------------------------|
4242
|**Django 4.2.9** | **Everything in Free**, plus: | **Everything in PRO**, plus: |
43-
|**Hot Reload** (templates & static) |**OAuth** `Google`, `GitHub` |**1mo Custom Development** |
43+
|**best Practices**, Modular Codebase |**OAuth** `Google`, `GitHub` |**1mo Custom Development** |
4444
|**TailwindCSS**/`Flowbite` |**Enhanced** [Charts](https://rocket-django-pro.onrender.com/charts/) |**Team**: PM, Developer, Tester |
4545
| ✓ Extended User Model |**Enhanced** [DataTables](https://rocket-django-pro.onrender.com/tables/) | ✅ Weekly Sprints |
4646
|[Charts](https://rocket-django.onrender.com/charts/) |**[Media Files Manager](https://rocket-django-pro.onrender.com/file-manager/)** | ✅ Technical SPECS |
4747
|[DataTables](https://rocket-django.onrender.com/tables/) |**Stripe** Payments | ✅ Documentation |
4848
|[API](https://rocket-django.onrender.com/api/product/) via `DRF` |**React** / `ApexCharts` Integration |**30 days Delivery Warranty** |
49-
|[Celery Beat](https://rocket-django.onrender.com/tasks/) |**Multi-Language** (i18n) Support | - |
49+
|[Celery](https://rocket-django.onrender.com/tasks/) |**Multi-Language** (i18n) Support | - |
5050
|`Docker` |**Sentry** `Error Reporting` | - |
5151
|`CI/CD` Flow via Render |**PRO Support** - [Email & Discord](https://appseed.us/support/) | - |
5252
|`Free Support` (GitHub Issues) |`Unlimited Projects` | - |
@@ -96,21 +96,6 @@ $ cd rocket-django
9696
DEBUG=False
9797
9898
SECRET_KEY=<STRONG_KEY_HERE>
99-
100-
# For Myql or PgSQL Persistence
101-
# DB_ENGINE=mysql
102-
# DB_HOST=localhost
103-
# DB_NAME=appseed_rocket_django
104-
# DB_USERNAME=root
105-
# DB_PASS=
106-
# DB_PORT=3306
107-
108-
# SMTP configaration
109-
# EMAIL_HOST=smtp.gmail.com
110-
# EMAIL_PORT=587
111-
# EMAIL_USE_TLS=True
112-
# EMAIL_HOST_USER=
113-
# EMAIL_HOST_PASSWORD=
11499
```
115100

116101

build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
# exit on error
33
set -o errexit
44

5-
# Install & Execute WebPack
5+
# Install Modules, Webpack and Tailwind set up
66
npm i
77
npm run build
8-
9-
# Tailwind
108
npx tailwindcss -i ./static/assets/style.css -o ./static/dist/css/output.css
119

1210
# Install modules

celerybeat-schedule

-16 KB
Binary file not shown.

core/settings.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
Django settings for core project.
33
4-
Generated by 'django-admin startproject' using Django 4.2.5.
4+
Generated by 'django-admin startproject' using Django 4.2.9
55
66
For more information on this file, see
77
https://docs.djangoproject.com/en/4.2/topics/settings/
@@ -27,7 +27,7 @@
2727
# SECURITY WARNING: keep the secret key used in production secret!
2828
SECRET_KEY = os.environ.get('SECRET_KEY')
2929
if not SECRET_KEY:
30-
SECRET_KEY = ''.join(random.choice( string.ascii_lowercase ) for i in range( 32 ))
30+
SECRET_KEY = 'SuperSecret776'
3131

3232
# Enable/Disable DEBUG Mode
3333
DEBUG = str2bool(os.environ.get('DEBUG'))
@@ -66,7 +66,6 @@
6666
'rest_framework.authtoken',
6767
'drf_spectacular',
6868
'django_api_gen',
69-
'django_browser_reload',
7069

7170
"debug_toolbar",
7271
]
@@ -80,7 +79,6 @@
8079
"django.contrib.auth.middleware.AuthenticationMiddleware",
8180
"django.contrib.messages.middleware.MessageMiddleware",
8281
"django.middleware.clickjacking.XFrameOptionsMiddleware",
83-
"django_browser_reload.middleware.BrowserReloadMiddleware",
8482
"debug_toolbar.middleware.DebugToolbarMiddleware",
8583
]
8684

@@ -194,8 +192,8 @@
194192
CELERY_LOGS_URL = "/tasks_logs/"
195193
CELERY_LOGS_DIR = os.path.join(BASE_DIR, "tasks_logs" )
196194

197-
CELERY_BROKER_URL = os.environ.get("CELERY_BROKER", "redis://localhost:6379")
198-
CELERY_RESULT_BACKEND = os.environ.get("CELERY_BROKER", "redis://localhost:6379")
195+
CELERY_BROKER_URL = os.environ.get("CELERY_BROKER", "redis://redis:6379")
196+
CELERY_RESULT_BACKEND = os.environ.get("CELERY_BROKER", "redis://redis:6379")
199197

200198
CELERY_TASK_TRACK_STARTED = True
201199
CELERY_TASK_TIME_LIMIT = 30 * 60
@@ -212,8 +210,6 @@
212210
LOGIN_REDIRECT_URL = '/'
213211
# EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
214212

215-
216-
217213
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
218214
EMAIL_HOST = os.environ.get('EMAIL_HOST', 'smtp.gmail.com')
219215
EMAIL_PORT = os.environ.get('EMAIL_PORT', 587)

core/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
path("tasks/", include("apps.tasks.urls")),
3131
path('api/docs/schema', SpectacularAPIView.as_view(), name='schema'),
3232
path('api/docs/' , SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
33-
path("__reload__/", include("django_browser_reload.urls")),
3433
path("__debug__/", include("debug_toolbar.urls")),
3534
]
3635

docker-compose.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
version: '3.8'
1+
version: "3.8"
22
services:
3-
rocket-django:
4-
container_name: rocket_django
3+
appseed-app:
4+
container_name: appseed-app
55
restart: always
6-
build: .
6+
build:
7+
context: .
78
networks:
89
- db_network
910
- web_network
11+
volumes:
12+
- ./db.sqlite3:/db.sqlite3
1013
nginx:
1114
container_name: nginx
1215
restart: always
@@ -17,11 +20,31 @@ services:
1720
- ./nginx:/etc/nginx/conf.d
1821
networks:
1922
- web_network
20-
depends_on:
21-
- rocket-django
23+
depends_on:
24+
- appseed-app
25+
redis:
26+
image: redis:7.0.12
27+
container_name: redis
28+
command: ["redis-server", "--port", "6379", "--slave-read-only", "no"]
29+
restart: always
30+
ports:
31+
- 6379:6379
32+
networks:
33+
- db_network
34+
celery:
35+
container_name: celery
36+
restart: always
37+
build:
38+
context: .
39+
networks:
40+
- db_network
41+
environment:
42+
DJANGO_SETTINGS_MODULE: "core.settings"
43+
command: "celery -A home worker -l info -B"
44+
depends_on:
45+
- appseed-app
2246
networks:
2347
db_network:
2448
driver: bridge
2549
web_network:
2650
driver: bridge
27-

env.sample

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ EMAIL_PORT=587
1414
EMAIL_USE_TLS=True
1515
EMAIL_HOST_USER=
1616
EMAIL_HOST_PASSWORD=
17+
18+
# Uncomment for local Redis
19+
#CELERY_BROKER_URL=redis://localhost:6379

0 commit comments

Comments
 (0)