diff --git a/djangosite/__pycache__/__init__.cpython-39.pyc b/djangosite/__pycache__/__init__.cpython-39.pyc index 6e270bf..17c8fbb 100644 Binary files a/djangosite/__pycache__/__init__.cpython-39.pyc and b/djangosite/__pycache__/__init__.cpython-39.pyc differ diff --git a/djangosite/__pycache__/settings.cpython-39.pyc b/djangosite/__pycache__/settings.cpython-39.pyc index d7f7cc9..1bc1b95 100644 Binary files a/djangosite/__pycache__/settings.cpython-39.pyc and b/djangosite/__pycache__/settings.cpython-39.pyc differ diff --git a/djangosite/__pycache__/urls.cpython-39.pyc b/djangosite/__pycache__/urls.cpython-39.pyc index d81f15a..889fa87 100644 Binary files a/djangosite/__pycache__/urls.cpython-39.pyc and b/djangosite/__pycache__/urls.cpython-39.pyc differ diff --git a/djangosite/__pycache__/wsgi.cpython-39.pyc b/djangosite/__pycache__/wsgi.cpython-39.pyc index 516da60..701ae19 100644 Binary files a/djangosite/__pycache__/wsgi.cpython-39.pyc and b/djangosite/__pycache__/wsgi.cpython-39.pyc differ diff --git a/djangosite/apps/articles/__pycache__/__init__.cpython-39.pyc b/djangosite/apps/articles/__pycache__/__init__.cpython-39.pyc deleted file mode 100644 index 84f997b..0000000 Binary files a/djangosite/apps/articles/__pycache__/__init__.cpython-39.pyc and /dev/null differ diff --git a/djangosite/apps/articles/__pycache__/urls.cpython-39.pyc b/djangosite/apps/articles/__pycache__/urls.cpython-39.pyc deleted file mode 100644 index 872e948..0000000 Binary files a/djangosite/apps/articles/__pycache__/urls.cpython-39.pyc and /dev/null differ diff --git a/djangosite/apps/articles/__pycache__/views.cpython-39.pyc b/djangosite/apps/articles/__pycache__/views.cpython-39.pyc deleted file mode 100644 index 355b704..0000000 Binary files a/djangosite/apps/articles/__pycache__/views.cpython-39.pyc and /dev/null differ diff --git a/djangosite/apps/articles/urls.py b/djangosite/apps/articles/urls.py deleted file mode 100644 index 1ff84f7..0000000 --- a/djangosite/apps/articles/urls.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.urls import path -from . import views - -urlpatterns = [ - path('', views.index, name='index') -] diff --git a/djangosite/apps/articles/views.py b/djangosite/apps/articles/views.py deleted file mode 100644 index fdf9997..0000000 --- a/djangosite/apps/articles/views.py +++ /dev/null @@ -1,4 +0,0 @@ -from django.http import HttpResponse - -def index(request): - return HttpResponse('

Hello world!

') \ No newline at end of file diff --git a/djangosite/settings.py b/djangosite/settings.py index 3efbbbb..112616d 100644 --- a/djangosite/settings.py +++ b/djangosite/settings.py @@ -11,18 +11,16 @@ https://docs.djangoproject.com/en/4.1/ref/settings/ """ from pathlib import Path -import os, sys + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent -PROJECT_ROOT = os.path.dirname(__file__) -sys.path.insert(0, os.path.join(PROJECT_ROOT, 'apps')) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-&35w=2x@*pa4ck7jq9)38f-a*=tz=w(fu*=&z3u3mxy@q%eo@r' +SECRET_KEY = 'django-insecure-e5_t(3qi0zd$42t*akukbr5^*@#znl-x-xxej94!*!!9g%0nwj' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -33,6 +31,7 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ + 'main', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -77,6 +76,14 @@ WSGI_APPLICATION = 'djangosite.wsgi.application' DATABASES = { 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'django', + 'USER': 'dhaverd', + 'PASSWORD': 'Dha.Verd506763', + 'HOST': '192.168.0.105', + 'PORT': 3306, + }, + 'workout': { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'workout', 'USER': 'dhaverd', diff --git a/djangosite/urls.py b/djangosite/urls.py index 730281d..1bbe5c1 100644 --- a/djangosite/urls.py +++ b/djangosite/urls.py @@ -17,6 +17,6 @@ from django.contrib import admin from django.urls import path, include urlpatterns = [ - path('articles/', include('articles.urls')), path('admin/', admin.site.urls), + path('', include('main.urls')) ] diff --git a/djangosite/apps/articles/__init__.py b/main/__init__.py similarity index 100% rename from djangosite/apps/articles/__init__.py rename to main/__init__.py diff --git a/main/__pycache__/__init__.cpython-39.pyc b/main/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..761fc1d Binary files /dev/null and b/main/__pycache__/__init__.cpython-39.pyc differ diff --git a/main/__pycache__/admin.cpython-39.pyc b/main/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..67cfaa6 Binary files /dev/null and b/main/__pycache__/admin.cpython-39.pyc differ diff --git a/main/__pycache__/apps.cpython-39.pyc b/main/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..86be2a0 Binary files /dev/null and b/main/__pycache__/apps.cpython-39.pyc differ diff --git a/main/__pycache__/models.cpython-39.pyc b/main/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..0e23880 Binary files /dev/null and b/main/__pycache__/models.cpython-39.pyc differ diff --git a/main/__pycache__/urls.cpython-39.pyc b/main/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..aa96b34 Binary files /dev/null and b/main/__pycache__/urls.cpython-39.pyc differ diff --git a/main/__pycache__/views.cpython-39.pyc b/main/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..ad49354 Binary files /dev/null and b/main/__pycache__/views.cpython-39.pyc differ diff --git a/djangosite/apps/articles/admin.py b/main/admin.py similarity index 100% rename from djangosite/apps/articles/admin.py rename to main/admin.py diff --git a/djangosite/apps/articles/apps.py b/main/apps.py similarity index 60% rename from djangosite/apps/articles/apps.py rename to main/apps.py index 2add477..7862302 100644 --- a/djangosite/apps/articles/apps.py +++ b/main/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class ArticlesConfig(AppConfig): +class MainConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'articles' + name = 'main' diff --git a/djangosite/apps/articles/migrations/__init__.py b/main/migrations/__init__.py similarity index 100% rename from djangosite/apps/articles/migrations/__init__.py rename to main/migrations/__init__.py diff --git a/main/migrations/__pycache__/__init__.cpython-39.pyc b/main/migrations/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..7251e9a Binary files /dev/null and b/main/migrations/__pycache__/__init__.cpython-39.pyc differ diff --git a/djangosite/apps/articles/models.py b/main/models.py similarity index 100% rename from djangosite/apps/articles/models.py rename to main/models.py diff --git a/djangosite/apps/articles/tests.py b/main/tests.py similarity index 100% rename from djangosite/apps/articles/tests.py rename to main/tests.py diff --git a/main/urls.py b/main/urls.py new file mode 100644 index 0000000..8d9d70f --- /dev/null +++ b/main/urls.py @@ -0,0 +1,9 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path('', views.index), + path('servers', views.servers), + path('mychat', views.mychat), + path('workout', views.workout) +] \ No newline at end of file diff --git a/main/views.py b/main/views.py new file mode 100644 index 0000000..470db45 --- /dev/null +++ b/main/views.py @@ -0,0 +1,19 @@ +from django.shortcuts import render +from django.http import HttpResponse + + +# Create your views here. +def index(request): + return HttpResponse('Сервера') + + +def servers(request): + return HttpResponse('server list') + + +def mychat(request): + return HttpResponse('mychat info') + + +def workout(request): + return HttpResponse('workout task list')