commit a8d5890597cff5dd88e64e410d05d1f8cd3378cf Author: LongHairedHacker Date: Wed Feb 1 22:05:48 2017 +0100 Started working on models diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..abb9750 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pyc +*.sqlite3 +__pycache__ +virtenv diff --git a/gulashromstore/__init__.py b/gulashromstore/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gulashromstore/settings.py b/gulashromstore/settings.py new file mode 100644 index 0000000..fa96210 --- /dev/null +++ b/gulashromstore/settings.py @@ -0,0 +1,127 @@ +""" +Django settings for gulashromstore project. + +Generated by 'django-admin startproject' using Django 1.10.5. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/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/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '73vot(ti2zkiarvubc^i(v6fr_$khb1s6ui#f#h%lfx$fqqn8-' + +# SECURITY WARNING: don't run with debug turned on in production! +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', + 'taggit', + 'taggit_helpers', + 'users', + 'roms' +] + +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 = 'gulashromstore.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + '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 = 'gulashromstore.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/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/1.10/topics/i18n/ + +LANGUAGE_CODE = 'de-de' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' + + +AUTH_USER_MODEL = 'users.User' diff --git a/gulashromstore/urls.py b/gulashromstore/urls.py new file mode 100644 index 0000000..c7c74f5 --- /dev/null +++ b/gulashromstore/urls.py @@ -0,0 +1,21 @@ +"""gulashromstore URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/gulashromstore/wsgi.py b/gulashromstore/wsgi.py new file mode 100644 index 0000000..9f9b25a --- /dev/null +++ b/gulashromstore/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for gulashromstore 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.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gulashromstore.settings") + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..12f4725 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gulashromstore.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/roms/__init__.py b/roms/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/roms/admin.py b/roms/admin.py new file mode 100644 index 0000000..87f5db9 --- /dev/null +++ b/roms/admin.py @@ -0,0 +1,18 @@ +from django.contrib import admin + +from taggit_helpers.admin import TaggitListFilter, TaggitTabularInline + +from roms.models import Rom, RomFile + +class RomFileInline(admin.TabularInline): + model = RomFile + +class RomAdmin(admin.ModelAdmin): + list_filter = [TaggitListFilter] + + inlines = [ + RomFileInline, + TaggitTabularInline + ] + +admin.site.register(Rom, RomAdmin) diff --git a/roms/apps.py b/roms/apps.py new file mode 100644 index 0000000..86cd4e9 --- /dev/null +++ b/roms/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class RomsConfig(AppConfig): + name = 'roms' diff --git a/roms/migrations/0001_initial.py b/roms/migrations/0001_initial.py new file mode 100644 index 0000000..8e00971 --- /dev/null +++ b/roms/migrations/0001_initial.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-01 20:33 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import taggit.managers + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('taggit', '0002_auto_20150616_2121'), + ] + + operations = [ + migrations.CreateModel( + name='Rom', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, verbose_name='name')), + ('description', models.TextField(verbose_name='description')), + ('cover', models.ImageField(upload_to='', verbose_name='cover image')), + ('tags', taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')), + ], + ), + migrations.CreateModel( + name='RomFile', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('slot', models.IntegerField(verbose_name='slot numer')), + ('binary', models.FileField(upload_to='', verbose_name='binary')), + ('rom', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roms.Rom', verbose_name='rom')), + ], + ), + ] diff --git a/roms/migrations/__init__.py b/roms/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/roms/models.py b/roms/models.py new file mode 100644 index 0000000..a0974bc --- /dev/null +++ b/roms/models.py @@ -0,0 +1,19 @@ +from django.db import models + +from taggit.managers import TaggableManager + +class Rom(models.Model): + name = models.CharField("name", max_length = 128) + description = models.TextField("description") + cover = models.ImageField("cover image") + tags = TaggableManager() + + +class RomFile(models.Model): + SLOT_CHOICES = [(i, "Slot %d" % i) for i in range(1,7)] + rom = models.ForeignKey(Rom, verbose_name = "rom") + slot = models.IntegerField("slot", choices=SLOT_CHOICES) + binary = models.FileField("binary") + + class Meta: + unique_together = ('rom', 'slot') diff --git a/roms/tests.py b/roms/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/roms/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/roms/views.py b/roms/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/roms/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/users/__init__.py b/users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/admin.py b/users/admin.py new file mode 100644 index 0000000..5992031 --- /dev/null +++ b/users/admin.py @@ -0,0 +1,19 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from django.contrib.auth.forms import UserChangeForm + +from users.models import User + +class CustomUserChangeForm(UserChangeForm): + class Meta(UserChangeForm.Meta): + model = User + +class CustomUserAdmin(UserAdmin): + form = CustomUserChangeForm + + fieldsets = UserAdmin.fieldsets + ( + ('Additional Attributes', {'fields': ('github',)}), + ) + + +admin.site.register(User, CustomUserAdmin) diff --git a/users/apps.py b/users/apps.py new file mode 100644 index 0000000..4ce1fab --- /dev/null +++ b/users/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class UsersConfig(AppConfig): + name = 'users' diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py new file mode 100644 index 0000000..2003180 --- /dev/null +++ b/users/migrations/0001_initial.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-01 18:31 +from __future__ import unicode_literals + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0008_alter_user_username_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('github', models.CharField(max_length=128, verbose_name='github handle')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/models.py b/users/models.py new file mode 100644 index 0000000..4bf33c2 --- /dev/null +++ b/users/models.py @@ -0,0 +1,5 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + +class User(AbstractUser): + github = models.CharField('github handle', max_length=128) diff --git a/users/tests.py b/users/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/users/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/users/views.py b/users/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/users/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.