From 53042ed25e25c16db61b10a10aec7b26329a7b3d Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Thu, 28 Aug 2025 14:21:12 +0500 Subject: [PATCH] change: change apps folder --- .env.example | 13 +++++++++++++ config/settings/base.py | 14 ++++++++++++++ config/urls.py | 13 ++++++++++--- core/apps/accounts/admin.py | 3 --- core/apps/accounts/apps.py | 2 +- core/apps/accounts/models.py | 3 --- core/apps/accounts/models/__init__.py | 0 core/apps/accounts/models/user.py | 10 ++++++++++ core/apps/accounts/tests.py | 3 --- core/apps/accounts/urls.py | 6 ++++++ core/apps/accounts/views.py | 3 --- core/apps/orders/admin.py | 3 --- core/apps/orders/admin/__init__.py | 0 core/apps/orders/apps.py | 2 +- core/apps/orders/models.py | 3 --- core/apps/orders/models/__init__.py | 0 core/apps/orders/serializers/__init__.py | 0 core/apps/orders/tests.py | 3 --- core/apps/orders/urls.py | 6 ++++++ core/apps/orders/views.py | 3 --- core/apps/orders/views/__init__.py | 0 core/apps/products/admin.py | 3 --- core/apps/products/admin/__init__.py | 0 core/apps/products/apps.py | 2 +- core/apps/products/models.py | 3 --- core/apps/products/models/__init__.py | 0 core/apps/products/serializers/__init__.py | 0 core/apps/products/tests.py | 3 --- core/apps/products/urls.py | 6 ++++++ core/apps/products/views.py | 3 --- core/apps/products/views/__init__.py | 0 31 files changed, 68 insertions(+), 42 deletions(-) delete mode 100644 core/apps/accounts/admin.py delete mode 100644 core/apps/accounts/models.py create mode 100644 core/apps/accounts/models/__init__.py create mode 100644 core/apps/accounts/models/user.py delete mode 100644 core/apps/accounts/tests.py create mode 100644 core/apps/accounts/urls.py delete mode 100644 core/apps/accounts/views.py delete mode 100644 core/apps/orders/admin.py create mode 100644 core/apps/orders/admin/__init__.py delete mode 100644 core/apps/orders/models.py create mode 100644 core/apps/orders/models/__init__.py create mode 100644 core/apps/orders/serializers/__init__.py delete mode 100644 core/apps/orders/tests.py create mode 100644 core/apps/orders/urls.py delete mode 100644 core/apps/orders/views.py create mode 100644 core/apps/orders/views/__init__.py delete mode 100644 core/apps/products/admin.py create mode 100644 core/apps/products/admin/__init__.py delete mode 100644 core/apps/products/models.py create mode 100644 core/apps/products/models/__init__.py create mode 100644 core/apps/products/serializers/__init__.py delete mode 100644 core/apps/products/tests.py create mode 100644 core/apps/products/urls.py delete mode 100644 core/apps/products/views.py create mode 100644 core/apps/products/views/__init__.py diff --git a/.env.example b/.env.example index e69de29..0203916 100644 --- a/.env.example +++ b/.env.example @@ -0,0 +1,13 @@ +SECRET_KEY= +DEBUG=True +ALLOWED_HOSTS=localhost,127.0.0.1 + + +POSTGRES_DB= +POSTGRES_USER= +POSTGRES_PASSWORD= +POSTGRES_HOST=db +POSTGRES_PORT=5432 + +COMMAND=sh ./resources/scripts/entrypoint-server.sh +PORT=8080 \ No newline at end of file diff --git a/config/settings/base.py b/config/settings/base.py index 23d5052..f20de81 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -18,11 +18,25 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + + # packages + 'drf_yasg', + 'rest_framework', + 'rest_framework_simplejwt', + 'corsheaders', + # apps + 'core.apps.shared', + 'core.apps.accounts', + 'core.apps.orders', + 'core.apps.products', + ] MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.locale.LocaleMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', diff --git a/config/urls.py b/config/urls.py index de36fa2..b24a137 100644 --- a/config/urls.py +++ b/config/urls.py @@ -22,10 +22,17 @@ schema_view = get_schema_view( urlpatterns = [ - path('admin/', admin.site.urls), + path('admin/', admin.site.urls), + path('api/v1/', include( + [ + path('accounts/', include('core.apps.accounts.urls')), + path('orders/', include('core.apps.orders.urls')), + path('products/', include('core.apps.products.urls')), + path('shared/', include('core.apps.shared.urls')), + ] + )), - - path('', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), + path('', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/core/apps/accounts/admin.py b/core/apps/accounts/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/core/apps/accounts/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/core/apps/accounts/apps.py b/core/apps/accounts/apps.py index 3e3c765..197bf14 100644 --- a/core/apps/accounts/apps.py +++ b/core/apps/accounts/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class AccountsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'accounts' + name = 'core.apps.accounts' diff --git a/core/apps/accounts/models.py b/core/apps/accounts/models.py deleted file mode 100644 index 71a8362..0000000 --- a/core/apps/accounts/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/core/apps/accounts/models/__init__.py b/core/apps/accounts/models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/accounts/models/user.py b/core/apps/accounts/models/user.py new file mode 100644 index 0000000..d99dd0f --- /dev/null +++ b/core/apps/accounts/models/user.py @@ -0,0 +1,10 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + +from core.apps.shared.models.base import BaseModel + + +class User(AbstractUser, BaseModel): + pass + + diff --git a/core/apps/accounts/tests.py b/core/apps/accounts/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/core/apps/accounts/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/core/apps/accounts/urls.py b/core/apps/accounts/urls.py new file mode 100644 index 0000000..c9dc166 --- /dev/null +++ b/core/apps/accounts/urls.py @@ -0,0 +1,6 @@ +from django.urls import path, include + + +urlpatterns = [ + +] \ No newline at end of file diff --git a/core/apps/accounts/views.py b/core/apps/accounts/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/core/apps/accounts/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/core/apps/orders/admin.py b/core/apps/orders/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/core/apps/orders/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/core/apps/orders/admin/__init__.py b/core/apps/orders/admin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/orders/apps.py b/core/apps/orders/apps.py index 8ae0375..2d18476 100644 --- a/core/apps/orders/apps.py +++ b/core/apps/orders/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class OrdersConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'orders' + name = 'core.apps.orders' diff --git a/core/apps/orders/models.py b/core/apps/orders/models.py deleted file mode 100644 index 71a8362..0000000 --- a/core/apps/orders/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/core/apps/orders/models/__init__.py b/core/apps/orders/models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/orders/serializers/__init__.py b/core/apps/orders/serializers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/orders/tests.py b/core/apps/orders/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/core/apps/orders/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/core/apps/orders/urls.py b/core/apps/orders/urls.py new file mode 100644 index 0000000..c9dc166 --- /dev/null +++ b/core/apps/orders/urls.py @@ -0,0 +1,6 @@ +from django.urls import path, include + + +urlpatterns = [ + +] \ No newline at end of file diff --git a/core/apps/orders/views.py b/core/apps/orders/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/core/apps/orders/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/core/apps/orders/views/__init__.py b/core/apps/orders/views/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/products/admin.py b/core/apps/products/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/core/apps/products/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/core/apps/products/admin/__init__.py b/core/apps/products/admin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/products/apps.py b/core/apps/products/apps.py index 145a2ac..146e38b 100644 --- a/core/apps/products/apps.py +++ b/core/apps/products/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class ProductsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'products' + name = 'core.apps.products' diff --git a/core/apps/products/models.py b/core/apps/products/models.py deleted file mode 100644 index 71a8362..0000000 --- a/core/apps/products/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/core/apps/products/models/__init__.py b/core/apps/products/models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/products/serializers/__init__.py b/core/apps/products/serializers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/apps/products/tests.py b/core/apps/products/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/core/apps/products/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/core/apps/products/urls.py b/core/apps/products/urls.py new file mode 100644 index 0000000..c9dc166 --- /dev/null +++ b/core/apps/products/urls.py @@ -0,0 +1,6 @@ +from django.urls import path, include + + +urlpatterns = [ + +] \ No newline at end of file diff --git a/core/apps/products/views.py b/core/apps/products/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/core/apps/products/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/core/apps/products/views/__init__.py b/core/apps/products/views/__init__.py new file mode 100644 index 0000000..e69de29