import other kontor repos into directories
This commit is contained in:
Thomas Peetz
Executable
+86
@@ -0,0 +1,86 @@
|
||||
from django.contrib import admin
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> add Comic models
|
||||
from .models import Publisher
|
||||
from .models import Artist
|
||||
from .models import Issue
|
||||
from .models import StoryArc
|
||||
from .models import Comic
|
||||
from .models import TradePaperback
|
||||
from .models import Volume
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Register your models here.
|
||||
|
||||
|
||||
class IssueInline(admin.StackedInline):
|
||||
model = Issue
|
||||
extra = 1
|
||||
|
||||
|
||||
class IssueAdmin(admin.ModelAdmin):
|
||||
fields = ['comic', 'number', 'is_read', 'in_stock']
|
||||
|
||||
|
||||
class ComicAdmin(admin.ModelAdmin):
|
||||
fields = ['title', 'publisher', 'writer', 'current_order', 'completed']
|
||||
inlines = [IssueInline]
|
||||
|
||||
|
||||
class ComicInline(admin.StackedInline):
|
||||
model = Comic
|
||||
extra = 1
|
||||
|
||||
|
||||
class PublisherAdmin(admin.ModelAdmin):
|
||||
inlines = [ComicInline]
|
||||
|
||||
|
||||
admin.site.register(Publisher, PublisherAdmin)
|
||||
admin.site.register(Artist)
|
||||
admin.site.register(Issue, IssueAdmin)
|
||||
admin.site.register(Volume)
|
||||
admin.site.register(StoryArc)
|
||||
admin.site.register(Comic, ComicAdmin)
|
||||
admin.site.register(TradePaperback)
|
||||
=======
|
||||
# Register your models here.
|
||||
>>>>>>> initial setup
|
||||
=======
|
||||
# Register your models here.
|
||||
|
||||
|
||||
class IssueInline(admin.StackedInline):
|
||||
model = Issue
|
||||
extra = 1
|
||||
|
||||
|
||||
class IssueAdmin(admin.ModelAdmin):
|
||||
fields = ['comic', 'number', 'is_read', 'in_stock']
|
||||
|
||||
|
||||
class ComicAdmin(admin.ModelAdmin):
|
||||
fields = ['title', 'publisher', 'writer', 'artist', 'current_order', 'completed']
|
||||
inlines = [IssueInline]
|
||||
|
||||
|
||||
class ComicInline(admin.StackedInline):
|
||||
model = Comic
|
||||
extra = 1
|
||||
|
||||
|
||||
class PublisherAdmin(admin.ModelAdmin):
|
||||
inlines = [ComicInline]
|
||||
|
||||
|
||||
admin.site.register(Publisher, PublisherAdmin)
|
||||
admin.site.register(Artist)
|
||||
admin.site.register(Issue, IssueAdmin)
|
||||
admin.site.register(Volume)
|
||||
admin.site.register(StoryArc)
|
||||
admin.site.register(Comic, ComicAdmin)
|
||||
admin.site.register(TradePaperback)
|
||||
>>>>>>> add Comic models
|
||||
@@ -0,0 +1,5 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ComicsConfig(AppConfig):
|
||||
name = 'comics'
|
||||
Executable
+3048
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,105 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 1.9.6 on 2016-06-13 15:33
|
||||
=======
|
||||
# Generated by Django 1.9.5 on 2016-04-10 20:23
|
||||
>>>>>>> ignore compiled scripts
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Artist',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100)),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Comic',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('title', models.CharField(max_length=40)),
|
||||
('current_order', models.BooleanField()),
|
||||
('completed', models.BooleanField()),
|
||||
<<<<<<< HEAD
|
||||
('artist', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='artist', to='comics.Artist')),
|
||||
=======
|
||||
>>>>>>> ignore compiled scripts
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Issue',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('number', models.CharField(max_length=4)),
|
||||
('is_read', models.BooleanField(default=False)),
|
||||
('in_stock', models.BooleanField(default=False)),
|
||||
('comic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Publisher',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100)),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='StoryArc',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100)),
|
||||
('comic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='TradePaperback',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=40)),
|
||||
('issue_start', models.IntegerField()),
|
||||
('issue_end', models.IntegerField()),
|
||||
('comic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Volume',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=40)),
|
||||
('comic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
|
||||
],
|
||||
),
|
||||
migrations.AddField(
|
||||
<<<<<<< HEAD
|
||||
model_name='issue',
|
||||
name='volume',
|
||||
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Volume'),
|
||||
),
|
||||
migrations.AddField(
|
||||
=======
|
||||
>>>>>>> ignore compiled scripts
|
||||
model_name='comic',
|
||||
name='publisher',
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comics.Publisher'),
|
||||
),
|
||||
<<<<<<< HEAD
|
||||
migrations.AddField(
|
||||
model_name='comic',
|
||||
name='writer',
|
||||
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='writer', to='comics.Artist'),
|
||||
),
|
||||
=======
|
||||
>>>>>>> ignore compiled scripts
|
||||
]
|
||||
@@ -0,0 +1,26 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.6 on 2016-06-20 14:05
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comics', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comic',
|
||||
name='artist',
|
||||
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='artist', to='comics.Artist'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='comic',
|
||||
name='writer',
|
||||
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='writer', to='comics.Artist'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,26 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.6 on 2016-06-20 14:10
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comics', '0002_auto_20160620_1405'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comic',
|
||||
name='artist',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='artist', to='comics.Artist'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='comic',
|
||||
name='writer',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='writer', to='comics.Artist'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,21 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.6 on 2016-06-22 11:22
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comics', '0003_auto_20160620_1410'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='issue',
|
||||
name='volume',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Volume'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.6 on 2016-06-22 11:46
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comics', '0004_auto_20160622_1122'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comic',
|
||||
name='title',
|
||||
field=models.CharField(max_length=60),
|
||||
),
|
||||
]
|
||||
Executable
+101
@@ -0,0 +1,101 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models
|
||||
|
||||
# Create your models here.
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> add Comic models
|
||||
|
||||
|
||||
class Publisher(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class Artist(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class Comic(models.Model):
|
||||
<<<<<<< HEAD
|
||||
title = models.CharField(max_length=60)
|
||||
publisher = models.ForeignKey(Publisher)
|
||||
current_order = models.BooleanField()
|
||||
completed = models.BooleanField()
|
||||
writer = models.ForeignKey(Artist, blank=True, null=True, related_name='writer')
|
||||
artist = models.ForeignKey(Artist, blank=True, null=True, related_name='artist')
|
||||
=======
|
||||
title = models.CharField(max_length=40)
|
||||
publisher = models.ForeignKey(Publisher)
|
||||
current_order = models.BooleanField()
|
||||
completed = models.BooleanField()
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> add Comic models
|
||||
=======
|
||||
writer = models.ForeignKey(Artist, null=True, related_name='writer')
|
||||
artist = models.ForeignKey(Artist, null=True, related_name='artist')
|
||||
>>>>>>> backup
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
|
||||
class Volume(models.Model):
|
||||
name = models.CharField(max_length=40)
|
||||
comic = models.ForeignKey(Comic)
|
||||
|
||||
def __str__(self):
|
||||
return self.comic.title + ' ' + self.name
|
||||
|
||||
|
||||
class Issue(models.Model):
|
||||
number = models.CharField(max_length=4)
|
||||
is_read = models.BooleanField(default=False)
|
||||
in_stock = models.BooleanField(default=False)
|
||||
comic = models.ForeignKey(Comic, null=True)
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
volume = models.ForeignKey(Volume, blank=True, null=True)
|
||||
=======
|
||||
>>>>>>> add Comic models
|
||||
=======
|
||||
volume = models.ForeignKey(Volume, null=True)
|
||||
>>>>>>> backup
|
||||
|
||||
def __str__(self):
|
||||
return self.comic.title + ' #' + self.number
|
||||
|
||||
|
||||
class StoryArc(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
comic = models.ForeignKey(Comic, null=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class TradePaperback(models.Model):
|
||||
name = models.CharField(max_length=40)
|
||||
comic = models.ForeignKey(Comic, null=True)
|
||||
issue_start = models.IntegerField()
|
||||
issue_end = models.IntegerField()
|
||||
|
||||
def __str__(self):
|
||||
<<<<<<< HEAD
|
||||
return self.comic.title + ' TP ' + self.name
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> initial setup
|
||||
=======
|
||||
>>>>>>> add Comic models
|
||||
=======
|
||||
return self.comic.title + ' TP ' + self.name
|
||||
>>>>>>> backup
|
||||
@@ -0,0 +1,6 @@
|
||||
li a {
|
||||
color: green;
|
||||
}
|
||||
td a {
|
||||
color: green;
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
<<<<<<< HEAD
|
||||
{% extends "kontor/base.html" %}
|
||||
{% block title %}Comic Details{% endblock %}
|
||||
{% block content %}
|
||||
=======
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Comic Details</title>
|
||||
</head>
|
||||
<body>
|
||||
>>>>>>> backup
|
||||
<table>
|
||||
<thead><td>Name</td><td>current Order</td><td>completed</td></thead>
|
||||
<tr>
|
||||
<td>{{ comic.title }}</td>
|
||||
<td>{{ comic.current_order }}</td>
|
||||
<td>{{ comic.completed }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<<<<<<< HEAD
|
||||
{% endblock %}
|
||||
=======
|
||||
|
||||
</body>
|
||||
</html>
|
||||
>>>>>>> backup
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
<<<<<<< HEAD
|
||||
{% extends "kontor/base.html" %}
|
||||
{% block title %}Comic Overview{% endblock %}
|
||||
{% block content %}
|
||||
=======
|
||||
{% load staticfiles %}
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'comics/style.css' %}" />
|
||||
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Comic Overview</title>
|
||||
</head>
|
||||
<body>
|
||||
>>>>>>> backup
|
||||
<table>
|
||||
<thead><td>Name</td><td>current Order</td><td>completed</td></thead>
|
||||
{% for comic in comic_list %}
|
||||
<tr>
|
||||
<td><a href="{% url 'comics:detail' comic.id %}">{{ comic.title }}</a></td>
|
||||
<td>{{ comic.current_order }}</td>
|
||||
<td>{{ comic.completed }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
<<<<<<< HEAD
|
||||
{% endblock %}
|
||||
=======
|
||||
</body>
|
||||
</html>
|
||||
>>>>>>> backup
|
||||
@@ -0,0 +1,8 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
|
||||
class ComicsViewsTestCase(TestCase):
|
||||
def test_index(self):
|
||||
resp = self.client.get('/comics/')
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
@@ -0,0 +1,10 @@
|
||||
from django.conf.urls import url
|
||||
|
||||
from . import views
|
||||
|
||||
app_name = 'comics'
|
||||
urlpatterns = [
|
||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||
url(r'^(?P<pk>[0-9]+)/$', views.DetailView.as_view(), name='detail'),
|
||||
]
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
<<<<<<< HEAD
|
||||
from django.shortcuts import render
|
||||
<<<<<<< HEAD
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.views import generic
|
||||
|
||||
from .models import Comic
|
||||
# Create your views here.
|
||||
|
||||
|
||||
class IndexView(generic.ListView):
|
||||
template_name = 'comics/index.html'
|
||||
context_object_name = 'comic_list'
|
||||
|
||||
def get_queryset(self):
|
||||
"""Return the list of comics."""
|
||||
return Comic.objects.all()
|
||||
|
||||
|
||||
class DetailView(generic.DetailView):
|
||||
model = Comic
|
||||
template_name = 'comics/detail.html'
|
||||
=======
|
||||
=======
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.views import generic
|
||||
>>>>>>> backup
|
||||
|
||||
from .models import Comic
|
||||
# Create your views here.
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> initial setup
|
||||
=======
|
||||
|
||||
|
||||
class IndexView(generic.ListView):
|
||||
template_name = 'comics/index.html'
|
||||
context_object_name = 'comic_list'
|
||||
|
||||
def get_queryset(self):
|
||||
"""Return the list of comics."""
|
||||
return Comic.objects.all()
|
||||
|
||||
|
||||
class DetailView(generic.DetailView):
|
||||
model = Comic
|
||||
template_name = 'comics/detail.html'
|
||||
>>>>>>> backup
|
||||
Reference in New Issue
Block a user