Merge pull request #73 from hartwork/improve-sample-project

Improve sample project
asyncee · May 21, 2020 · bc84f73 · bc84f73
2 parents a3f4a35 + 7c196e3
commit bc84f73
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 65 deletions.
diff --git a/sampleproject/bootstrap.sh b/sampleproject/bootstrap.sh
@@ -1,10 +1,19 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -e
+
+on_error_exit() {
+    echo "ERROR: Command \"${BASH_COMMAND}\" at ${BASH_SOURCE} line ${BASH_LINENO} failed with exit code $?." >&2
+}
+trap on_error_exit ERR
+
+cd "$(dirname "$0")"
 
 echo ">>> Removing old environment"
 if [ ! -d env ]; then
     rm -rf env
 fi
 echo ">>> Installing django into new virtualenv"
 virtualenv env -p python3
+env/bin/pip install --upgrade pip setuptools wheel
 env/bin/pip install -r requirements.txt
 env/bin/pip install -e ../
diff --git a/sampleproject/demoapp/migrations/0001_initial.py b/sampleproject/demoapp/migrations/0001_initial.py
@@ -1,13 +1,14 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+# Generated by Django 2.2.10 on 2020-05-20 17:29
 
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
 import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
@@ -16,20 +17,42 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Category',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=50)),
             ],
             options={
                 'verbose_name_plural': 'categories',
             },
         ),
+        migrations.CreateModel(
+            name='EmptyModel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Related',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TestFieldsModel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('choice_field', models.IntegerField(choices=[(0, 'Zero'), (1, 'One')])),
+                ('text', models.TextField()),
+                ('fk_field', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='demoapp.Related')),
+                ('m2m_field', models.ManyToManyField(related_name='_testfieldsmodel_m2m_field_+', to='demoapp.Related')),
+            ],
+        ),
         migrations.CreateModel(
             name='Note',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('mood', models.CharField(default=b'', help_text=b'What is your current mood?', max_length=64)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('categories', models.ManyToManyField(to='demoapp.Category')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=django.db.models.deletion.CASCADE)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]
diff --git a/sampleproject/demoapp/migrations/0002_remove_note_mood.py b/sampleproject/demoapp/migrations/0002_remove_note_mood.py
diff --git a/sampleproject/demoapp/migrations/0003_emptymodel_related_testfieldsmodel.py b/sampleproject/demoapp/migrations/0003_emptymodel_related_testfieldsmodel.py
diff --git a/sampleproject/sampleproject/urls.py b/sampleproject/sampleproject/urls.py
@@ -1,10 +1,15 @@
 from django.conf.urls import url
 from django.conf.urls.static import static
 from django.conf import settings
+from django.urls.base import reverse_lazy
+from django.views.generic.base import RedirectView
 
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'', RedirectView.as_view(url=reverse_lazy('admin:app_list',
+                                                   kwargs={'app_label': 'demoapp'})),
+        name='frontpage'),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)