Items working locally!

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
     "python.linting.pylintEnabled": true,
     "python.linting.enabled": true,
-    "python.pythonPath": "/home/ant/.local/share/virtualenvs/Back-End-F0vZ22a3/bin/python"
+    "python.pythonPath": "/usr/bin/python3"
 }

FAQ.md

@@ -134,5 +134,5 @@ Then push to heroku.
 
 Creating your Django project within OneDrive causes problems.
 
-Repeat setup & install steps in a new directory, _outside_ of OneDrive.
+Repeat setup & install steps in a new directory, _outside_ of OneDrive.  
 

Pipfile

@@ -14,9 +14,11 @@ django-cors-headers = "*"
 gunicorn = "*"
 django-heroku = "*"
 django-rest-api = "*"
+psycopg2-binary = "*"
+dj-database-url = "*"
+whitenoise = "*"
 
 [dev-packages]
-pylint = "*"
 
 [requires]
 python_version = "3.7"

Procfile

@@ -1 +1,2 @@
-web: gunicorn adv_project.wsgi:application --log-file -
+web: gunicorn adv_project.wsgi:application --log-file -
+

adv_project/settings.py

@@ -12,6 +12,9 @@
 
 import os
 from decouple import config
+import dj_database_url
+
+
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -21,15 +24,17 @@
 # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-# SECRET_KEY = config('SECRET_KEY')
 SECRET_KEY = config('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-# DEBUG = config('DEBUG', cast=bool)
-DEBUG = True
+DEBUG = config('DEBUG', cast=bool)
+# DEBUG = True
 
 # ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')])
-ALLOWED_HOSTS = []
+# ALLOWED_HOSTS = []
+ALLOWED_HOSTS = config('ALLOWED_HOSTS')
+
+DATABASE_URL = config('DATABASE_URL')
 
 # Application definition
 
@@ -50,6 +55,7 @@
     'allauth',
     'allauth.account',
     'rest_auth.registration',
+    'adv_project',
 ]
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -92,13 +98,22 @@
 # https://docs.djangoproject.com/en/2.1/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    }
+    'default': 
+        # 'ENGINE': 'django.db.backends.sqlite3',
+        # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        dj_database_url.config(default=DATABASE_URL)
+
 }
 
 
+
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
+
 # Password validation
 # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
 
@@ -151,5 +166,9 @@
 
 STATIC_URL = '/static/'
 
-# import django_heroku
-# django_heroku.settings(locals())
+import django_heroku
+django_heroku.settings(locals())
+
+
+# Workaround for local dj_database_url issue; commenting out by default
+del DATABASES['default']['OPTIONS']['sslmode']

adv_project/urls.py

@@ -5,15 +5,15 @@
 from rest_framework.authtoken import views
 
 
-from adventure.api import RoomViewSet
+# from adventure.api import RoomViewSet
 
 
-router = routers.DefaultRouter()
-router.register(r'rooms', RoomViewSet)
+# router = routers.DefaultRouter()
+# router.register(r'rooms', RoomViewSet)
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('api/', include('api.urls')),
     path('api/adv/', include('adventure.urls')),
-    path('api/', include(router.urls)),
+    # path('api/', include(router.urls)),
 ]

adv_project/wsgi.py

@@ -14,3 +14,4 @@
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'adv_project.settings')
 
 application = get_wsgi_application()
+

adventure/admin.py

@@ -1,7 +1,27 @@
 from django.contrib import admin
 
-from .models import Room, Player
+from .models import Room, Player, Item
+# from .world_generate import World
 
+class RoomInline(admin.TabularInline):
+    model = Room
 
-admin.site.register(Room)
-admin.site.register(Player)
+class PlayerInline(admin.TabularInline):
+    model = Player
+
+class ItemInline(admin.TabularInline):
+    model = Item
+
+class RoomAdmin(admin.ModelAdmin):
+    list_display = ('title', 'description', 'n_to','s_to','e_to','w_to','pos_x', 'pos_y')
+
+class PlayerAdmin(admin.ModelAdmin):
+    list_display = ('user','currentRoom','uuid', 'inventory')
+
+class ItemAdmin(admin.ModelAdmin):
+    list_display = ('name', 'description') #took out 'location'
+
+
+admin.site.register(Room, RoomAdmin)
+admin.site.register(Player, PlayerAdmin)
+admin.site.register(Item, ItemAdmin)