first commit to get ready to push to github

Alex Schmelkin · Alex Schmelkin · commit 1f49d657f014 · 2015-11-28T21:25:59.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,29 @@
+# Logs and databases
+*.log
+*.db
+*.sqlite3
+
+# OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Emacs backups
+*~
+.*~
+
+# django
+*.pot
+*.pyc
+local_settings.py
+
+# production files
+django.wsgi
+
+# collected static files via collectstatic and uploaded media assets
+namegame/static
+namegame/media
diff --git a/REAMDE.md b/REAMDE.md
@@ -0,0 +1,9 @@
+TODO
+====
+* fix 0 correct bug the first time you play...andy.title() suggests "Good Luck!"
+* on a word by word basis, if there is ANY capitalization, do not .title() correct
+* Andy feature: entered X of Y names on the entry screen
+* Andy feature: lock OUT ability to add more names after exceeding maximum (downvote)
+* Ben feature: add timer on website
+* Andy feature: fonts stink, and the brick house name game doesn't look styled enough
+
diff --git a/manage.py b/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "namegame.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/namegame/__init__.py b/namegame/__init__.py
diff --git a/namegame/settings.py b/namegame/settings.py
@@ -0,0 +1,87 @@
+"""
+Django settings for namegame project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.7/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.7/ref/settings/
+"""
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '9zh2s5dk6ao3k)r1lw)&x#3r3oe-8((b$#2uvm_ddkp1sf(bbg'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+TEMPLATE_DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = (
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'rest_framework',
+    'names',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+ROOT_URLCONF = 'namegame.urls'
+
+WSGI_APPLICATION = 'namegame.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'namegame/db', 'db.sqlite3'),
+    }
+}
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.7/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/1.7/howto/static-files/
+
+STATIC_URL = '/static/'
+
+MAX_NAMES = 10
diff --git a/namegame/urls.py b/namegame/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, include, url
+from django.contrib import admin
+
+urlpatterns = patterns('',
+    url(r'^', include('names.urls')),
+    url(r'^admin/', include(admin.site.urls)),
+)
diff --git a/namegame/wsgi.py b/namegame/wsgi.py
@@ -0,0 +1,14 @@
+"""
+WSGI config for namegame 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/1.7/howto/deployment/wsgi/
+"""
+
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "namegame.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
diff --git a/names/__init__.py b/names/__init__.py
diff --git a/names/admin.py b/names/admin.py
@@ -0,0 +1,7 @@
+from django.contrib import admin
+from names.models import Name
+
+class NameAdmin(admin.ModelAdmin):
+    list_display = ('name', 'used',)
+    list_filter = ('used',)
+admin.site.register(Name, NameAdmin)
diff --git a/names/forms.py b/names/forms.py
@@ -0,0 +1,11 @@
+from django import forms
+from names.models import Name
+
+class NameForm(forms.ModelForm):
+    
+    class Meta:
+        model = Name
+        fields = ['name', 'used',]
+        widgets = {
+            'name': forms.TextInput(attrs={"autofocus": True, "autocorrect": "off", "autocapitalize": "off"}),
+        }
diff --git a/names/migrations/0001_initial.py b/names/migrations/0001_initial.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Name',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(help_text=b'The name.', max_length=100)),
+                ('used', models.BooleanField(default=False, help_text=b'Check after the name is used.')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/names/migrations/__init__.py b/names/migrations/__init__.py
diff --git a/names/models.py b/names/models.py
@@ -0,0 +1,43 @@
+from django.db import models
+
+
+class NameManager(models.Manager):
+    def get_unused(self):
+        """
+        Returns all unused entities.
+        """
+        return self.filter(used=False)
+
+    def get_used(self):
+        """
+        Returns all used entities.
+        """
+        return self.filter(used=True)
+
+    def get_unused_random(self):
+        """
+        Returns one random unused name.
+        """
+        try:
+            return self.get_unused().order_by('?').first()
+        except:
+            return None
+
+
+class Name(models.Model):
+
+    name = models.CharField(max_length=100, help_text="The name.")
+    used = models.BooleanField(default=False, help_text="Check after the name is used.")
+
+    objects = NameManager()
+
+    def save(self):
+        # capitalize using the .title() method ONLY if the user did not enter ANY capital letters
+        if not self.pk:
+            value = getattr(self, 'name')
+            if (not any(x.isupper() for x in value)):
+                setattr(self, 'name', value.title())
+        super(Name, self).save()
+
+    def __unicode__(self):
+        return self.name
diff --git a/names/serializers.py b/names/serializers.py
@@ -0,0 +1,8 @@
+from rest_framework import serializers
+from names.models import Name
+
+
+class NameSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = Name
+        fields = ('name', 'used',)
diff --git a/names/static/names/img/brickhouse.png b/names/static/names/img/brickhouse.png
diff --git a/names/templates/names/base.html b/names/templates/names/base.html
@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+    <link href='https://fonts.googleapis.com/css?family=Slabo' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <style type="text/css">
+      input {
+        font-size: 400%;
+        font-family: 'Open Sans', sans-serif;
+      }
+      button, .btn {
+        font-size: 400%;
+        font-family: 'Open Sans', sans-serif;
+      }
+      h1 {
+        font-size: 400%;
+        font-family: 'Slabo', serif;
+      }
+      h2 {
+        font-size: 300%;
+        font-family: 'Slabo', serif;
+      }
+    </style>
+  {% block css %}{% endblock %}
+  </head>
+  <body role="document">
+    <div class="container theme-showcase" role="main">
+      {% block content %}{% endblock %}
+    </div>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+  </body>
+</html>
diff --git a/names/templates/names/name_detail.html b/names/templates/names/name_detail.html
@@ -0,0 +1,24 @@
+{% extends "names/base.html" %}
+{% block css %}
+<style type="text/css">
+  h1 {
+    font-size: 800%;
+  }
+</style>    
+{% endblock %}
+{% block content %}
+    {% if form.name.value %}
+    <h1>{{ form.name.value }}</h1>
+    <form action="" method="post">
+      {% csrf_token %}
+      {{ form.name.as_hidden }}
+      <input type="hidden" name="pk" value="{{ name.pk }}" />
+      <input type="hidden" name="{{ form.used.html_name }}" value="1" />
+      <button type="submit" class="btn btn-large btn-primary">NEXT »</button>
+    </form>
+    {% else %}
+    <h1>GAME OVER!!</h1>
+    {% endif %}
+    <br>
+    <a href="/ready" class="btn btn-danger btn-lg" role="button">Done</a>
+{% endblock %}
diff --git a/names/templates/names/name_form.html b/names/templates/names/name_form.html
@@ -0,0 +1,26 @@
+{% extends "names/base.html" %}
+{% load staticfiles %}
+{% block css %}
+  <style text="text/css">
+    .text-danger {
+      font-weight: bold;
+    }
+  </style>
+{% endblock %}
+{% block content %}
+    <h1>The Name Game</h1>
+
+    {% if messages %}
+    {% for message in messages %}
+    <h2 class="text-success">{{ message }}</h2>
+    {% endfor %}
+    {% endif %}
+
+    <form action="" method="post">
+      {% csrf_token %}
+      {{ form.name }}
+      <button class="btn btn-primary btn-lg" type="submit">Add Name!</button>
+      <p class="{% if added_count > max_names %}text-danger{% else %}text-info{% endif %}">{{ added_count }} out of {{ max_names }} names added</p>
+    </form>
+    <img src="{% static "names/img/brickhouse.png" %}" height="200">
+{% endblock %}
diff --git a/names/templates/names/ready.html b/names/templates/names/ready.html
@@ -0,0 +1,10 @@
+{% extends "names/base.html" %}
+{% load staticfiles %}
+{% block content %}
+{% if correct_count >= 0 %}
+<h1>{{ correct_count }} correct!</h1>
+{% endif %}
+<a href="/play" class="btn btn-primary btn-lg" role="button">Ready »</a>
+<br><br>
+<img src="{% static "names/img/brickhouse.png" %}" height="400">
+{% endblock %}
diff --git a/names/tests.py b/names/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/names/urls.py b/names/urls.py
@@ -0,0 +1,17 @@
+from django.conf.urls import patterns, url, include
+from django.views.generic import TemplateView, RedirectView
+from rest_framework import routers
+
+from names import views
+
+router = routers.DefaultRouter()
+router.register(r'names', views.NameViewSet)
+#router.register(r'random', views.RandomNameViewSet.as_view()
+
+urlpatterns = patterns('',
+    url(r'^$', views.NameCreate.as_view(), name='home'),
+    url(r'^play/$', views.NameDetail.as_view(), name='play'),
+    url(r'^ready/$', views.Ready.as_view(), name='ready'),
+    url(r'^api/', include(router.urls)),
+    url(r'^api/(?P<pk>.*?)/', views.RandomNameView.as_view(), name='random'),
+)
diff --git a/names/views.py b/names/views.py
