diff --git a/.idea/.gitignore b/.idea/.gitignore index 0e40fe8..3889a9e 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,6 @@ # Default ignored files -/workspace.xml \ No newline at end of file +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..6f4d229 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,19 @@ + + + + + sqlite.xerial + true + org.sqlite.JDBC + jdbc:sqlite:$PROJECT_DIR$/news1/db.sqlite3 + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/sqlite-jdbc-3.25.1.jar + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/license.txt + + + + + \ No newline at end of file diff --git a/news/.idea/misc.xml b/news/.idea/misc.xml deleted file mode 100644 index 5d3ef37..0000000 --- a/news/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/news/.idea/modules.xml b/news/.idea/modules.xml deleted file mode 100644 index 7de6e45..0000000 --- a/news/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/news/.idea/news.iml b/news/.idea/news.iml deleted file mode 100644 index e1cd0d3..0000000 --- a/news/.idea/news.iml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/news/.idea/vcs.xml b/news/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/news/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/news/db.sqlite3 b/news/db.sqlite3 deleted file mode 100644 index e69de29..0000000 diff --git a/news/manage.py b/news/manage.py deleted file mode 100755 index d1449d8..0000000 --- a/news/manage.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -"""Django's command-line utility for administrative tasks.""" -import os -import sys - - -def main(): - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'news.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/news/news/__init__.py b/news/news/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/news/news/settings.py b/news/news/settings.py deleted file mode 100644 index bd43bdb..0000000 --- a/news/news/settings.py +++ /dev/null @@ -1,122 +0,0 @@ -""" -Django settings for news project. - -Generated by 'django-admin startproject' using Django 2.2.7. - -For more information on this file, see -https://docs.djangoproject.com/en/2.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/2.2/ref/settings/ -""" - -import os - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '66i7ptye_$kfmxdxa%x+2vf9us^&0dxrc$=f9vhj6*w+@-%+hy' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'posts' -] - -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 = 'news.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates')] - , - '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 = 'news.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - - -# Password validation -# https://docs.djangoproject.com/en/2.2/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/2.2/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/2.2/howto/static-files/ - -STATIC_URL = '/static/' diff --git a/news/news/urls.py b/news/news/urls.py deleted file mode 100644 index 496a460..0000000 --- a/news/news/urls.py +++ /dev/null @@ -1,22 +0,0 @@ -"""news URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/2.2/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, include - -urlpatterns = [ - path('admin/', admin.site.urls), - path('posts', include('posts.urls')) -] diff --git a/news/news/wsgi.py b/news/news/wsgi.py deleted file mode 100644 index d21dc37..0000000 --- a/news/news/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for news 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/2.2/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'news.settings') - -application = get_wsgi_application() diff --git a/news1/.idea/.gitignore b/news1/.idea/.gitignore index 0e40fe8..d262f13 100644 --- a/news1/.idea/.gitignore +++ b/news1/.idea/.gitignore @@ -1,3 +1,7 @@ # Default ignored files -/workspace.xml \ No newline at end of file +/workspace.xml +# Datasource local storage ignored files +/dataSources.local.xml +# Datasource local storage ignored files +/dataSources/ \ No newline at end of file diff --git a/news1/db.sqlite3 b/news1/db.sqlite3 index e69de29..59e8b14 100644 Binary files a/news1/db.sqlite3 and b/news1/db.sqlite3 differ diff --git a/news1/news1/urls.py b/news1/news1/urls.py index 15f8730..db2fda5 100644 --- a/news1/news1/urls.py +++ b/news1/news1/urls.py @@ -15,10 +15,9 @@ Including another URLconf """ from django.contrib import admin -from django.urls import path, include +from django.urls import path, -urlpatterns = [ - path('', include('posts.urls')), - path('posts/', include('posts.urls')), - path('admin/', admin.site.urls), + urlpatterns = [ + path('posts/', include('posts.urls')), + path('admin/', admin.site.urls), ] \ No newline at end of file