Browse Source

Changed url to be a URLField and blackened codebase

master v1.1
Raphael Roberts 7 years ago
parent
commit
adaf285338
  1. 1
      .gitignore
  2. 4
      linkstore/admin.py
  3. 2
      linkstore/apps.py
  4. 41
      linkstore/migrations/0001_initial.py
  5. 9
      linkstore/migrations/0002_auto_20190406_1546.py
  6. 18
      linkstore/migrations/0003_auto_20190606_1808.py
  7. 2
      linkstore/models.py
  8. 2
      linkstore/urls.py
  9. 5
      linkstore/views.py
  10. 14
      setup.py

1
.gitignore

@ -98,3 +98,4 @@ ENV/
#*#
.#*
*~
/test_linkstore/

4
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]

2
linkstore/apps.py

@ -2,4 +2,4 @@ from django.apps import AppConfig
class LinkstoreConfig(AppConfig):
name = 'linkstore'
name = "linkstore"

41
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",
),
),
],
),
]

9
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"}
)
]

18
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),
),
]

2
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):

2
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/*'
]

5
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)

14
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,
)
Loading…
Cancel
Save