From b89533e6eda01dd87829fedadf9b8a299f998305 Mon Sep 17 00:00:00 2001 From: nicolas <821778+novalic@users.noreply.github.com> Date: Fri, 24 Mar 2023 05:14:10 +0000 Subject: [PATCH] chore: rename project --- Dockerfile | 2 +- Makefile | 6 ++--- README.md | 27 ------------------- docker-compose.yml | 12 ++++----- docker/db_setup.sql | 8 +++--- docker/uwsgi.ini.template | 2 +- manage.py | 2 +- {skeletondjango => personalpage}/__init__.py | 0 {skeletondjango => personalpage}/asgi.py | 4 +-- .../settings/__init__.py | 0 .../settings/default.py | 6 ++--- personalpage/settings/development.py | 4 +++ {skeletondjango => personalpage}/urls.py | 2 +- {skeletondjango => personalpage}/wsgi.py | 4 +-- skeletondjango/settings/development.py | 4 --- variables.dev | 4 +-- 16 files changed, 30 insertions(+), 57 deletions(-) rename {skeletondjango => personalpage}/__init__.py (100%) rename {skeletondjango => personalpage}/asgi.py (71%) rename {skeletondjango => personalpage}/settings/__init__.py (100%) rename {skeletondjango => personalpage}/settings/default.py (95%) create mode 100644 personalpage/settings/development.py rename {skeletondjango => personalpage}/urls.py (95%) rename {skeletondjango => personalpage}/wsgi.py (71%) delete mode 100644 skeletondjango/settings/development.py diff --git a/Dockerfile b/Dockerfile index a544175..85b15dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN apk add --no-cache \ RUN adduser -D -H nicolas \ && mkdir -p /app/log \ - && touch /app/log/skeletondjango.log \ + && touch /app/log/personalpage.log \ && chown -R nicolas:nicolas /app \ && chmod +x /app/docker/entrypoint.sh diff --git a/Makefile b/Makefile index fbcbe42..726b463 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,12 @@ up: docker-compose up -d test: up - docker-compose exec skeleton-django-service /env/bin/python /app/manage.py test --noinput + docker-compose exec personalpage-service /env/bin/python /app/manage.py test --noinput migrate: up - docker-compose exec skeleton-django-service /env/bin/python /app/manage.py migrate + docker-compose exec personalpage-service /env/bin/python /app/manage.py migrate makemigrations: up - docker-compose exec skeleton-django-service /env/bin/python /app/manage.py makemigrations + docker-compose exec personalpage-service /env/bin/python /app/manage.py makemigrations .PHONY: build up test clean diff --git a/README.md b/README.md index 2420e79..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,27 +0,0 @@ -# skeleton-django - -Skeleton of a backend Django App. - -## Organization - -```shell -apps/ - app_one/ - apputils/ - migrations/ - models/ - serializers/ - tests/ - views/ - urls.py -project_name/ - settings/ - default.py - development.py - production.py - staging.py -utils/ -``` - -- Each package is located inside the apps package. -- Each model, serializer, view is defined in a separate .py file. diff --git a/docker-compose.yml b/docker-compose.yml index 4cf6f1a..a24c1d9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,26 +1,26 @@ version: "2" services: - skeleton-django-db: + personalpage-db: image: mariadb volumes: - db_data:/var/lib/mysql environment: MYSQL_ROOT_PASSWORD: rootpassword - MYSQL_DATABASE: skeletondjango + MYSQL_DATABASE: personalpage MYSQL_USER: nicolas MYSQL_PASSWORD: qwerty - skeleton-django-service: + personalpage-service: build: . depends_on: - - skeleton-django-db + - personalpage-db command: /env/bin/python /app/manage.py runserver 0.0.0.0:8990 env_file: - variables.dev environment: - - DJANGO_SETTINGS_MODULE=skeletondjango.settings.development - - RDS_HOSTNAME=skeleton-django-db + - DJANGO_SETTINGS_MODULE=personalpage.settings.development + - RDS_HOSTNAME=personalpage-db ports: - 8990:8990 volumes: diff --git a/docker/db_setup.sql b/docker/db_setup.sql index d05fe22..1195f66 100644 --- a/docker/db_setup.sql +++ b/docker/db_setup.sql @@ -1,5 +1,5 @@ -CREATE SCHEMA `skeletondjango` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci; -CREATE SCHEMA `test_skeletondjango` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci; +CREATE SCHEMA `personalpage` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci; +CREATE SCHEMA `test_personalpage` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci; CREATE USER 'nicolas'@'%' IDENTIFIED BY 'qwerty'; -GRANT ALL PRIVILEGES ON skeletondjango.* TO 'nicolas'@'%'; -GRANT ALL PRIVILEGES ON test_skeletondjango.* TO 'nicolas'@'%'; +GRANT ALL PRIVILEGES ON personalpage.* TO 'nicolas'@'%'; +GRANT ALL PRIVILEGES ON test_personalpage.* TO 'nicolas'@'%'; diff --git a/docker/uwsgi.ini.template b/docker/uwsgi.ini.template index bfe7846..5631c47 100644 --- a/docker/uwsgi.ini.template +++ b/docker/uwsgi.ini.template @@ -3,7 +3,7 @@ # the base directory (full path) chdir = /app/ # Django's wsgi file -module = skeletondjango.wsgi +module = personalpage.wsgi # the virtualenv (full path) home = /env/ diff --git a/manage.py b/manage.py index c0f9a86..ee0033d 100755 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'skeletondjango.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'personalpage.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/skeletondjango/__init__.py b/personalpage/__init__.py similarity index 100% rename from skeletondjango/__init__.py rename to personalpage/__init__.py diff --git a/skeletondjango/asgi.py b/personalpage/asgi.py similarity index 71% rename from skeletondjango/asgi.py rename to personalpage/asgi.py index 5612c42..efc4fd5 100644 --- a/skeletondjango/asgi.py +++ b/personalpage/asgi.py @@ -1,5 +1,5 @@ """ -ASGI config for skeletondjango project. +ASGI config for personalpage project. It exposes the ASGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'skeletondjango.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'personalpage.settings') application = get_asgi_application() diff --git a/skeletondjango/settings/__init__.py b/personalpage/settings/__init__.py similarity index 100% rename from skeletondjango/settings/__init__.py rename to personalpage/settings/__init__.py diff --git a/skeletondjango/settings/default.py b/personalpage/settings/default.py similarity index 95% rename from skeletondjango/settings/default.py rename to personalpage/settings/default.py index ad5b771..0d415b9 100644 --- a/skeletondjango/settings/default.py +++ b/personalpage/settings/default.py @@ -1,5 +1,5 @@ """ -Django settings for skeletondjango project. +Django settings for personalpage project. Generated by 'django-admin startproject' using Django 3.1.7. @@ -50,7 +50,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'skeletondjango.urls' +ROOT_URLCONF = 'personalpage.urls' TEMPLATES = [ { @@ -68,7 +68,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'skeletondjango.wsgi.application' +WSGI_APPLICATION = 'personalpage.wsgi.application' # Database diff --git a/personalpage/settings/development.py b/personalpage/settings/development.py new file mode 100644 index 0000000..4125f12 --- /dev/null +++ b/personalpage/settings/development.py @@ -0,0 +1,4 @@ +from personalpage.settings.default import * + +DEBUG = True +TEMPLATE_DEBUG = True diff --git a/skeletondjango/urls.py b/personalpage/urls.py similarity index 95% rename from skeletondjango/urls.py rename to personalpage/urls.py index 6909a22..a7429fc 100644 --- a/skeletondjango/urls.py +++ b/personalpage/urls.py @@ -1,4 +1,4 @@ -"""skeletondjango URL Configuration +"""personalpage URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/3.1/topics/http/urls/ diff --git a/skeletondjango/wsgi.py b/personalpage/wsgi.py similarity index 71% rename from skeletondjango/wsgi.py rename to personalpage/wsgi.py index b7540f4..f902a15 100644 --- a/skeletondjango/wsgi.py +++ b/personalpage/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for skeletondjango project. +WSGI config for personalpage project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'skeletondjango.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'personalpage.settings') application = get_wsgi_application() diff --git a/skeletondjango/settings/development.py b/skeletondjango/settings/development.py deleted file mode 100644 index e88cb17..0000000 --- a/skeletondjango/settings/development.py +++ /dev/null @@ -1,4 +0,0 @@ -from skeletondjango.settings.default import * - -DEBUG = True -TEMPLATE_DEBUG = True diff --git a/variables.dev b/variables.dev index cc4a856..4105689 100644 --- a/variables.dev +++ b/variables.dev @@ -1,9 +1,9 @@ DEPLOYMENT_ENVIRONMENT=dev DJANGO_SECRET_KEY=4~@cwwSJ"