diff --git a/.gitignore b/.gitignore index 53c49d0..621dbf1 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ ENV/ #*# .#* *~ +/test_linkstore/ diff --git a/linkstore/admin.py b/linkstore/admin.py index 04248d0..8a529d4 100644 --- a/linkstore/admin.py +++ b/linkstore/admin.py @@ -10,9 +10,7 @@ class LinkInline(admin.TabularInline): class CategoryAdmin(admin.ModelAdmin): - fieldset = [ - (None, {'fields': ['name']}), - ] + fieldset = [(None, {"fields": ["name"]})] inlines = [LinkInline] diff --git a/linkstore/apps.py b/linkstore/apps.py index be95dc9..5aa5b48 100644 --- a/linkstore/apps.py +++ b/linkstore/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class LinkstoreConfig(AppConfig): - name = 'linkstore' + name = "linkstore" diff --git a/linkstore/migrations/0001_initial.py b/linkstore/migrations/0001_initial.py index 13af255..fd6892e 100644 --- a/linkstore/migrations/0001_initial.py +++ b/linkstore/migrations/0001_initial.py @@ -8,24 +8,45 @@ class Migration(migrations.Migration): initial = True - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='Category', + name="Category", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=40)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=40)), ], ), migrations.CreateModel( - name='Link', + name="Link", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('friendly_name', models.CharField(max_length=40)), - ('url', models.CharField(max_length=255)), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='linkstore.Category')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("friendly_name", models.CharField(max_length=40)), + ("url", models.CharField(max_length=255)), + ( + "category", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="linkstore.Category", + ), + ), ], ), ] diff --git a/linkstore/migrations/0002_auto_20190406_1546.py b/linkstore/migrations/0002_auto_20190406_1546.py index 0e13317..073bfc9 100644 --- a/linkstore/migrations/0002_auto_20190406_1546.py +++ b/linkstore/migrations/0002_auto_20190406_1546.py @@ -5,13 +5,10 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ - ('linkstore', '0001_initial'), - ] + dependencies = [("linkstore", "0001_initial")] operations = [ migrations.AlterModelOptions( - name='category', - options={'verbose_name_plural': 'categories'}, - ), + name="category", options={"verbose_name_plural": "categories"} + ) ] diff --git a/linkstore/migrations/0003_auto_20190606_1808.py b/linkstore/migrations/0003_auto_20190606_1808.py new file mode 100644 index 0000000..5fc1e7c --- /dev/null +++ b/linkstore/migrations/0003_auto_20190606_1808.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.2 on 2019-06-06 23:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('linkstore', '0002_auto_20190406_1546'), + ] + + operations = [ + migrations.AlterField( + model_name='link', + name='url', + field=models.URLField(max_length=255), + ), + ] diff --git a/linkstore/models.py b/linkstore/models.py index f583e25..2c09585 100644 --- a/linkstore/models.py +++ b/linkstore/models.py @@ -15,7 +15,7 @@ class Category(models.Model): class Link(models.Model): friendly_name = models.CharField(max_length=40) - url = models.CharField(max_length=255) + url = models.URLField(max_length=255) category = models.ForeignKey(Category, on_delete=models.CASCADE) def __str__(self): diff --git a/linkstore/urls.py b/linkstore/urls.py index 354308b..320eeb6 100644 --- a/linkstore/urls.py +++ b/linkstore/urls.py @@ -3,6 +3,6 @@ from django.urls import path from linkstore import views urlpatterns = [ - path('', views.index, name='index'), + path("", views.index, name="index"), # path('/static/*' ] diff --git a/linkstore/views.py b/linkstore/views.py index b3f62d3..ed0a2b3 100644 --- a/linkstore/views.py +++ b/linkstore/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render from django.http import HttpResponse + # Create your views here. from linkstore.models import Category @@ -7,5 +8,5 @@ from linkstore.models import Category def index(request): # return HttpResponse("links will show up here...") categories = Category.objects.all() - context = {'categories': categories} - return render(request, 'linkstore/index.djhtml', context) + context = {"categories": categories} + return render(request, "linkstore/index.djhtml", context) diff --git a/setup.py b/setup.py index ee87f4e..3ec1957 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,15 @@ from distutils.core import setup -with open('requirements.txt') as file: +with open("requirements.txt") as file: INSTALL_REQUIRES = file.readlines() setup( - version='1.0', - name='linkstore', - description='Django app for collapsible link categories', - author='Raphael Roberts', - packages=['linkstore', 'linkstore.migrations'], - author_email='raphael.roberts48@gmail.com', + version="1.1", + name="linkstore", + description="Django app for collapsible link categories", + author="Raphael Roberts", + packages=["linkstore", "linkstore.migrations"], + author_email="raphael.roberts48@gmail.com", install_requires=INSTALL_REQUIRES, include_package_data=True, )