From 235d2f69573db5bd794505296a61ee6a8d64b2b9 Mon Sep 17 00:00:00 2001 From: VladislavOstapov Date: Sat, 30 Dec 2023 14:45:29 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 ++ index/__init__.py | 0 index/admin.py | 3 + index/apps.py | 6 ++ index/migrations/__init__.py | 0 index/models.py | 3 + index/tests.py | 3 + index/views.py | 3 + manage.py | 22 ++++++ ospaz-site.iml | 13 ++++ ospaz_site/__init__.py | 0 ospaz_site/asgi.py | 16 ++++ ospaz_site/settings.py | 142 +++++++++++++++++++++++++++++++++++ ospaz_site/urls.py | 22 ++++++ ospaz_site/wsgi.py | 16 ++++ requirements.txt | 4 + users/__init__.py | 0 users/admin.py | 3 + users/apps.py | 6 ++ users/managers.py | 33 ++++++++ users/migrations/__init__.py | 0 users/models.py | 22 ++++++ 22 files changed, 323 insertions(+) create mode 100644 .gitignore create mode 100644 index/__init__.py create mode 100644 index/admin.py create mode 100644 index/apps.py create mode 100644 index/migrations/__init__.py create mode 100644 index/models.py create mode 100644 index/tests.py create mode 100644 index/views.py create mode 100644 manage.py create mode 100644 ospaz-site.iml create mode 100644 ospaz_site/__init__.py create mode 100644 ospaz_site/asgi.py create mode 100644 ospaz_site/settings.py create mode 100644 ospaz_site/urls.py create mode 100644 ospaz_site/wsgi.py create mode 100644 requirements.txt create mode 100644 users/__init__.py create mode 100644 users/admin.py create mode 100644 users/apps.py create mode 100644 users/managers.py create mode 100644 users/migrations/__init__.py create mode 100644 users/models.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfe06e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.idea/ +venv/ +.env +*.iml +index/migrations/ +users/migrations/ diff --git a/index/__init__.py b/index/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/index/admin.py b/index/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/index/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/index/apps.py b/index/apps.py new file mode 100644 index 0000000..ce71d20 --- /dev/null +++ b/index/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class IndexConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'index' diff --git a/index/migrations/__init__.py b/index/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/index/models.py b/index/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/index/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/index/tests.py b/index/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/index/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/index/views.py b/index/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/index/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..cc0d105 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/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', 'ospaz_site.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/ospaz-site.iml b/ospaz-site.iml new file mode 100644 index 0000000..d6cf261 --- /dev/null +++ b/ospaz-site.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/ospaz_site/__init__.py b/ospaz_site/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ospaz_site/asgi.py b/ospaz_site/asgi.py new file mode 100644 index 0000000..c5054c0 --- /dev/null +++ b/ospaz_site/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for ospaz_site project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ospaz_site.settings') + +application = get_asgi_application() diff --git a/ospaz_site/settings.py b/ospaz_site/settings.py new file mode 100644 index 0000000..56bf949 --- /dev/null +++ b/ospaz_site/settings.py @@ -0,0 +1,142 @@ +""" +Django settings for ospaz_site project. + +Generated by 'django-admin startproject' using Django 5.0. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/5.0/ref/settings/ +""" + +from pathlib import Path +import os +import dotenv +from django.db.backends.postgresql.psycopg_any import IsolationLevel + + +dotenv.load_dotenv() + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent +PROJECT_ROOT = os.path.dirname(__file__) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-_5hkdwg1(1b)z#^wi#edgm=ustw5-g1qd346@pdm4eexlhxc&4' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = ['localhost'] +# CSRF_TRUSTED_ORIGINS = ['https://ospaz.wawaa.ru'] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + + # custom apps + 'users.apps.UsersConfig', + 'index.apps.IndexConfig' +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'ospaz_site.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'ospaz_site.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/5.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': os.getenv('DB_NAME'), + 'USER': os.getenv('DB_USERNAME'), + 'PASSWORD': os.getenv('DB_PASSWORD'), + 'HOST': os.getenv('DB_HOST', 'localhost'), + 'PORT': os.getenv('DB_PORT', ''), + }, + "OPTIONS": { + "isolation_level": IsolationLevel.SERIALIZABLE, + }, +} + + +# Password validation +# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/5.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/5.0/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/ospaz_site/urls.py b/ospaz_site/urls.py new file mode 100644 index 0000000..15dda00 --- /dev/null +++ b/ospaz_site/urls.py @@ -0,0 +1,22 @@ +""" +URL configuration for ospaz_site project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/5.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/ospaz_site/wsgi.py b/ospaz_site/wsgi.py new file mode 100644 index 0000000..aef70ae --- /dev/null +++ b/ospaz_site/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for ospaz_site project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ospaz_site.settings') + +application = get_wsgi_application() diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..8d9e82b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +django +psycopg-binary +requests +python-dotenv diff --git a/users/__init__.py b/users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/admin.py b/users/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/users/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/users/apps.py b/users/apps.py new file mode 100644 index 0000000..72b1401 --- /dev/null +++ b/users/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class UsersConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'users' diff --git a/users/managers.py b/users/managers.py new file mode 100644 index 0000000..9b732e2 --- /dev/null +++ b/users/managers.py @@ -0,0 +1,33 @@ +from django.contrib.auth.base_user import BaseUserManager +from django.utils.translation import gettext_lazy as _ + + +class CustomUserManager(BaseUserManager): + """ + Custom user model manager where email is the unique identifiers + for authentication instead of usernames. + """ + def create_user(self, login, password, **extra_fields): + """ + Create and save a user with the given email and password. + """ + if not login: + raise ValueError(_("The login must be set")) + user = self.model(login=login, **extra_fields) + user.set_password(password) + user.save() + return user + + def create_superuser(self, email, password, **extra_fields): + """ + Create and save a SuperUser with the given email and password. + """ + extra_fields.setdefault("is_staff", True) + extra_fields.setdefault("is_superuser", True) + extra_fields.setdefault("is_active", True) + + if extra_fields.get("is_staff") is not True: + raise ValueError(_("Superuser must have is_staff=True.")) + if extra_fields.get("is_superuser") is not True: + raise ValueError(_("Superuser must have is_superuser=True.")) + return self.create_user(email, password, **extra_fields) \ No newline at end of file diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/models.py b/users/models.py new file mode 100644 index 0000000..76f653b --- /dev/null +++ b/users/models.py @@ -0,0 +1,22 @@ +from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin +from django.db import models +from django.utils import timezone +from django.utils.translation import gettext_lazy as _ + +from .managers import CustomUserManager + + +class CustomUser(AbstractBaseUser, PermissionsMixin): + login = models.CharField(16, unique=True) + is_staff = models.BooleanField(default=False) + is_active = models.BooleanField(default=True) + date_joined = models.DateTimeField(default=timezone.now) + + USERNAME_FIELD = "login" + REQUIRED_FIELDS = [] + + objects = CustomUserManager() + + def __str__(self): + return self.login +