Commit d57454c4 authored by lizonr1's avatar lizonr1

make config folder

add two type of configs
parent 00bcb4ab
from KawowyDzienniczek.settings import *
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
......@@ -22,7 +22,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = '*iv-79ur9r9lc3-%+^t52qw(!w@nbqy^t(-ksfj8+2pi&b190-'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
DEBUG = False
ALLOWED_HOSTS = []
......@@ -38,6 +38,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'crispy_forms',
'rest_framework',
'rest_framework_swagger',
'rest_framework.authtoken',
'App.user',
'App.page',
......@@ -67,7 +68,7 @@ MIDDLEWARE_CLASSES = [
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'KawowyDzienniczek.urls'
ROOT_URLCONF = 'config.urls'
TEMPLATES = [
{
......@@ -85,19 +86,7 @@ TEMPLATES = [
},
]
WSGI_APPLICATION = 'KawowyDzienniczek.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
WSGI_APPLICATION = 'config.wsgi.application'
# Password validation
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
......@@ -150,3 +139,17 @@ STATIC_ROOT = os.path.join(PROJECT_DIR, 'static')
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
APPEND_SLASH = True
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'kawowydzienniczek',
'USER': 'kawowydzienniczek',
'PASSWORD': 'kawowydzienniczek7913',
'HOST': '127.0.0.1',
'PORT': '5432',
}
}
LOGIN_URL = 'rest_framework:login'
LOGOUT_URL = 'rest_framework:logout'
\ No newline at end of file
from KawowyDzienniczek.settings import *
from config.settings.base import *
DATABASES = {
'default': {
......@@ -10,3 +10,5 @@ DATABASES = {
'PORT': '5432',
}
}
DEBUG = True
\ No newline at end of file
from config.settings.base import *
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'kawowydzienniczek',
'USER': 'kawowydzienniczek',
'PASSWORD': 'kawowydzienniczek7913',
'HOST': '127.0.0.1',
'PORT': '5432',
}
}
ALLOWED_HOSTS = ['localhost', '127.0.0.1', '192.166.219.49', 'kawowydzienniczek.pl']
\ No newline at end of file
......@@ -20,11 +20,13 @@ from rest_framework import routers
from App.loyaltyMe import views as loyalty_views
from App.page.views import coming_soon_page, main_page
from App.user import views as user_views
from App.user.views import schema_view
router = routers.DefaultRouter()
router.register(r'user', user_views.UserViewSet)
router.register(r'user_profile', user_views.UserProfileViewSet)
router.register(r'user_promotions', user_views.UserPromotionViewSet)
router.register(r'user_tasks', user_views.UserTaskViewSet)
router.register(r'products', loyalty_views.ProductViewSet)
router.register(r'offers', loyalty_views.OfferViewSet)
router.register(r'promotions', loyalty_views.PromotionViewSet)
......@@ -32,13 +34,14 @@ router.register(r'promotion_set', loyalty_views.PromotionSetViewSet)
router.register(r'places', loyalty_views.PlaceViewSet)
router.register(r'localizations', loyalty_views.LocalizationViewSet)
router.register(r'beacons', loyalty_views.BeaconViewSet)
router.register(r'tasks', loyalty_views.TaskViewSet)
urlpatterns = [
url(r'^api/', include(router.urls)),
url(r'^admin/', admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^api-token-auth/', user_views.obtain_auth_token),
url(r'^admin/', include(admin.site.urls)),
url(r'^$', coming_soon_page, name='post_list'),
url(r'^main/$', main_page, name='post_list'),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^api-token-auth/', user_views.obtain_auth_token),
url(r'^docs/', schema_view),
]
......@@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "KawowyDzienniczek.production_settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.production_settings")
application = get_wsgi_application()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment