Improve search and add production settings file
This commit is contained in:
parent
ef631acd6b
commit
dc7d4b3005
@ -163,7 +163,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
|
|||||||
|
|
||||||
search = search.strip()
|
search = search.strip()
|
||||||
|
|
||||||
qs = qs.filter(Q(name__contains = search))
|
qs = qs.filter(Q(name__icontains = search))
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
@ -216,7 +216,7 @@ class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
|
|||||||
|
|
||||||
search = search.strip()
|
search = search.strip()
|
||||||
|
|
||||||
qs = qs.filter(Q(name__contains = search) | Q(website__contains = search))
|
qs = qs.filter(Q(name__icontains = search) | Q(website__icontains = search))
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
@ -349,9 +349,9 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
|
|||||||
if test_uuid is not None:
|
if test_uuid is not None:
|
||||||
stocks_in_storage = stocks_in_storage.filter(Q(component__id = test_uuid) | Q(id= test_uuid))
|
stocks_in_storage = stocks_in_storage.filter(Q(component__id = test_uuid) | Q(id= test_uuid))
|
||||||
else:
|
else:
|
||||||
stocks_in_storage = stocks_in_storage.filter(Q(component__name__contains = search) |
|
stocks_in_storage = stocks_in_storage.filter(Q(component__name__icontains = search) |
|
||||||
Q(component__package__name__contains = search) |
|
Q(component__package__name__icontains = search) |
|
||||||
Q(component__manufacturer__name__contains = search))
|
Q(component__manufacturer__name__icontains = search))
|
||||||
|
|
||||||
return stocks_in_storage
|
return stocks_in_storage
|
||||||
|
|
||||||
@ -743,7 +743,7 @@ class ManufacturersViewSet(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
|
|||||||
|
|
||||||
search = search.strip()
|
search = search.strip()
|
||||||
|
|
||||||
qs = qs.filter(Q(name__contains = search) | Q(website__contains = search))
|
qs = qs.filter(Q(name__icontains = search) | Q(website__icontains = search))
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
|
214
shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py
Normal file
214
shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py
Normal file
@ -0,0 +1,214 @@
|
|||||||
|
"""
|
||||||
|
Django settings for shimatta_kenkyusho project.
|
||||||
|
|
||||||
|
Generated by 'django-admin startproject' using Django 3.2.5.
|
||||||
|
|
||||||
|
For more information on this file, see
|
||||||
|
https://docs.djangoproject.com/en/3.2/topics/settings/
|
||||||
|
|
||||||
|
For the full list of settings and their values, see
|
||||||
|
https://docs.djangoproject.com/en/3.2/ref/settings/
|
||||||
|
|
||||||
|
The following environment variables have to be set:
|
||||||
|
- DJANGO_SECRET_KEY
|
||||||
|
- DJANGO_ALLOWED_HOST
|
||||||
|
- DJANGO_STATIC_ROOT
|
||||||
|
- DJANGO_MEDIA_URL
|
||||||
|
- DJANGO_MEDIA_ROOT
|
||||||
|
- DJANGO_POSTGRESQL_SOCKET
|
||||||
|
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||||
|
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
|
def get_env_value(env_variable):
|
||||||
|
try:
|
||||||
|
return os.environ[env_variable]
|
||||||
|
except KeyError:
|
||||||
|
error_msg = 'Set the {} environment variable'.format(env_variable)
|
||||||
|
raise Exception(error_msg)
|
||||||
|
|
||||||
|
|
||||||
|
# Quick-start development settings - unsuitable for production
|
||||||
|
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
|
||||||
|
|
||||||
|
# SECURITY WARNING: keep the secret key used in production secret!
|
||||||
|
SECRET_KEY = get_env_value('DJANGO_SECRET_KEY')
|
||||||
|
|
||||||
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
|
DEBUG = False
|
||||||
|
|
||||||
|
ALLOWED_HOSTS = ['localhost', get_env_value('DJANGO_ALLOWED_HOST')]
|
||||||
|
|
||||||
|
|
||||||
|
# Application definition
|
||||||
|
|
||||||
|
INSTALLED_APPS = [
|
||||||
|
'django.contrib.admin',
|
||||||
|
'django.contrib.auth',
|
||||||
|
'django.contrib.contenttypes',
|
||||||
|
'django.contrib.sessions',
|
||||||
|
'django.contrib.messages',
|
||||||
|
'django.contrib.staticfiles',
|
||||||
|
'parts.apps.PartsConfig',
|
||||||
|
'qr_code',
|
||||||
|
'rest_framework',
|
||||||
|
'crispy_forms',
|
||||||
|
'crispy_bootstrap5',
|
||||||
|
]
|
||||||
|
|
||||||
|
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 = 'shimatta_kenkyusho.urls'
|
||||||
|
|
||||||
|
CACHES = {
|
||||||
|
'default': {
|
||||||
|
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
|
||||||
|
},
|
||||||
|
'qr-code': {
|
||||||
|
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
|
||||||
|
'LOCATION': 'qr-code-cache',
|
||||||
|
'TIMEOUT': 3600
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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 = 'shimatta_kenkyusho.wsgi.application'
|
||||||
|
|
||||||
|
|
||||||
|
# Database
|
||||||
|
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
|
||||||
|
|
||||||
|
db_pw = ''
|
||||||
|
try:
|
||||||
|
db_pw = get_env_value('DJANGO_POSTGRESQL_PW')
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
db_user = ''
|
||||||
|
try:
|
||||||
|
db_user = get_env_value('DJANGO_POSTGRESQL_USER')
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
DATABASES = {
|
||||||
|
'default': {
|
||||||
|
'ENGINE': 'django.db.backends.postgresql',
|
||||||
|
'NAME': 'shimatta_kenkyusho',
|
||||||
|
'USER': db_user,
|
||||||
|
'PASSWORD': db_pw,
|
||||||
|
'HOST': get_env_value('DJANGO_POSTGRESQL_SOCKET'),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Password validation
|
||||||
|
# https://docs.djangoproject.com/en/3.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',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
REST_FRAMEWORK = {
|
||||||
|
'DEFAULT_AUTHENTICATION_CLASSES': [
|
||||||
|
'rest_framework.authentication.BasicAuthentication',
|
||||||
|
'rest_framework.authentication.SessionAuthentication',
|
||||||
|
'api.ExpiringAuthToken.ExpiringTokenAuthentication',
|
||||||
|
],
|
||||||
|
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
|
||||||
|
'PAGE_SIZE': 10,
|
||||||
|
'DEFAULT_THROTTLE_CLASSES': [
|
||||||
|
'rest_framework.throttling.AnonRateThrottle',
|
||||||
|
'rest_framework.throttling.UserRateThrottle'
|
||||||
|
],
|
||||||
|
'DEFAULT_THROTTLE_RATES': {
|
||||||
|
'anon': '100/hour',
|
||||||
|
'user': '2000/hour'
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
REST_FRAMEWORK_TOKEN_EXPIRE_HOURS = 4
|
||||||
|
|
||||||
|
|
||||||
|
# Internationalization
|
||||||
|
# https://docs.djangoproject.com/en/3.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/3.2/howto/static-files/
|
||||||
|
|
||||||
|
STATIC_URL = '/static/'
|
||||||
|
|
||||||
|
STATICFILES_DIRS = [
|
||||||
|
os.path.join(BASE_DIR, "static"),
|
||||||
|
]
|
||||||
|
|
||||||
|
STATIC_ROOT = get_env_value('DJANGO_STATIC_ROOT')
|
||||||
|
|
||||||
|
# Default primary key field type
|
||||||
|
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
|
||||||
|
|
||||||
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
MEDIA_URL = get_env_value('DJANGO_MEDIA_URL')
|
||||||
|
MEDIA_ROOT = get_env_value('DJANGO_MEDIA_ROOT')
|
||||||
|
|
||||||
|
LOGIN_URL = '/login'
|
||||||
|
LOGIN_REDIRECT_URL = '/'
|
||||||
|
|
||||||
|
|
||||||
|
SHIMATTA_KENKYUSHO_TITLE = 'しまった・研究所'
|
||||||
|
|
||||||
|
CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
|
||||||
|
|
||||||
|
CRISPY_TEMPLATE_PACK = "bootstrap5"
|
Loading…
Reference in New Issue
Block a user