質問編集履歴

追加

2020/11/24 01:40

投稿

yamatar

スコア4

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -58,7 +58,7 @@
 """
-Django settings for geodj project.
+Django settings for deploy project.
@@ -88,7 +88,7 @@
 ###admin画面の表示設定
-admin.AdminSite.site_title  = 'ログイン'
+admin.AdminSite.site_title  = 'ログインページ'
 admin.AdminSite.site_header = '管 理 画 面'
@@ -104,41 +104,7 @@
-#####windows用　gdal設定
-if os.name == 'nt':
+## osgeo4wはlocal_settings.pyに移動 ##
-    import platform
-    POSTGRES = r"C:\Program Files\PostgreSQL\9.6"
-    OSGEO4W = r"C:\OSGeo4W"
-    if '64' in platform.architecture()[0]:
-        OSGEO4W += "64"
-    assert os.path.isdir(OSGEO4W), "Directory does not exist: " + OSGEO4W
-    os.environ['OSGEO4W_ROOT'] = OSGEO4W
-    os.environ['POSTGRES_ROOT'] = POSTGRES
-    os.environ['GDAL_LIBRARY_PATH'] = OSGEO4W + r"\bin"
-    os.environ['GEOS_LIBRARY_PATH'] = OSGEO4W + r"\bin"
-    os.environ['GDAL_DATA'] = OSGEO4W + r"\share\gdal"
-    os.environ['PROJ_LIB'] = OSGEO4W + r"\share\proj"
-    os.environ['PATH'] = OSGEO4W + r"\bin;" + POSTGRES + r"\bin;" + os.environ['PATH']
-#####
@@ -158,7 +124,7 @@
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '118#9w_tjpu^(3kq1#2f356&%t-h6&^o$ugxlqt^br^2ei_3j('
+SECRET_KEY = '8@x_612*9gnu=f)es2)_y8%h(h_=fjgajn1t644dj#v*oh8hd2'
@@ -170,7 +136,7 @@
 ALLOWED_HOSTS = [
-    "アプリ名.herokuapp.com"
+    "アプリ名"
 ]
@@ -178,11 +144,59 @@
+# Application definition
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.templatetags.static',
+    'django.contrib.gis',
+    'django_cleanup.apps.CleanupConfig',  # django-cleanup
+    'map.apps.MapConfig',
+    'deploy',
+    'leaflet',
+    'six',
+    'django_filters',
+    'rest_framework',
+    'rest_framework_gis',
+    'markdown',
+    'PIL',
+    'PIL.ExifTags',
+]
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
-    'whitenoise.middleware.WhiteNoiseMiddleware',#heroku追加
+    'whitenoise.middleware.WhiteNoiseMiddleware',  # heroku追加
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -200,7 +214,7 @@
-ROOT_URLCONF = 'geodj.urls'
+ROOT_URLCONF = 'deploy.urls'
@@ -236,7 +250,7 @@
-WSGI_APPLICATION = 'geodj.wsgi.application'
+WSGI_APPLICATION = 'deploy.wsgi.application'
@@ -246,7 +260,7 @@
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
+"""
 DATABASES = {
@@ -254,7 +268,7 @@
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'NAME': 'geodjangodb2',
+        'NAME': 'geodjangodb3',
         'USER': 'geo_admin',
@@ -264,325 +278,429 @@
         'PORT':'5432',#heroku
+    }
+}
+"""
+# Password validation
+# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
     },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-}
+    },
-INSTALLED_APPS = [
+    {
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.templatetags.static',
-    'django.contrib.gis',
-    'django_cleanup.apps.CleanupConfig',  # django-cleanup
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    'map.apps.MapConfig',
-    'geodj',
-    'leaflet',
-    'six',
+    },
-    'django_filters',
+    {
-    'rest_framework',
-    'rest_framework_gis',
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    'markdown',
-    'PIL',
+    },
-    'PIL.ExifTags',
 ]
-# Password validation
-# https://docs.djangoproject.com/en/3.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/3.0/topics/i18n/
+LANGUAGE_CODE = 'ja-JP'
+TIME_ZONE = 'Asia/Tokyo'
+USE_I18N = True
+USE_L10N = True
+USE_TZ = True
+# ログイン後、10時間でタイムアウト
+SESSION_COOKIE_AGE = 36000
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/3.0/howto/static-files/
+STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')#元はstatic
+STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)#元はmap/atatic
+# ↓ heroku追加
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_URL = '/media/'
+# heroku用
+try:
+    from .local_settings import *
+except ImportError:
+    pass
+if not DEBUG:
+    import django_heroku
+    django_heroku.settings(locals())
+    import dj_database_url
+    DATABASES['default'] = dj_database_url.config()
+    DATABASES['default']['ENGINE'] = 'django.contrib.gis.db.backends.postgis'
+    GDAL_LIBRARY_PATH = os.getenv('GDAL_LIBRARY_PATH')
+    GEOS_LIBRARY_PATH = os.getenv('GEOS_LIBRARY_PATH')
+```
+```procfile
+web: gunicorn geodj.wsgi --log-file -
+```
+requirements.txt
+```requirements
+asgiref==3.2.9
+brotlipy==0.7.0
+certifi==2020.6.20
+cffi==1.14.0
+chardet==3.0.4
+cryptography==2.9.2
+dj-database-url==0.5.0
+Django==3.0.7
+django-cleanup==5.1.0
+django-cors-headers==3.2.1
+django-filter==2.3.0
+django-heroku==0.3.1
+django-leaflet==0.27.1
+djangorestframework==3.11.0
+djangorestframework-gis==0.15
+fastcache==1.1.0
+future==0.18.2
+glob2==0.7
+gunicorn==20.0.4
+idna==2.9
+importlib-metadata==1.6.1
+Markdown==3.2.2
+mpmath==1.1.0
+olefile==0.46
+Pillow==7.2.0
+psycopg2==2.8.5
+psycopg2-binary==2.8.6
+pycparser==2.20
+pyOpenSSL==19.1.0
+PySocks==1.7.1
+pytz==2020.1
+requests==2.24.0
+six==1.14.0
+sqlparse==0.3.1
+sympy==1.6.2
+urllib3==1.25.9
+whitenoise==5.2.0
+win-inet-pton==1.1.0
+wincertstore==0.2
+zipp==3.1.0
+```
+wsgi.py
+```wsgi
+"""
+WSGI config for geodj 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/3.0/howto/deployment/wsgi/
+"""
+import os
+from django.core.wsgi import get_wsgi_application
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'geodj.settings')
+application = get_wsgi_application()
+```
+### 試したこと
+heroku run python manage.py checkしても
+System check identified no issues (0 silenced).となり問題なさそうです。
+djangoアプリを作り直したところ、アプリのurl/adminとすると
+デフォルトのログイン画面(自分で作ったログイン画面ではない)が表示されます。
+管理画面で登録したデータがherokuのデータベースに登録できていることを
+確認できました。
+管理画面からサイト画面に移るとserver error(500)となり、
+上記と同じエラーログがでています。
+管理画面が見れて、indexなどが見れないということはpathがおかしいのでしょうか？
+```url
+#url.py
+from django.contrib import admin
+from django.urls import include, path
+from map.views import areaViewSet,upl_imgsViewSet
+from rest_framework.routers import DefaultRouter
+from map.views import index, GeojsonAPIView, upload
+# 画像表示用
+from . import settings
+from django.contrib.staticfiles.urls import static
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+router = DefaultRouter()
+router.register('area', areaViewSet)# area用
+router.register('upl_imgs', upl_imgsViewSet)# upl_imgs用
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('api/', include(router.urls)),
+    path('accounts/', include('django.contrib.auth.urls')),
+    path('', index, name='map_index'),
+    path('map/geojson/', GeojsonAPIView.as_view(), name='geojson_view'),
+    path('upload/', upload, name='upload'),
 ]
-# Internationalization
-# https://docs.djangoproject.com/en/3.0/topics/i18n/
-LANGUAGE_CODE = 'ja-JP'
-TIME_ZONE = 'Asia/Tokyo'
-USE_I18N = True
-USE_L10N = True
-USE_TZ = True
+#　画像表示用
-# ログイン後、10時間でタイムアウト
-SESSION_COOKIE_AGE = 36000
-# Static files (CSS, JavaScript, Images)
+urlpatterns += staticfiles_urlpatterns()
-# https://docs.djangoproject.com/en/3.0/howto/static-files/
-STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATICFILES_DIRS = (os.path.join(BASE_DIR, 'map/static'),)
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-# ↓ heroku追加
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
-MEDIA_URL = '/media/'
-"""
-# heroku用
-try:
-    from .local_settings import *
-except ImportError:
-    pass
-"""
-if not DEBUG:
-    import django_heroku
-    django_heroku.settings(locals())
-    import dj_database_url
-    DATABASES['default'] = dj_database_url.config()
-    DATABASES['default']['ENGINE'] = 'django.contrib.gis.db.backends.postgis'
-    GDAL_LIBRARY_PATH = os.getenv('GDAL_LIBRARY_PATH')
-    GEOS_LIBRARY_PATH = os.getenv('GEOS_LIBRARY_PATH')
-# ～heroku用
 ```
+```tree
+C:.
+├─deploy
+|  ├─__init.py
+|  ├─asgi.py
+|  ├─local_settings.py
+|  ├─settings.py
+|  ├─urls.py
+|  ├─wsgi.py
+├─map
+│  ├─data
+│  ├─migrations
+│  ├─static
+│  │  └─map
+│  │      ├─css
+│  │      └─js
+│  ├─templates
+│  │  ├─map
+|  |  |  ├─index.html
+|  |  |  ├─upload.html
+│  │  └─registration
+|  |  |  └─login.html
+├─media
+│  └─image
+├─static
+├─staticfiles
+│  ├─admin
+│  ├─gis
+│  ├─leaflet
+│  ├─map
+│  └─rest_framework
+├─__init__.py
+├─manage.py
-```procfile
+├─Procfile
-web: gunicorn geodj.wsgi --log-file -
+├─requirements.txt
+├─runtime.txt
+└─.gitignore
 ```
-requirements.txt
-```requirements
-asgiref==3.2.9
-brotlipy==0.7.0
-certifi==2020.6.20
-cffi==1.14.0
-chardet==3.0.4
-cryptography==2.9.2
-dj-database-url==0.5.0
-Django==3.0.7
-django-cleanup==5.1.0
-django-cors-headers==3.2.1
-django-filter==2.3.0
-django-heroku==0.3.1
-django-leaflet==0.27.1
-djangorestframework==3.11.0
-djangorestframework-gis==0.15
-fastcache==1.1.0
-future==0.18.2
-glob2==0.7
-gunicorn==20.0.4
-idna==2.9
-importlib-metadata==1.6.1
-Markdown==3.2.2
-mpmath==1.1.0
-olefile==0.46
-Pillow==7.2.0
-psycopg2==2.8.5
-psycopg2-binary==2.8.6
-pycparser==2.20
-pyOpenSSL==19.1.0
-PySocks==1.7.1
-pytz==2020.1
-requests==2.24.0
-six==1.14.0
-sqlparse==0.3.1
-sympy==1.6.2
-urllib3==1.25.9
-whitenoise==5.2.0
-win-inet-pton==1.1.0
-wincertstore==0.2
-zipp==3.1.0
-```
-wsgi.py
-```wsgi
-"""
-WSGI config for geodj 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/3.0/howto/deployment/wsgi/
-"""
-import os
-from django.core.wsgi import get_wsgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'geodj.settings')
-application = get_wsgi_application()
-```
-### 試したこと
-heroku run python manage.py checkしても
-System check identified no issues (0 silenced).となり問題なさそうです。
-djangoアプリを作り直してみましたが、500になってしまう。
-何か根本的に間違っているんでしょうか？
 ### 補足情報（FW/ツールのバージョンなど）

追加

2020/11/24 01:40

投稿

yamatar

スコア4

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -392,9 +392,9 @@
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')#元はstatic
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)#元はmap/atatic
+STATICFILES_DIRS = (os.path.join(BASE_DIR, 'map/static'),)
 # ↓ heroku追加
@@ -580,6 +580,10 @@
+djangoアプリを作り直してみましたが、500になってしまう。
+何か根本的に間違っているんでしょうか？
 ### 補足情報（FW/ツールのバージョンなど）
 windows10