Merge branch 'structure'

deployment/example.env

@@ -1,19 +1,17 @@
-SECRET_KEY=z64oc2d-4&_p@*@5pr2pdbq$i69b#jsrn5mzm(1y$!11w&fw&)
+SECRET_KEY=**************************************************
 DEBUG=True
 ALLOWED_HOSTS=*
 LANGUAGE_CODE=en-us
 TIME_ZONE=Europe/Moscow
-
 APPEND_SLASH=False
 USE_I18N=False
 USE_L10N=True
 DATE_FORMAT=F d, Y
 USE_TZ=False
 
-DATA_UPLOAD_MAX_MEMORY_SIZE=251658240
-FILE_UPLOAD_MAX_MEMORY_SIZE=251658240
-
 ALPHABET={'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo', 'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'y', 'к': 'k', 'л': 'l', 'м': 'm', 'н': 'n', 'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u', 'ф': 'f', 'х': 'kh', 'ц': 'ts', 'ч': 'ch', 'ш': 'sh', 'щ': 'shch', 'ы': 'y', 'э': 'e', 'ю': 'yu', 'я': 'ya'}
 
+DATA_UPLOAD_MAX_MEMORY_SIZE=251658240
+FILE_UPLOAD_MAX_MEMORY_SIZE=251658240
 LOCAL_DOMAIN=http://localhost:8000
 DOMAIN=https://fla.codes

deployment/scripts/gunicorn.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source env/bin/activate
+cd src/
+
+python manage.py migrate
+python build.py
+gunicorn --reload -b 0.0.0.0:${WEB_PORT} -c config/gunicorn.conf.py -k uvicorn.workers.UvicornWorker config.asgi:application

deployment/scripts/install.sh

@@ -4,21 +4,24 @@ python_interpreter=""
 read -p "┌────────────────────┐
 | Python interpreter |
 └────────────────────┘
-Default: /usr/bin/python3
+Default: /usr/bin/python
 (Сlick Enter for choose default)
 If you wont to change, write: " python_interpreter
 
 
 if [ -z "$python_interpreter" ]; then
-    /usr/bin/python3 -m venv env
+    /usr/bin/python -m venv env
 else
     `$python_interpreter -m venv env`
 fi
 
 source env/bin/activate
-pip install -U pip && pip install -r src/requirements.txt
+cd src/
 
-python src/manage.py collectstatic --noinput
-python src/manage.py makemigrations
-python src/manage.py migrate
-python src/manage.py runserver --insecure
+pip install -U pip && pip install -r requirements.txt
+
+python manage.py collectstatic --noinput
+python manage.py makemigrations --name alter_db_table
+python manage.py migrate
+python build.py
+python manage.py runserver --insecure

deployment/scripts/uvicorn.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source env/bin/activate
+cd src/
+
+python manage.py migrate
+python build.py
+uvicorn --reload --host 0.0.0.0 --port ${WEB_PORT} config.asgi:application

src/apps/api/conf.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class ApiConfig(AppConfig):
+
+    name = 'apps.api'
+    verbose_name = 'API'

src/api/views.py → src/apps/api/views.py

@@ -1,5 +1,5 @@
-from core.models import Article, Storage
-from core.forms import ArticleForm, StorageForm
+from apps.core.models import Article, Storage
+from apps.core.forms import ArticleForm, StorageForm
 
 from django.middleware.csrf import get_token
 

src/apps/core/conf.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class CoreConfig(AppConfig):
+
+    name = 'apps.core'
+    verbose_name = 'Core'

src/apps/ext_auth/conf.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class ExtAuthConfig(AppConfig):
+
+    name = 'apps.ext_auth'
+    verbose_name = 'Authentication and Authorization'

src/ext_auth/views.py → src/apps/ext_auth/views.py

@@ -1,4 +1,4 @@
-from core.models import Article
+from apps.core.models import Article
 
 from .forms import UserCreationForm
 

src/build.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+import os
+
+import django
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+
+django.setup()
+
+
+def main():
+    from django.contrib.auth import get_user_model
+
+    '''Create first superuser'''
+    UserModel = get_user_model()
+    User = UserModel.objects.filter(username='root')
+    if User.exists():
+        print('Root user already exists!')
+    else:
+        UserModel.objects.create_superuser(
+            username='root',
+            password='root',
+            email='[email protected]'
+        )
+        print('Root user created!')
+
+
+if __name__ == '__main__':
+    main()

src/config/__init__.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+import os
+
+import packs
+
+import django
+
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+
+django.setup()
+
+'''Rename tables in database'''
+packs.rename_tables()

src/config/gunicorn.conf.py

@@ -0,0 +1,6 @@
+import os
+import signal
+
+
+def worker_int(worker):
+    os.kill(worker.pid, signal.SIGINT)

src/config/settings/base.py

@@ -2,8 +2,10 @@
 
 from packs import bool
 
+from pathlib import Path
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+
+BASE_DIR = Path(__file__).parent.parent.parent.parent
 
 SECRET_KEY = os.getenv('SECRET_KEY')
 
@@ -20,9 +22,11 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'api.apps.ApiConfig',
-    'core.apps.CoreConfig',
-    'ext_auth.apps.ExtAuthConfig',
+
+    # Your apps
+    'apps.api.conf.ApiConfig',
+    'apps.core.conf.CoreConfig',
+    'apps.ext_auth.conf.ExtAuthConfig'
 ]
 
 MIDDLEWARE = [

src/config/settings/local.py

@@ -1,8 +1,11 @@
+import os
+
 from dotenv import load_dotenv
 
-import os
+from pathlib import Path
+
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+BASE_DIR = Path(__file__).parent.parent.parent.parent
 
 # reading ./deployment/example.env file
 load_dotenv(os.path.join(BASE_DIR, 'deployment', 'example.env'))

src/config/settings/production.py

@@ -1,9 +1,11 @@
-from dotenv import load_dotenv
-
 import os
 
+from pathlib import Path
+
+from dotenv import load_dotenv
+
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+BASE_DIR = Path(__file__).parent.parent.parent.parent
 
 # reading ./deployment/.env file
 load_dotenv(os.path.join(BASE_DIR, 'deployment', '.env'))
@@ -22,10 +24,10 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': os.getenv('POSTGRES_DB'),
-        'USER': os.getenv('POSTGRES_USER'),
-        'PASSWORD': os.getenv('POSTGRES_PASSWORD'),
+        'NAME': os.getenv('DB_NAME'),
+        'USER': os.getenv('DB_USER'),
+        'PASSWORD': os.getenv('DB_PASSWORD'),
         'HOST': os.getenv('HOST'),
-        'PORT': os.getenv('PORT_DB'),
+        'PORT': os.getenv('DB_PORT'),
     }
 }

src/manage.py

@@ -1,11 +1,9 @@
 #!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
 import os
 import sys
 
 
 def main():
-    """Run administrative tasks."""
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
     try:
         from django.core.management import execute_from_command_line

src/packs/db.py

@@ -1,29 +1,38 @@
-def rename_tables():
+def rename_tables() -> None:
 
     from django.db.migrations.recorder import MigrationRecorder
     from django.contrib.contenttypes.models import ContentType
     from django.contrib.auth.models import Group, Permission
     from django.contrib.sessions.models import Session
     from django.contrib.admin.models import LogEntry
 
-
+    '''Init Migration class'''
     MigrationRecorder.Migration()
 
+    '''Edit db_table in M2M field Group model'''
+    Group.permissions.db_table = 'group_permissions'
+    Group._meta.get_field('permissions').db_table = 'group_permissions'
+
+    '''Edit db_table of Group model'''
     Group._meta.db_table = 'groups'
     Group._meta.original_attrs['db_table'] = 'groups'
-    Group.permissions.db_table = 'group_permissions'
 
+    '''Edit db_table of Permission model'''
     Permission._meta.db_table = 'permissions'
     Permission._meta.original_attrs['db_table'] = 'permissions'
 
+    '''Edit db_table of LogEntry model'''
     LogEntry._meta.db_table = 'admin_log'
     LogEntry._meta.original_attrs['db_table'] = 'admin_log'
 
+    '''Edit db_table of Session model'''
     Session._meta.db_table = 'sessions'
     Session._meta.original_attrs['db_table'] = 'sessions'
 
+    '''Edit db_table of ContentType model'''
     ContentType._meta.db_table = 'content_types'
     ContentType._meta.original_attrs['db_table'] = 'content_types'
 
+    '''Edit db_table of Migration model'''
     MigrationRecorder._migration_class._meta.db_table = 'migrations'
     MigrationRecorder._migration_class._meta.original_attrs['db_table'] = 'migrations'

src/routers/__init__.py

@@ -12,10 +12,10 @@
 admin.site.site_title = "Flatype Admin"
 admin.site.index_title = "Welcome to Flatype Admin Panel"
 
-handler400 = "core.exceptions.bad_request"
-handler403 = "core.exceptions.permission_denied"
-handler404 = "core.exceptions.page_not_found"
-handler500 = "core.exceptions.server_error"
+handler400 = "apps.core.exceptions.bad_request"
+handler403 = "apps.core.exceptions.permission_denied"
+handler404 = "apps.core.exceptions.page_not_found"
+handler500 = "apps.core.exceptions.server_error"
 
 if settings.DEBUG:
     from django.conf.urls.static import static

src/routers/api_router.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from api import views as views_api
+from apps.api import views as views_api
 
 
 urlpatterns = [

src/routers/auth_router.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from ext_auth import views as views_auth
+from apps.ext_auth import views as views_auth
 
 
 urlpatterns = [

src/routers/core_router.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from core import views as views_core
+from apps.core import views as views_core
 
 
 urlpatterns = [