From 2dee05b51e78931a000c7d2292241040f5001ff7 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Sun, 18 Jan 2015 14:33:53 +0000 Subject: [PATCH] Reorganise project layout --- {links => app}/__init__.py | 0 {links => app}/admin.py | 1 - {links => app}/migrations/__init__.py | 0 {links => app}/models.py | 0 {links => app}/templates/404.html | 0 {links => app}/templates/index.html | 2 -- {links => app}/tests.py | 0 {links => app}/views.py | 0 links/migrations/0001_initial.py | 27 --------------------- links/migrations/0002_auto_20150117_2248.py | 20 --------------- links/migrations/0003_auto_20150117_2306.py | 24 ------------------ links/migrations/0004_auto_20150117_2338.py | 19 --------------- manage.py | 2 +- {minie => project}/__init__.py | 0 {minie => project}/settings.py | 10 ++++---- {minie => project}/urls.py | 4 +-- {minie => project}/wsgi.py | 4 +-- 17 files changed, 10 insertions(+), 103 deletions(-) rename {links => app}/__init__.py (100%) rename {links => app}/admin.py (53%) rename {links => app}/migrations/__init__.py (100%) rename {links => app}/models.py (100%) rename {links => app}/templates/404.html (100%) rename {links => app}/templates/index.html (93%) rename {links => app}/tests.py (100%) rename {links => app}/views.py (100%) delete mode 100644 links/migrations/0001_initial.py delete mode 100644 links/migrations/0002_auto_20150117_2248.py delete mode 100644 links/migrations/0003_auto_20150117_2306.py delete mode 100644 links/migrations/0004_auto_20150117_2338.py rename {minie => project}/__init__.py (100%) rename {minie => project}/settings.py (90%) rename {minie => project}/urls.py (52%) rename {minie => project}/wsgi.py (76%) diff --git a/links/__init__.py b/app/__init__.py similarity index 100% rename from links/__init__.py rename to app/__init__.py diff --git a/links/admin.py b/app/admin.py similarity index 53% rename from links/admin.py rename to app/admin.py index 8c38f3f..c6fe108 100644 --- a/links/admin.py +++ b/app/admin.py @@ -1,3 +1,2 @@ from django.contrib import admin -# Register your models here. diff --git a/links/migrations/__init__.py b/app/migrations/__init__.py similarity index 100% rename from links/migrations/__init__.py rename to app/migrations/__init__.py diff --git a/links/models.py b/app/models.py similarity index 100% rename from links/models.py rename to app/models.py diff --git a/links/templates/404.html b/app/templates/404.html similarity index 100% rename from links/templates/404.html rename to app/templates/404.html diff --git a/links/templates/index.html b/app/templates/index.html similarity index 93% rename from links/templates/index.html rename to app/templates/index.html index dd558e2..dec1393 100644 --- a/links/templates/index.html +++ b/app/templates/index.html @@ -2,8 +2,6 @@ - - minie links! diff --git a/links/tests.py b/app/tests.py similarity index 100% rename from links/tests.py rename to app/tests.py diff --git a/links/views.py b/app/views.py similarity index 100% rename from links/views.py rename to app/views.py diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py deleted file mode 100644 index f092cd3..0000000 --- a/links/migrations/0001_initial.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Link', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('link', models.URLField(max_length=2048)), - ('base62', models.CharField(max_length=64, null=True)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('clicks', models.IntegerField(default=0)), - ('ip', models.GenericIPAddressField(null=True)), - ], - options={ - }, - bases=(models.Model,), - ), - ] diff --git a/links/migrations/0002_auto_20150117_2248.py b/links/migrations/0002_auto_20150117_2248.py deleted file mode 100644 index 8f1a83d..0000000 --- a/links/migrations/0002_auto_20150117_2248.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('links', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='link', - name='id', - field=models.AutoField(serialize=False, primary_key=True), - preserve_default=True, - ), - ] diff --git a/links/migrations/0003_auto_20150117_2306.py b/links/migrations/0003_auto_20150117_2306.py deleted file mode 100644 index 86fff71..0000000 --- a/links/migrations/0003_auto_20150117_2306.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('links', '0002_auto_20150117_2248'), - ] - - operations = [ - migrations.RemoveField( - model_name='link', - name='base62', - ), - migrations.AlterField( - model_name='link', - name='id', - field=models.CharField(max_length=12, serialize=False, primary_key=True), - preserve_default=True, - ), - ] diff --git a/links/migrations/0004_auto_20150117_2338.py b/links/migrations/0004_auto_20150117_2338.py deleted file mode 100644 index 46e64c5..0000000 --- a/links/migrations/0004_auto_20150117_2338.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('links', '0003_auto_20150117_2306'), - ] - - operations = [ - migrations.RenameField( - model_name='link', - old_name='link', - new_name='url', - ), - ] diff --git a/manage.py b/manage.py index f8c522d..82cfa83 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "minie.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings") from django.core.management import execute_from_command_line diff --git a/minie/__init__.py b/project/__init__.py similarity index 100% rename from minie/__init__.py rename to project/__init__.py diff --git a/minie/settings.py b/project/settings.py similarity index 90% rename from minie/settings.py rename to project/settings.py index d56dd45..beef6aa 100644 --- a/minie/settings.py +++ b/project/settings.py @@ -1,5 +1,5 @@ """ -Django settings for minie project. +Django settings for min.ie project. For more information on this file, see https://docs.djangoproject.com/en/1.7/topics/settings/ @@ -27,7 +27,7 @@ INSTALLED_APPS = ( 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.staticfiles', - 'links', + 'app', ) MIDDLEWARE_CLASSES = ( @@ -36,12 +36,12 @@ MIDDLEWARE_CLASSES = ( ) TEMPLATE_DIRS = ( - os.path.join(BASE_DIR, 'links/templates'), + os.path.join(BASE_DIR, 'app/templates'), ) -ROOT_URLCONF = 'minie.urls' +ROOT_URLCONF = 'project.urls' -WSGI_APPLICATION = 'minie.wsgi.application' +WSGI_APPLICATION = 'project.wsgi.application' # Honor the 'X-Forwarded-Proto' header for request.is_secure() SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') diff --git a/minie/urls.py b/project/urls.py similarity index 52% rename from minie/urls.py rename to project/urls.py index 7ddbccd..2c9ffd5 100644 --- a/minie/urls.py +++ b/project/urls.py @@ -2,6 +2,6 @@ from django.conf.urls import patterns, include, url from django.contrib import admin urlpatterns = patterns('', - url(r'^$', 'links.views.home', name='home'), - url(r'(.*)', 'links.views.catchall', name='short'), + url(r'^$', 'app.views.home', name='home'), + url(r'(.*)', 'app.views.catchall', name='short'), ) diff --git a/minie/wsgi.py b/project/wsgi.py similarity index 76% rename from minie/wsgi.py rename to project/wsgi.py index 110c551..2751791 100644 --- a/minie/wsgi.py +++ b/project/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for minie project. +WSGI config for min.ie project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/ """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "minie.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings") from django.core.wsgi import get_wsgi_application from dj_static import Cling