From bc24faeedde455749a8d02fb7700a085b52a80b5 Mon Sep 17 00:00:00 2001 From: A'zamov Samandar Date: Sat, 19 Apr 2025 19:24:18 +0500 Subject: [PATCH] AUTH_CMD to USER_CMD, updated workflows, Makefile, and docker-compose for user service --- .env.example | 2 +- .github/workflows/deploy.yml | 6 +-- Makefile | 12 +++--- docker-compose.yml | 38 +++++++++--------- {auth => user}/.cruft.json | 0 {auth => user}/.dockerignore | 0 {auth => user}/.env.example | 0 {auth => user}/.flake8 | 0 {auth => user}/.gitignore | 0 {auth => user}/README.MD | 0 {auth => user}/config/__init__.py | 0 {auth => user}/config/asgi.py | 0 {auth => user}/config/celery.py | 0 {auth => user}/config/conf/__init__.py | 0 {auth => user}/config/conf/apps.py | 0 {auth => user}/config/conf/cache.py | 0 {auth => user}/config/conf/celery.py | 0 {auth => user}/config/conf/channels.py | 0 {auth => user}/config/conf/ckeditor.py | 0 {auth => user}/config/conf/cron.py | 0 {auth => user}/config/conf/jwt.py | 0 {auth => user}/config/conf/logs.py | 0 {auth => user}/config/conf/modules.py | 0 {auth => user}/config/conf/navigation.py | 0 {auth => user}/config/conf/rest_framework.py | 0 {auth => user}/config/conf/spectacular.py | 0 {auth => user}/config/conf/storage.py | 0 {auth => user}/config/conf/unfold.py | 0 {auth => user}/config/env.py | 0 {auth => user}/config/settings/__init__.py | 0 {auth => user}/config/settings/common.py | 0 {auth => user}/config/settings/local.py | 0 {auth => user}/config/settings/production.py | 0 {auth => user}/config/urls.py | 0 {auth => user}/config/wsgi.py | 0 {auth => user}/core/__init__.py | 0 {auth => user}/core/apps/__init__.py | 0 {auth => user}/core/apps/accounts/__init__.py | 0 .../core/apps/accounts/admin/__init__.py | 0 .../core/apps/accounts/admin/core.py | 0 .../core/apps/accounts/admin/user.py | 0 {auth => user}/core/apps/accounts/apps.py | 0 .../core/apps/accounts/choices/__init__.py | 0 .../core/apps/accounts/choices/user.py | 0 .../core/apps/accounts/managers/__init__.py | 0 .../core/apps/accounts/managers/user.py | 0 .../apps/accounts/migrations/0001_initial.py | 0 .../core/apps/accounts/migrations/__init__.py | 0 .../core/apps/accounts/models/__init__.py | 0 .../core/apps/accounts/models/reset_token.py | 0 .../core/apps/accounts/models/user.py | 0 .../core/apps/accounts/seeder/__init__.py | 0 .../core/apps/accounts/seeder/core.py | 0 .../apps/accounts/serializers/__init__.py | 0 .../core/apps/accounts/serializers/auth.py | 0 .../accounts/serializers/change_password.py | 0 .../apps/accounts/serializers/set_password.py | 0 .../core/apps/accounts/serializers/user.py | 0 .../core/apps/accounts/signals/__init__.py | 0 .../core/apps/accounts/signals/user.py | 0 .../core/apps/accounts/test/__init__.py | 0 .../core/apps/accounts/test/test_auth.py | 0 .../accounts/test/test_change_password.py | 0 {auth => user}/core/apps/accounts/urls.py | 0 .../core/apps/accounts/views/__init__.py | 0 .../core/apps/accounts/views/auth.py | 0 {auth => user}/core/apps/logs/.gitignore | 0 {auth => user}/core/services/__init__.py | 0 {auth => user}/core/services/otp.py | 0 {auth => user}/core/services/sms.py | 0 {auth => user}/core/services/user.py | 0 {auth => user}/core/utils/__init__.py | 0 {auth => user}/core/utils/cache.py | 0 {auth => user}/core/utils/console.py | 0 {auth => user}/core/utils/core.py | 0 {auth => user}/core/utils/storage.py | 0 {auth => user}/docker-compose.yml | 0 {auth => user}/docker/Dockerfile.nginx | 0 {auth => user}/docker/Dockerfile.web | 0 {auth => user}/jst.json | 0 {auth => user}/manage.py | 0 {auth => user}/pyproject.toml | 0 {auth => user}/requirements.txt | 0 {auth => user}/resources/.gitignore | 0 {auth => user}/resources/layout/.flake8 | 0 .../resources/layout/Dockerfile.alpine | 0 .../resources/layout/Dockerfile.nginx | 0 {auth => user}/resources/layout/mypy.ini | 0 {auth => user}/resources/layout/nginx.conf | 4 +- {auth => user}/resources/locale/.gitkeep | 0 .../resources/locale/en/LC_MESSAGES/django.po | 0 .../resources/locale/ru/LC_MESSAGES/django.po | 0 .../resources/locale/uz/LC_MESSAGES/django.po | 0 {auth => user}/resources/logs/.gitignore | 0 {auth => user}/resources/media/.gitignore | 0 {auth => user}/resources/scripts/backup.sh | 0 .../resources/scripts/entrypoint-server.sh | 0 .../resources/scripts/entrypoint.sh | 0 {auth => user}/resources/static/css/app.css | 0 {auth => user}/resources/static/css/error.css | 0 {auth => user}/resources/static/css/input.css | 0 .../resources/static/css/jazzmin.css | 0 .../resources/static/css/output.css | 0 .../resources/static/images/logo.png | Bin {auth => user}/resources/static/js/alpine.js | 0 {auth => user}/resources/static/js/app.js | 0 {auth => user}/resources/static/js/counter.js | 0 .../resources/static/js/customer.js | 0 .../resources/static/js/vite-refresh.js | 0 .../static/vite/assets/appCss-w40geAFS.js | 0 .../static/vite/assets/appJs-YH6iAcjX.js | 0 .../static/vite/assets/outCss-r8J2MRAR.css | 0 .../resources/static/vite/manifest.json | 0 {auth => user}/resources/templates/400.html | 0 {auth => user}/resources/templates/401.html | 0 {auth => user}/resources/templates/403.html | 0 {auth => user}/resources/templates/404.html | 0 {auth => user}/resources/templates/405.html | 0 {auth => user}/resources/templates/408.html | 0 {auth => user}/resources/templates/500.html | 0 {auth => user}/resources/templates/502.html | 0 {auth => user}/resources/templates/503.html | 0 {auth => user}/resources/templates/504.html | 0 .../resources/templates/admin/index.html | 0 .../templates/registration/login.html | 0 .../resources/templates/user/home.html | 0 126 files changed, 30 insertions(+), 32 deletions(-) rename {auth => user}/.cruft.json (100%) rename {auth => user}/.dockerignore (100%) rename {auth => user}/.env.example (100%) rename {auth => user}/.flake8 (100%) rename {auth => user}/.gitignore (100%) rename {auth => user}/README.MD (100%) rename {auth => user}/config/__init__.py (100%) rename {auth => user}/config/asgi.py (100%) rename {auth => user}/config/celery.py (100%) rename {auth => user}/config/conf/__init__.py (100%) rename {auth => user}/config/conf/apps.py (100%) rename {auth => user}/config/conf/cache.py (100%) rename {auth => user}/config/conf/celery.py (100%) rename {auth => user}/config/conf/channels.py (100%) rename {auth => user}/config/conf/ckeditor.py (100%) rename {auth => user}/config/conf/cron.py (100%) rename {auth => user}/config/conf/jwt.py (100%) rename {auth => user}/config/conf/logs.py (100%) rename {auth => user}/config/conf/modules.py (100%) rename {auth => user}/config/conf/navigation.py (100%) rename {auth => user}/config/conf/rest_framework.py (100%) rename {auth => user}/config/conf/spectacular.py (100%) rename {auth => user}/config/conf/storage.py (100%) rename {auth => user}/config/conf/unfold.py (100%) rename {auth => user}/config/env.py (100%) rename {auth => user}/config/settings/__init__.py (100%) rename {auth => user}/config/settings/common.py (100%) rename {auth => user}/config/settings/local.py (100%) rename {auth => user}/config/settings/production.py (100%) rename {auth => user}/config/urls.py (100%) rename {auth => user}/config/wsgi.py (100%) rename {auth => user}/core/__init__.py (100%) rename {auth => user}/core/apps/__init__.py (100%) rename {auth => user}/core/apps/accounts/__init__.py (100%) rename {auth => user}/core/apps/accounts/admin/__init__.py (100%) rename {auth => user}/core/apps/accounts/admin/core.py (100%) rename {auth => user}/core/apps/accounts/admin/user.py (100%) rename {auth => user}/core/apps/accounts/apps.py (100%) rename {auth => user}/core/apps/accounts/choices/__init__.py (100%) rename {auth => user}/core/apps/accounts/choices/user.py (100%) rename {auth => user}/core/apps/accounts/managers/__init__.py (100%) rename {auth => user}/core/apps/accounts/managers/user.py (100%) rename {auth => user}/core/apps/accounts/migrations/0001_initial.py (100%) rename {auth => user}/core/apps/accounts/migrations/__init__.py (100%) rename {auth => user}/core/apps/accounts/models/__init__.py (100%) rename {auth => user}/core/apps/accounts/models/reset_token.py (100%) rename {auth => user}/core/apps/accounts/models/user.py (100%) rename {auth => user}/core/apps/accounts/seeder/__init__.py (100%) rename {auth => user}/core/apps/accounts/seeder/core.py (100%) rename {auth => user}/core/apps/accounts/serializers/__init__.py (100%) rename {auth => user}/core/apps/accounts/serializers/auth.py (100%) rename {auth => user}/core/apps/accounts/serializers/change_password.py (100%) rename {auth => user}/core/apps/accounts/serializers/set_password.py (100%) rename {auth => user}/core/apps/accounts/serializers/user.py (100%) rename {auth => user}/core/apps/accounts/signals/__init__.py (100%) rename {auth => user}/core/apps/accounts/signals/user.py (100%) rename {auth => user}/core/apps/accounts/test/__init__.py (100%) rename {auth => user}/core/apps/accounts/test/test_auth.py (100%) rename {auth => user}/core/apps/accounts/test/test_change_password.py (100%) rename {auth => user}/core/apps/accounts/urls.py (100%) rename {auth => user}/core/apps/accounts/views/__init__.py (100%) rename {auth => user}/core/apps/accounts/views/auth.py (100%) rename {auth => user}/core/apps/logs/.gitignore (100%) rename {auth => user}/core/services/__init__.py (100%) rename {auth => user}/core/services/otp.py (100%) rename {auth => user}/core/services/sms.py (100%) rename {auth => user}/core/services/user.py (100%) rename {auth => user}/core/utils/__init__.py (100%) rename {auth => user}/core/utils/cache.py (100%) rename {auth => user}/core/utils/console.py (100%) rename {auth => user}/core/utils/core.py (100%) rename {auth => user}/core/utils/storage.py (100%) rename {auth => user}/docker-compose.yml (100%) rename {auth => user}/docker/Dockerfile.nginx (100%) rename {auth => user}/docker/Dockerfile.web (100%) rename {auth => user}/jst.json (100%) rename {auth => user}/manage.py (100%) rename {auth => user}/pyproject.toml (100%) rename {auth => user}/requirements.txt (100%) rename {auth => user}/resources/.gitignore (100%) rename {auth => user}/resources/layout/.flake8 (100%) rename {auth => user}/resources/layout/Dockerfile.alpine (100%) rename {auth => user}/resources/layout/Dockerfile.nginx (100%) rename {auth => user}/resources/layout/mypy.ini (100%) rename {auth => user}/resources/layout/nginx.conf (93%) rename {auth => user}/resources/locale/.gitkeep (100%) rename {auth => user}/resources/locale/en/LC_MESSAGES/django.po (100%) rename {auth => user}/resources/locale/ru/LC_MESSAGES/django.po (100%) rename {auth => user}/resources/locale/uz/LC_MESSAGES/django.po (100%) rename {auth => user}/resources/logs/.gitignore (100%) rename {auth => user}/resources/media/.gitignore (100%) rename {auth => user}/resources/scripts/backup.sh (100%) rename {auth => user}/resources/scripts/entrypoint-server.sh (100%) rename {auth => user}/resources/scripts/entrypoint.sh (100%) rename {auth => user}/resources/static/css/app.css (100%) rename {auth => user}/resources/static/css/error.css (100%) rename {auth => user}/resources/static/css/input.css (100%) rename {auth => user}/resources/static/css/jazzmin.css (100%) rename {auth => user}/resources/static/css/output.css (100%) rename {auth => user}/resources/static/images/logo.png (100%) rename {auth => user}/resources/static/js/alpine.js (100%) rename {auth => user}/resources/static/js/app.js (100%) rename {auth => user}/resources/static/js/counter.js (100%) rename {auth => user}/resources/static/js/customer.js (100%) rename {auth => user}/resources/static/js/vite-refresh.js (100%) rename {auth => user}/resources/static/vite/assets/appCss-w40geAFS.js (100%) rename {auth => user}/resources/static/vite/assets/appJs-YH6iAcjX.js (100%) rename {auth => user}/resources/static/vite/assets/outCss-r8J2MRAR.css (100%) rename {auth => user}/resources/static/vite/manifest.json (100%) rename {auth => user}/resources/templates/400.html (100%) rename {auth => user}/resources/templates/401.html (100%) rename {auth => user}/resources/templates/403.html (100%) rename {auth => user}/resources/templates/404.html (100%) rename {auth => user}/resources/templates/405.html (100%) rename {auth => user}/resources/templates/408.html (100%) rename {auth => user}/resources/templates/500.html (100%) rename {auth => user}/resources/templates/502.html (100%) rename {auth => user}/resources/templates/503.html (100%) rename {auth => user}/resources/templates/504.html (100%) rename {auth => user}/resources/templates/admin/index.html (100%) rename {auth => user}/resources/templates/registration/login.html (100%) rename {auth => user}/resources/templates/user/home.html (100%) diff --git a/.env.example b/.env.example index 5122bf2..5b9f93e 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,2 @@ -AUTH_COMMAND=sh ./resources/scripts/entrypoint.sh +USER_COMMAND=sh ./resources/scripts/entrypoint.sh JWT_KEY=key \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0dae23b..e563394 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,10 +16,10 @@ jobs: - name: 📥 Secret orqali .env fayl yaratish run: | echo "${{ secrets.BASE_ENV_FILE }}" > .env - echo "${{ secrets.AUTH_ENV_FILE }}" > ./auth/.env + echo "${{ secrets.USER_ENV_FILE }}" > ./user/.env - name: 🛠 Docker Compose bilan build & deploy run: | - docker compose --profile auth --profile payment build + docker compose --profile user --profile payment build docker compose down - docker compose --profile auth --profile payment up -d \ No newline at end of file + docker compose --profile user --profile payment up -d \ No newline at end of file diff --git a/Makefile b/Makefile index 5660e6b..e43734d 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,10 @@ -up-auth: - docker compose --profile auth up -d - -down-auth: - docker compose --profile auth down +up-user: + docker compose --profile user up -d +down-user: + docker compose --profile user down up-payment: docker compose --profile payment up -d down-payment: docker compose --profile payment down - down-all: - docker compose --profile payment --profile auth down \ No newline at end of file + docker compose --profile payment --profile user down \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 72e42f2..02e2e42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,46 +21,46 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" networks: - lamenu - auth-nginx: + user-nginx: labels: - "traefik.enable=true" - - "traefik.http.routers.auth.rule=PathPrefix(`/auth`)" - - "traefik.http.routers.auth.entrypoints=web" - - "traefik.http.services.auth.loadbalancer.server.port=80" - - "traefik.http.middlewares.auth-strip-prefix.stripPrefix.prefixes=/auth" - - "traefik.http.routers.auth.middlewares=auth-strip-prefix" + - "traefik.http.routers.user.rule=PathPrefix(`/user`)" + - "traefik.http.routers.user.entrypoints=web" + - "traefik.http.services.user.loadbalancer.server.port=80" + - "traefik.http.middlewares.user-strip-prefix.stripPrefix.prefixes=/user" + - "traefik.http.routers.user.middlewares=user-strip-prefix" networks: - lamenu volumes: - - ./auth/resources/layout/nginx.conf:/etc/nginx/nginx.conf - - ./auth/resources/:/usr/share/nginx/html/resources/ + - ./user/resources/layout/nginx.conf:/etc/nginx/nginx.conf + - ./user/resources/:/usr/share/nginx/html/resources/ build: - context: ./auth + context: ./user dockerfile: ./docker/Dockerfile.nginx depends_on: - - auth + - user profiles: - - auth - auth: + - user + user: networks: - lamenu build: - context: ./auth + context: ./user dockerfile: ./docker/Dockerfile.web restart: always - command: ${AUTH_COMMAND:-sh ./resources/scripts/entrypoint.sh} + command: ${user_COMMAND:-sh ./resources/scripts/entrypoint.sh} environment: - PYTHONPYCACHEPREFIX=/var/cache/pycache - JWT_KEY=${JWT_KEY} volumes: - - ./auth:/code + - ./user:/code - pycache:/var/cache/pycache depends_on: - - auth-db + - user-db - redis profiles: - - auth - auth-db: + - user + user-db: networks: - lamenu image: postgres:16 @@ -72,7 +72,7 @@ services: volumes: - pg_data:/var/lib/postgresql/data profiles: - - auth + - user payment: labels: diff --git a/auth/.cruft.json b/user/.cruft.json similarity index 100% rename from auth/.cruft.json rename to user/.cruft.json diff --git a/auth/.dockerignore b/user/.dockerignore similarity index 100% rename from auth/.dockerignore rename to user/.dockerignore diff --git a/auth/.env.example b/user/.env.example similarity index 100% rename from auth/.env.example rename to user/.env.example diff --git a/auth/.flake8 b/user/.flake8 similarity index 100% rename from auth/.flake8 rename to user/.flake8 diff --git a/auth/.gitignore b/user/.gitignore similarity index 100% rename from auth/.gitignore rename to user/.gitignore diff --git a/auth/README.MD b/user/README.MD similarity index 100% rename from auth/README.MD rename to user/README.MD diff --git a/auth/config/__init__.py b/user/config/__init__.py similarity index 100% rename from auth/config/__init__.py rename to user/config/__init__.py diff --git a/auth/config/asgi.py b/user/config/asgi.py similarity index 100% rename from auth/config/asgi.py rename to user/config/asgi.py diff --git a/auth/config/celery.py b/user/config/celery.py similarity index 100% rename from auth/config/celery.py rename to user/config/celery.py diff --git a/auth/config/conf/__init__.py b/user/config/conf/__init__.py similarity index 100% rename from auth/config/conf/__init__.py rename to user/config/conf/__init__.py diff --git a/auth/config/conf/apps.py b/user/config/conf/apps.py similarity index 100% rename from auth/config/conf/apps.py rename to user/config/conf/apps.py diff --git a/auth/config/conf/cache.py b/user/config/conf/cache.py similarity index 100% rename from auth/config/conf/cache.py rename to user/config/conf/cache.py diff --git a/auth/config/conf/celery.py b/user/config/conf/celery.py similarity index 100% rename from auth/config/conf/celery.py rename to user/config/conf/celery.py diff --git a/auth/config/conf/channels.py b/user/config/conf/channels.py similarity index 100% rename from auth/config/conf/channels.py rename to user/config/conf/channels.py diff --git a/auth/config/conf/ckeditor.py b/user/config/conf/ckeditor.py similarity index 100% rename from auth/config/conf/ckeditor.py rename to user/config/conf/ckeditor.py diff --git a/auth/config/conf/cron.py b/user/config/conf/cron.py similarity index 100% rename from auth/config/conf/cron.py rename to user/config/conf/cron.py diff --git a/auth/config/conf/jwt.py b/user/config/conf/jwt.py similarity index 100% rename from auth/config/conf/jwt.py rename to user/config/conf/jwt.py diff --git a/auth/config/conf/logs.py b/user/config/conf/logs.py similarity index 100% rename from auth/config/conf/logs.py rename to user/config/conf/logs.py diff --git a/auth/config/conf/modules.py b/user/config/conf/modules.py similarity index 100% rename from auth/config/conf/modules.py rename to user/config/conf/modules.py diff --git a/auth/config/conf/navigation.py b/user/config/conf/navigation.py similarity index 100% rename from auth/config/conf/navigation.py rename to user/config/conf/navigation.py diff --git a/auth/config/conf/rest_framework.py b/user/config/conf/rest_framework.py similarity index 100% rename from auth/config/conf/rest_framework.py rename to user/config/conf/rest_framework.py diff --git a/auth/config/conf/spectacular.py b/user/config/conf/spectacular.py similarity index 100% rename from auth/config/conf/spectacular.py rename to user/config/conf/spectacular.py diff --git a/auth/config/conf/storage.py b/user/config/conf/storage.py similarity index 100% rename from auth/config/conf/storage.py rename to user/config/conf/storage.py diff --git a/auth/config/conf/unfold.py b/user/config/conf/unfold.py similarity index 100% rename from auth/config/conf/unfold.py rename to user/config/conf/unfold.py diff --git a/auth/config/env.py b/user/config/env.py similarity index 100% rename from auth/config/env.py rename to user/config/env.py diff --git a/auth/config/settings/__init__.py b/user/config/settings/__init__.py similarity index 100% rename from auth/config/settings/__init__.py rename to user/config/settings/__init__.py diff --git a/auth/config/settings/common.py b/user/config/settings/common.py similarity index 100% rename from auth/config/settings/common.py rename to user/config/settings/common.py diff --git a/auth/config/settings/local.py b/user/config/settings/local.py similarity index 100% rename from auth/config/settings/local.py rename to user/config/settings/local.py diff --git a/auth/config/settings/production.py b/user/config/settings/production.py similarity index 100% rename from auth/config/settings/production.py rename to user/config/settings/production.py diff --git a/auth/config/urls.py b/user/config/urls.py similarity index 100% rename from auth/config/urls.py rename to user/config/urls.py diff --git a/auth/config/wsgi.py b/user/config/wsgi.py similarity index 100% rename from auth/config/wsgi.py rename to user/config/wsgi.py diff --git a/auth/core/__init__.py b/user/core/__init__.py similarity index 100% rename from auth/core/__init__.py rename to user/core/__init__.py diff --git a/auth/core/apps/__init__.py b/user/core/apps/__init__.py similarity index 100% rename from auth/core/apps/__init__.py rename to user/core/apps/__init__.py diff --git a/auth/core/apps/accounts/__init__.py b/user/core/apps/accounts/__init__.py similarity index 100% rename from auth/core/apps/accounts/__init__.py rename to user/core/apps/accounts/__init__.py diff --git a/auth/core/apps/accounts/admin/__init__.py b/user/core/apps/accounts/admin/__init__.py similarity index 100% rename from auth/core/apps/accounts/admin/__init__.py rename to user/core/apps/accounts/admin/__init__.py diff --git a/auth/core/apps/accounts/admin/core.py b/user/core/apps/accounts/admin/core.py similarity index 100% rename from auth/core/apps/accounts/admin/core.py rename to user/core/apps/accounts/admin/core.py diff --git a/auth/core/apps/accounts/admin/user.py b/user/core/apps/accounts/admin/user.py similarity index 100% rename from auth/core/apps/accounts/admin/user.py rename to user/core/apps/accounts/admin/user.py diff --git a/auth/core/apps/accounts/apps.py b/user/core/apps/accounts/apps.py similarity index 100% rename from auth/core/apps/accounts/apps.py rename to user/core/apps/accounts/apps.py diff --git a/auth/core/apps/accounts/choices/__init__.py b/user/core/apps/accounts/choices/__init__.py similarity index 100% rename from auth/core/apps/accounts/choices/__init__.py rename to user/core/apps/accounts/choices/__init__.py diff --git a/auth/core/apps/accounts/choices/user.py b/user/core/apps/accounts/choices/user.py similarity index 100% rename from auth/core/apps/accounts/choices/user.py rename to user/core/apps/accounts/choices/user.py diff --git a/auth/core/apps/accounts/managers/__init__.py b/user/core/apps/accounts/managers/__init__.py similarity index 100% rename from auth/core/apps/accounts/managers/__init__.py rename to user/core/apps/accounts/managers/__init__.py diff --git a/auth/core/apps/accounts/managers/user.py b/user/core/apps/accounts/managers/user.py similarity index 100% rename from auth/core/apps/accounts/managers/user.py rename to user/core/apps/accounts/managers/user.py diff --git a/auth/core/apps/accounts/migrations/0001_initial.py b/user/core/apps/accounts/migrations/0001_initial.py similarity index 100% rename from auth/core/apps/accounts/migrations/0001_initial.py rename to user/core/apps/accounts/migrations/0001_initial.py diff --git a/auth/core/apps/accounts/migrations/__init__.py b/user/core/apps/accounts/migrations/__init__.py similarity index 100% rename from auth/core/apps/accounts/migrations/__init__.py rename to user/core/apps/accounts/migrations/__init__.py diff --git a/auth/core/apps/accounts/models/__init__.py b/user/core/apps/accounts/models/__init__.py similarity index 100% rename from auth/core/apps/accounts/models/__init__.py rename to user/core/apps/accounts/models/__init__.py diff --git a/auth/core/apps/accounts/models/reset_token.py b/user/core/apps/accounts/models/reset_token.py similarity index 100% rename from auth/core/apps/accounts/models/reset_token.py rename to user/core/apps/accounts/models/reset_token.py diff --git a/auth/core/apps/accounts/models/user.py b/user/core/apps/accounts/models/user.py similarity index 100% rename from auth/core/apps/accounts/models/user.py rename to user/core/apps/accounts/models/user.py diff --git a/auth/core/apps/accounts/seeder/__init__.py b/user/core/apps/accounts/seeder/__init__.py similarity index 100% rename from auth/core/apps/accounts/seeder/__init__.py rename to user/core/apps/accounts/seeder/__init__.py diff --git a/auth/core/apps/accounts/seeder/core.py b/user/core/apps/accounts/seeder/core.py similarity index 100% rename from auth/core/apps/accounts/seeder/core.py rename to user/core/apps/accounts/seeder/core.py diff --git a/auth/core/apps/accounts/serializers/__init__.py b/user/core/apps/accounts/serializers/__init__.py similarity index 100% rename from auth/core/apps/accounts/serializers/__init__.py rename to user/core/apps/accounts/serializers/__init__.py diff --git a/auth/core/apps/accounts/serializers/auth.py b/user/core/apps/accounts/serializers/auth.py similarity index 100% rename from auth/core/apps/accounts/serializers/auth.py rename to user/core/apps/accounts/serializers/auth.py diff --git a/auth/core/apps/accounts/serializers/change_password.py b/user/core/apps/accounts/serializers/change_password.py similarity index 100% rename from auth/core/apps/accounts/serializers/change_password.py rename to user/core/apps/accounts/serializers/change_password.py diff --git a/auth/core/apps/accounts/serializers/set_password.py b/user/core/apps/accounts/serializers/set_password.py similarity index 100% rename from auth/core/apps/accounts/serializers/set_password.py rename to user/core/apps/accounts/serializers/set_password.py diff --git a/auth/core/apps/accounts/serializers/user.py b/user/core/apps/accounts/serializers/user.py similarity index 100% rename from auth/core/apps/accounts/serializers/user.py rename to user/core/apps/accounts/serializers/user.py diff --git a/auth/core/apps/accounts/signals/__init__.py b/user/core/apps/accounts/signals/__init__.py similarity index 100% rename from auth/core/apps/accounts/signals/__init__.py rename to user/core/apps/accounts/signals/__init__.py diff --git a/auth/core/apps/accounts/signals/user.py b/user/core/apps/accounts/signals/user.py similarity index 100% rename from auth/core/apps/accounts/signals/user.py rename to user/core/apps/accounts/signals/user.py diff --git a/auth/core/apps/accounts/test/__init__.py b/user/core/apps/accounts/test/__init__.py similarity index 100% rename from auth/core/apps/accounts/test/__init__.py rename to user/core/apps/accounts/test/__init__.py diff --git a/auth/core/apps/accounts/test/test_auth.py b/user/core/apps/accounts/test/test_auth.py similarity index 100% rename from auth/core/apps/accounts/test/test_auth.py rename to user/core/apps/accounts/test/test_auth.py diff --git a/auth/core/apps/accounts/test/test_change_password.py b/user/core/apps/accounts/test/test_change_password.py similarity index 100% rename from auth/core/apps/accounts/test/test_change_password.py rename to user/core/apps/accounts/test/test_change_password.py diff --git a/auth/core/apps/accounts/urls.py b/user/core/apps/accounts/urls.py similarity index 100% rename from auth/core/apps/accounts/urls.py rename to user/core/apps/accounts/urls.py diff --git a/auth/core/apps/accounts/views/__init__.py b/user/core/apps/accounts/views/__init__.py similarity index 100% rename from auth/core/apps/accounts/views/__init__.py rename to user/core/apps/accounts/views/__init__.py diff --git a/auth/core/apps/accounts/views/auth.py b/user/core/apps/accounts/views/auth.py similarity index 100% rename from auth/core/apps/accounts/views/auth.py rename to user/core/apps/accounts/views/auth.py diff --git a/auth/core/apps/logs/.gitignore b/user/core/apps/logs/.gitignore similarity index 100% rename from auth/core/apps/logs/.gitignore rename to user/core/apps/logs/.gitignore diff --git a/auth/core/services/__init__.py b/user/core/services/__init__.py similarity index 100% rename from auth/core/services/__init__.py rename to user/core/services/__init__.py diff --git a/auth/core/services/otp.py b/user/core/services/otp.py similarity index 100% rename from auth/core/services/otp.py rename to user/core/services/otp.py diff --git a/auth/core/services/sms.py b/user/core/services/sms.py similarity index 100% rename from auth/core/services/sms.py rename to user/core/services/sms.py diff --git a/auth/core/services/user.py b/user/core/services/user.py similarity index 100% rename from auth/core/services/user.py rename to user/core/services/user.py diff --git a/auth/core/utils/__init__.py b/user/core/utils/__init__.py similarity index 100% rename from auth/core/utils/__init__.py rename to user/core/utils/__init__.py diff --git a/auth/core/utils/cache.py b/user/core/utils/cache.py similarity index 100% rename from auth/core/utils/cache.py rename to user/core/utils/cache.py diff --git a/auth/core/utils/console.py b/user/core/utils/console.py similarity index 100% rename from auth/core/utils/console.py rename to user/core/utils/console.py diff --git a/auth/core/utils/core.py b/user/core/utils/core.py similarity index 100% rename from auth/core/utils/core.py rename to user/core/utils/core.py diff --git a/auth/core/utils/storage.py b/user/core/utils/storage.py similarity index 100% rename from auth/core/utils/storage.py rename to user/core/utils/storage.py diff --git a/auth/docker-compose.yml b/user/docker-compose.yml similarity index 100% rename from auth/docker-compose.yml rename to user/docker-compose.yml diff --git a/auth/docker/Dockerfile.nginx b/user/docker/Dockerfile.nginx similarity index 100% rename from auth/docker/Dockerfile.nginx rename to user/docker/Dockerfile.nginx diff --git a/auth/docker/Dockerfile.web b/user/docker/Dockerfile.web similarity index 100% rename from auth/docker/Dockerfile.web rename to user/docker/Dockerfile.web diff --git a/auth/jst.json b/user/jst.json similarity index 100% rename from auth/jst.json rename to user/jst.json diff --git a/auth/manage.py b/user/manage.py similarity index 100% rename from auth/manage.py rename to user/manage.py diff --git a/auth/pyproject.toml b/user/pyproject.toml similarity index 100% rename from auth/pyproject.toml rename to user/pyproject.toml diff --git a/auth/requirements.txt b/user/requirements.txt similarity index 100% rename from auth/requirements.txt rename to user/requirements.txt diff --git a/auth/resources/.gitignore b/user/resources/.gitignore similarity index 100% rename from auth/resources/.gitignore rename to user/resources/.gitignore diff --git a/auth/resources/layout/.flake8 b/user/resources/layout/.flake8 similarity index 100% rename from auth/resources/layout/.flake8 rename to user/resources/layout/.flake8 diff --git a/auth/resources/layout/Dockerfile.alpine b/user/resources/layout/Dockerfile.alpine similarity index 100% rename from auth/resources/layout/Dockerfile.alpine rename to user/resources/layout/Dockerfile.alpine diff --git a/auth/resources/layout/Dockerfile.nginx b/user/resources/layout/Dockerfile.nginx similarity index 100% rename from auth/resources/layout/Dockerfile.nginx rename to user/resources/layout/Dockerfile.nginx diff --git a/auth/resources/layout/mypy.ini b/user/resources/layout/mypy.ini similarity index 100% rename from auth/resources/layout/mypy.ini rename to user/resources/layout/mypy.ini diff --git a/auth/resources/layout/nginx.conf b/user/resources/layout/nginx.conf similarity index 93% rename from auth/resources/layout/nginx.conf rename to user/resources/layout/nginx.conf index 12ffb9d..8843dd4 100644 --- a/auth/resources/layout/nginx.conf +++ b/user/resources/layout/nginx.conf @@ -29,14 +29,14 @@ http { server_name _; location / { - proxy_pass http://auth:8000; + proxy_pass http://user:8000; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_set_header Host $http_host; } location /ws/ { - proxy_pass http://auth:8000; # Uvicorn serveri ishga tushadigan port + proxy_pass http://user:8000; # Uvicorn serveri ishga tushadigan port proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/auth/resources/locale/.gitkeep b/user/resources/locale/.gitkeep similarity index 100% rename from auth/resources/locale/.gitkeep rename to user/resources/locale/.gitkeep diff --git a/auth/resources/locale/en/LC_MESSAGES/django.po b/user/resources/locale/en/LC_MESSAGES/django.po similarity index 100% rename from auth/resources/locale/en/LC_MESSAGES/django.po rename to user/resources/locale/en/LC_MESSAGES/django.po diff --git a/auth/resources/locale/ru/LC_MESSAGES/django.po b/user/resources/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from auth/resources/locale/ru/LC_MESSAGES/django.po rename to user/resources/locale/ru/LC_MESSAGES/django.po diff --git a/auth/resources/locale/uz/LC_MESSAGES/django.po b/user/resources/locale/uz/LC_MESSAGES/django.po similarity index 100% rename from auth/resources/locale/uz/LC_MESSAGES/django.po rename to user/resources/locale/uz/LC_MESSAGES/django.po diff --git a/auth/resources/logs/.gitignore b/user/resources/logs/.gitignore similarity index 100% rename from auth/resources/logs/.gitignore rename to user/resources/logs/.gitignore diff --git a/auth/resources/media/.gitignore b/user/resources/media/.gitignore similarity index 100% rename from auth/resources/media/.gitignore rename to user/resources/media/.gitignore diff --git a/auth/resources/scripts/backup.sh b/user/resources/scripts/backup.sh similarity index 100% rename from auth/resources/scripts/backup.sh rename to user/resources/scripts/backup.sh diff --git a/auth/resources/scripts/entrypoint-server.sh b/user/resources/scripts/entrypoint-server.sh similarity index 100% rename from auth/resources/scripts/entrypoint-server.sh rename to user/resources/scripts/entrypoint-server.sh diff --git a/auth/resources/scripts/entrypoint.sh b/user/resources/scripts/entrypoint.sh similarity index 100% rename from auth/resources/scripts/entrypoint.sh rename to user/resources/scripts/entrypoint.sh diff --git a/auth/resources/static/css/app.css b/user/resources/static/css/app.css similarity index 100% rename from auth/resources/static/css/app.css rename to user/resources/static/css/app.css diff --git a/auth/resources/static/css/error.css b/user/resources/static/css/error.css similarity index 100% rename from auth/resources/static/css/error.css rename to user/resources/static/css/error.css diff --git a/auth/resources/static/css/input.css b/user/resources/static/css/input.css similarity index 100% rename from auth/resources/static/css/input.css rename to user/resources/static/css/input.css diff --git a/auth/resources/static/css/jazzmin.css b/user/resources/static/css/jazzmin.css similarity index 100% rename from auth/resources/static/css/jazzmin.css rename to user/resources/static/css/jazzmin.css diff --git a/auth/resources/static/css/output.css b/user/resources/static/css/output.css similarity index 100% rename from auth/resources/static/css/output.css rename to user/resources/static/css/output.css diff --git a/auth/resources/static/images/logo.png b/user/resources/static/images/logo.png similarity index 100% rename from auth/resources/static/images/logo.png rename to user/resources/static/images/logo.png diff --git a/auth/resources/static/js/alpine.js b/user/resources/static/js/alpine.js similarity index 100% rename from auth/resources/static/js/alpine.js rename to user/resources/static/js/alpine.js diff --git a/auth/resources/static/js/app.js b/user/resources/static/js/app.js similarity index 100% rename from auth/resources/static/js/app.js rename to user/resources/static/js/app.js diff --git a/auth/resources/static/js/counter.js b/user/resources/static/js/counter.js similarity index 100% rename from auth/resources/static/js/counter.js rename to user/resources/static/js/counter.js diff --git a/auth/resources/static/js/customer.js b/user/resources/static/js/customer.js similarity index 100% rename from auth/resources/static/js/customer.js rename to user/resources/static/js/customer.js diff --git a/auth/resources/static/js/vite-refresh.js b/user/resources/static/js/vite-refresh.js similarity index 100% rename from auth/resources/static/js/vite-refresh.js rename to user/resources/static/js/vite-refresh.js diff --git a/auth/resources/static/vite/assets/appCss-w40geAFS.js b/user/resources/static/vite/assets/appCss-w40geAFS.js similarity index 100% rename from auth/resources/static/vite/assets/appCss-w40geAFS.js rename to user/resources/static/vite/assets/appCss-w40geAFS.js diff --git a/auth/resources/static/vite/assets/appJs-YH6iAcjX.js b/user/resources/static/vite/assets/appJs-YH6iAcjX.js similarity index 100% rename from auth/resources/static/vite/assets/appJs-YH6iAcjX.js rename to user/resources/static/vite/assets/appJs-YH6iAcjX.js diff --git a/auth/resources/static/vite/assets/outCss-r8J2MRAR.css b/user/resources/static/vite/assets/outCss-r8J2MRAR.css similarity index 100% rename from auth/resources/static/vite/assets/outCss-r8J2MRAR.css rename to user/resources/static/vite/assets/outCss-r8J2MRAR.css diff --git a/auth/resources/static/vite/manifest.json b/user/resources/static/vite/manifest.json similarity index 100% rename from auth/resources/static/vite/manifest.json rename to user/resources/static/vite/manifest.json diff --git a/auth/resources/templates/400.html b/user/resources/templates/400.html similarity index 100% rename from auth/resources/templates/400.html rename to user/resources/templates/400.html diff --git a/auth/resources/templates/401.html b/user/resources/templates/401.html similarity index 100% rename from auth/resources/templates/401.html rename to user/resources/templates/401.html diff --git a/auth/resources/templates/403.html b/user/resources/templates/403.html similarity index 100% rename from auth/resources/templates/403.html rename to user/resources/templates/403.html diff --git a/auth/resources/templates/404.html b/user/resources/templates/404.html similarity index 100% rename from auth/resources/templates/404.html rename to user/resources/templates/404.html diff --git a/auth/resources/templates/405.html b/user/resources/templates/405.html similarity index 100% rename from auth/resources/templates/405.html rename to user/resources/templates/405.html diff --git a/auth/resources/templates/408.html b/user/resources/templates/408.html similarity index 100% rename from auth/resources/templates/408.html rename to user/resources/templates/408.html diff --git a/auth/resources/templates/500.html b/user/resources/templates/500.html similarity index 100% rename from auth/resources/templates/500.html rename to user/resources/templates/500.html diff --git a/auth/resources/templates/502.html b/user/resources/templates/502.html similarity index 100% rename from auth/resources/templates/502.html rename to user/resources/templates/502.html diff --git a/auth/resources/templates/503.html b/user/resources/templates/503.html similarity index 100% rename from auth/resources/templates/503.html rename to user/resources/templates/503.html diff --git a/auth/resources/templates/504.html b/user/resources/templates/504.html similarity index 100% rename from auth/resources/templates/504.html rename to user/resources/templates/504.html diff --git a/auth/resources/templates/admin/index.html b/user/resources/templates/admin/index.html similarity index 100% rename from auth/resources/templates/admin/index.html rename to user/resources/templates/admin/index.html diff --git a/auth/resources/templates/registration/login.html b/user/resources/templates/registration/login.html similarity index 100% rename from auth/resources/templates/registration/login.html rename to user/resources/templates/registration/login.html diff --git a/auth/resources/templates/user/home.html b/user/resources/templates/user/home.html similarity index 100% rename from auth/resources/templates/user/home.html rename to user/resources/templates/user/home.html