|
WIN
diff --git a/web_demo/minesweepr/templates/_query.html b/web_demo/minesweepr/templates/_query.html
deleted file mode 100644
index 93bb765..0000000
--- a/web_demo/minesweepr/templates/_query.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-{% block title %}{% endblock %}
-
-{% block content_script %}
-{% endblock %}
-
-
-
-
-
-
-
-
-
-{% block main %}
-{% endblock %}
-
-this feature is not yet written…
-
-
-
diff --git a/web_demo/minesweepr/templates/query.html b/web_demo/minesweepr/templates/query.html
deleted file mode 100644
index 5c638e1..0000000
--- a/web_demo/minesweepr/templates/query.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "_query.html" %}
diff --git a/web_demo/minesweepr/urls.py b/web_demo/minesweepr/urls.py
index 98657e9..bfb1af4 100644
--- a/web_demo/minesweepr/urls.py
+++ b/web_demo/minesweepr/urls.py
@@ -1,16 +1,9 @@
-from django.conf.urls.defaults import *
-from django.conf import settings
+from django.urls import path
-dynurls = patterns('minesweepr.views',
- (r'^api/minesweeper_solve/$', 'api_solve'),
-)
+from . import views
-staticurls = patterns('minesweepr.views',
- (r'^player/$', 'template_static'),
- (r'^query/$', 'template_static'),
-)
-
-urlpatterns = patterns('',
- ('^%s' % settings.BASE_URL, include(dynurls)),
- ('^%s' % settings.BASE_STATIC_URL, include(staticurls)),
-)
+urlpatterns = [
+ path('player/', views.template_static),
+ path('query/', views.template_static),
+ path('api/minesweeper_solve/', views.api_solve, name='minesweepr.views.api_solve'),
+]
diff --git a/web_demo/minesweepr/views.py b/web_demo/minesweepr/views.py
index 0845809..cea5981 100644
--- a/web_demo/minesweepr/views.py
+++ b/web_demo/minesweepr/views.py
@@ -1,18 +1,17 @@
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound
+from django.http import JsonResponse
from django.views.decorators.csrf import csrf_exempt
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.conf import settings
import json
import logging
import time
-from tasks import minesweeper_solve
-from taskexec import exec_capped, ExecTimeOut
+from .tasks import minesweeper_solve
+from .taskexec import exec_capped, ExecTimeOut
import itertools
@csrf_exempt
def api_solve(request):
- payload = json.loads(request.raw_post_data)
+ payload = json.loads(request.body)
logging.debug('>>' + str(payload))
start = time.time()
@@ -23,7 +22,7 @@ def api_solve(request):
log_result(payload, result, time.time() - start)
logging.debug('<<' + str(result))
- return HttpResponse(json.dumps(result), 'text/json')
+ return JsonResponse(result)
def log_result(payload, result, rtt):
num_rules = len(payload['rules'])
@@ -42,4 +41,4 @@ def template_static(request):
url = request.path[1:-1]
assert url.startswith(settings.BASE_STATIC_URL)
template = url[len(settings.BASE_STATIC_URL):] + '.html'
- return render_to_response(template, {}, context_instance=RequestContext(request))
+ return render(request, template, {})
diff --git a/web_demo/settings.py b/web_demo/settings.py
deleted file mode 100644
index f8a7397..0000000
--- a/web_demo/settings.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import django # for verison sniffing
-
-# Django settings for minesweeper project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': '', # Or path to database file if using sqlite3.
- 'USER': '', # Not used with sqlite3.
- 'PASSWORD': '', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
- }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = None
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
- 'django.core.context_processors.static' if django.VERSION >= (1, 3) else 'staticfiles.context_processors.static',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-ROOT_URLCONF = 'urls'
-
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django.contrib.messages',
- # Uncomment the next line to enable the admin:
- # 'django.contrib.admin',
- # Uncomment the next line to enable admin documentation:
- # 'django.contrib.admindocs',
- 'django.contrib.staticfiles' if django.VERSION >= (1, 3) else 'staticfiles',
- 'minesweepr',
-)
-
-# root url for project
-BASE_URL = ''
-# root url for pages that will be pre-rendered to static content for deployment
-# i.e., they only exist as templates for reverse-url lookup
-BASE_STATIC_URL = ''
-
-STATIC_URL = '/static/'
-STATIC_ROOT = None
-
-CPU_QUOTA = 5. #s
-
-try:
- from localsettings import *
-except ImportError:
- pass
diff --git a/web_demo/urls.py b/web_demo/urls.py
deleted file mode 100644
index 34fadfc..0000000
--- a/web_demo/urls.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.conf.urls.defaults import *
-from django.conf import settings
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
- ('^', include('minesweepr.urls')),
-)
-
-urlpatterns += patterns('',
- # Uncomment the admin/doc line below to enable admin documentation:
- # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
- # Uncomment the next line to enable the admin:
- # (r'^admin/', include(admin.site.urls)),
-)
diff --git a/web_demo/__init__.py b/web_demo/web_demo/__init__.py
similarity index 100%
rename from web_demo/__init__.py
rename to web_demo/web_demo/__init__.py
diff --git a/web_demo/web_demo/settings.py b/web_demo/web_demo/settings.py
new file mode 100644
index 0000000..9195059
--- /dev/null
+++ b/web_demo/web_demo/settings.py
@@ -0,0 +1,69 @@
+"""
+Django settings for web_demo project.
+
+Generated by 'django-admin startproject' using Django 2.1.4.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.1/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/2.1/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.1/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'a1*p5#lybi*a(juhs0(f3hnbzv(w1497+@#8utkngp^58amb16'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+# Application definition
+
+INSTALLED_APPS = [
+ 'django.contrib.contenttypes',
+ 'django.contrib.staticfiles',
+]
+
+ROOT_URLCONF = 'web_demo.urls'
+
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'DIRS': ['minesweepr/templates'],
+ },
+]
+
+WSGI_APPLICATION = 'web_demo.wsgi.application'
+
+# Internationalization
+# https://docs.djangoproject.com/en/2.1/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.1/howto/static-files/
+
+STATIC_URL = '/static/'
+
+BASE_STATIC_URL = ''
+STATICFILES_DIRS = [
+ os.path.join(BASE_DIR, 'minesweepr', 'static'),
+]
+CPU_QUOTA = 5. # s
diff --git a/web_demo/web_demo/urls.py b/web_demo/web_demo/urls.py
new file mode 100644
index 0000000..3a67fe6
--- /dev/null
+++ b/web_demo/web_demo/urls.py
@@ -0,0 +1,20 @@
+"""web_demo URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+ https://docs.djangoproject.com/en/2.1/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.urls import include, path
+
+urlpatterns = [
+ path('', include('minesweepr.urls')),
+]
diff --git a/web_demo/web_demo/wsgi.py b/web_demo/web_demo/wsgi.py
new file mode 100644
index 0000000..6627ad3
--- /dev/null
+++ b/web_demo/web_demo/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for web_demo 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.1/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'web_demo.settings')
+
+application = get_wsgi_application()
|
