diff --git a/artists/admin.py b/artists/admin.py
index e5a4822..406398d 100644
--- a/artists/admin.py
+++ b/artists/admin.py
@@ -2,4 +2,7 @@ from django.contrib import admin
from . import models
# Register your models here.
-admin.site.register(models.Artist)
+class ArtistAdmin(admin.ModelAdmin):
+ search_fields = ['romanized_name','name']
+
+admin.site.register(models.Artist, ArtistAdmin)
diff --git a/artists/migrations/0001_initial.py b/artists/migrations/0001_initial.py
index 9fca7b4..ef238fd 100644
--- a/artists/migrations/0001_initial.py
+++ b/artists/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.4 on 2020-12-15 20:42
+# Generated by Django 3.1.4 on 2020-12-16 14:26
from django.db import migrations, models
@@ -8,6 +8,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
+ ('categories', '0001_initial'),
]
operations = [
@@ -15,9 +16,15 @@ class Migration(migrations.Migration):
name='Artist',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=255)),
- ('romanized_name', models.CharField(max_length=255)),
+ ('name', models.CharField(blank=True, max_length=255)),
+ ('romanized_name', models.CharField(blank=True, max_length=255)),
+ ('about_composer', models.TextField(blank=True)),
+ ('about_music', models.TextField(blank=True)),
('aliases', models.ManyToManyField(blank=True, related_name='_artist_aliases_+', to='artists.Artist')),
+ ('category', models.ManyToManyField(blank=True, to='categories.Category')),
],
+ options={
+ 'ordering': ['romanized_name', 'name'],
+ },
),
]
diff --git a/artists/migrations/0002_artist_category.py b/artists/migrations/0002_artist_category.py
deleted file mode 100644
index d5b5e38..0000000
--- a/artists/migrations/0002_artist_category.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-15 20:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('categories', '0002_auto_20201215_2054'),
- ('artists', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='artist',
- name='category',
- field=models.ManyToManyField(blank=True, to='categories.Category'),
- ),
- ]
diff --git a/artists/migrations/0003_auto_20201215_2107.py b/artists/migrations/0003_auto_20201215_2107.py
deleted file mode 100644
index 39ed338..0000000
--- a/artists/migrations/0003_auto_20201215_2107.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-15 21:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('artists', '0002_artist_category'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='artist',
- name='about_composer',
- field=models.TextField(blank=True),
- ),
- migrations.AddField(
- model_name='artist',
- name='about_music',
- field=models.TextField(blank=True),
- ),
- ]
diff --git a/artists/migrations/0004_auto_20201216_0724.py b/artists/migrations/0004_auto_20201216_0724.py
deleted file mode 100644
index 6eaabbd..0000000
--- a/artists/migrations/0004_auto_20201216_0724.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 07:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('artists', '0003_auto_20201215_2107'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='artist',
- name='name',
- field=models.CharField(blank=True, max_length=255),
- ),
- migrations.AlterField(
- model_name='artist',
- name='romanized_name',
- field=models.CharField(blank=True, max_length=255),
- ),
- ]
diff --git a/artists/migrations/0005_auto_20201216_0851.py b/artists/migrations/0005_auto_20201216_0851.py
deleted file mode 100644
index f2a4014..0000000
--- a/artists/migrations/0005_auto_20201216_0851.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:51
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('artists', '0004_auto_20201216_0724'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='artist',
- options={'ordering': ['romanized_name', 'name']},
- ),
- ]
diff --git a/categories/admin.py b/categories/admin.py
index 090f259..5ae483d 100644
--- a/categories/admin.py
+++ b/categories/admin.py
@@ -3,4 +3,11 @@ from django.contrib import admin
from . import models
# Register your models here.
-admin.site.register(models.Category)
+class BranchAdmin(admin.ModelAdmin):
+ search_fields = ['name', 'acronym']
+
+class CategoryAdmin(admin.ModelAdmin):
+ search_fields = ['name']
+
+admin.site.register(models.Branch, BranchAdmin)
+admin.site.register(models.Category,CategoryAdmin)
diff --git a/categories/migrations/0001_initial.py b/categories/migrations/0001_initial.py
index 7d95233..6396777 100644
--- a/categories/migrations/0001_initial.py
+++ b/categories/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.4 on 2020-12-15 20:49
+# Generated by Django 3.1.4 on 2020-12-16 14:26
from django.db import migrations, models
@@ -11,12 +11,24 @@ class Migration(migrations.Migration):
]
operations = [
+ migrations.CreateModel(
+ name='Branch',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(blank=True, max_length=255)),
+ ('acronym', models.CharField(blank=True, max_length=20)),
+ ],
+ ),
migrations.CreateModel(
name='Category',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
- ('description', models.CharField(max_length=255)),
+ ('description', models.TextField(blank=True)),
],
+ options={
+ 'verbose_name_plural': 'Categories',
+ 'ordering': ['name'],
+ },
),
]
diff --git a/categories/migrations/0002_auto_20201215_2054.py b/categories/migrations/0002_auto_20201215_2054.py
deleted file mode 100644
index 396dc31..0000000
--- a/categories/migrations/0002_auto_20201215_2054.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-15 20:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('categories', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='category',
- name='description',
- field=models.TextField(),
- ),
- ]
diff --git a/categories/migrations/0003_auto_20201215_2107.py b/categories/migrations/0003_auto_20201215_2107.py
deleted file mode 100644
index 673a0a4..0000000
--- a/categories/migrations/0003_auto_20201215_2107.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-15 21:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('categories', '0002_auto_20201215_2054'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='category',
- name='description',
- field=models.TextField(blank=True),
- ),
- ]
diff --git a/categories/migrations/0004_auto_20201216_0724.py b/categories/migrations/0004_auto_20201216_0724.py
deleted file mode 100644
index 8a959e4..0000000
--- a/categories/migrations/0004_auto_20201216_0724.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 07:24
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('categories', '0003_auto_20201215_2107'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='category',
- options={'verbose_name_plural': 'Categories'},
- ),
- ]
diff --git a/categories/migrations/0005_auto_20201216_0851.py b/categories/migrations/0005_auto_20201216_0851.py
deleted file mode 100644
index 9cb21d6..0000000
--- a/categories/migrations/0005_auto_20201216_0851.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:51
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('categories', '0004_auto_20201216_0724'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='category',
- options={'ordering': ['name'], 'verbose_name_plural': 'Categories'},
- ),
- ]
diff --git a/categories/models.py b/categories/models.py
index 65389da..daba675 100644
--- a/categories/models.py
+++ b/categories/models.py
@@ -1,5 +1,12 @@
from django.db import models
+class Branch(models.Model):
+ name = models.CharField(max_length=255,blank=True)
+ acronym = models.CharField(max_length=20,blank=True)
+
+ def __str__(self):
+ return self.name+" ["+self.acronym+"]"
+
# Create your models here.
class CategoryManager(models.Manager):
def create_or_new(self, name):
diff --git a/home/templates/index.html b/home/templates/index.html
index dc6e195..a91310f 100644
--- a/home/templates/index.html
+++ b/home/templates/index.html
@@ -1,5 +1,15 @@
{% extends 'layouts/base.html' %}
{% block content %}
-
Work in progress!
+ Welcome!
+ This site is a work-in-progress database of Idolmaster songs, composers, arrangers, and lyricists.
+ The primary purpose of this site is to document the people behind the music in Idolmaster, make observations about the music, and showcase other works that might be of interest
+ This site originated from a spreadsheet I maintained to note the composers' works and their similarities.
+ Current to-do
+
+ Complete lyricist credits
+ Add songs from IDOLM@STER Radio
+ Readd other songs that I might have missed
+ Complete showcases of composers
+
{% endblock %}
\ No newline at end of file
diff --git a/songs/admin.py b/songs/admin.py
index f8cca7c..81955da 100644
--- a/songs/admin.py
+++ b/songs/admin.py
@@ -2,5 +2,12 @@ from django.contrib import admin
from . import models
-admin.site.register(models.Song)
-admin.site.register(models.OutsideSong)
+
+class SongAdmin(admin.ModelAdmin):
+ search_fields = ['romanized_title','title']
+
+class OutsideSongAdmin(admin.ModelAdmin):
+ search_fields = ['title']
+
+admin.site.register(models.Song, SongAdmin)
+admin.site.register(models.OutsideSong, OutsideSongAdmin)
diff --git a/songs/migrations/0001_initial.py b/songs/migrations/0001_initial.py
index e7d0204..7ab93cc 100644
--- a/songs/migrations/0001_initial.py
+++ b/songs/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.4 on 2020-12-15 21:07
+# Generated by Django 3.1.4 on 2020-12-16 14:26
from django.db import migrations, models
import django.db.models.deletion
@@ -9,7 +9,8 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('artists', '0003_auto_20201215_2107'),
+ ('categories', '0001_initial'),
+ ('artists', '0001_initial'),
]
operations = [
@@ -17,23 +18,30 @@ class Migration(migrations.Migration):
name='Song',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(max_length=255)),
- ('romanized_title', models.CharField(max_length=255)),
+ ('title', models.CharField(blank=True, max_length=255)),
+ ('romanized_title', models.CharField(blank=True, max_length=255)),
('impression', models.TextField(blank=True)),
('arranger', models.ManyToManyField(blank=True, related_name='arranged_songs', to='artists.Artist')),
+ ('branch', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, to='categories.branch')),
('composer', models.ManyToManyField(blank=True, related_name='composed_songs', to='artists.Artist')),
('lyricist', models.ManyToManyField(blank=True, related_name='written_songs', to='artists.Artist')),
],
+ options={
+ 'ordering': ['romanized_title', 'title'],
+ },
),
migrations.CreateModel(
name='OutsideSong',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(max_length=255)),
- ('romanized_title', models.CharField(max_length=255)),
- ('origin', models.CharField(max_length=255)),
- ('url', models.URLField(max_length=255)),
+ ('title', models.CharField(blank=True, max_length=255)),
+ ('artist', models.CharField(blank=True, max_length=255)),
+ ('origin', models.CharField(blank=True, max_length=255)),
+ ('url', models.URLField(blank=True, max_length=255)),
('composer', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='artists.artist')),
],
+ options={
+ 'ordering': ['composer', 'title'],
+ },
),
]
diff --git a/songs/migrations/0002_auto_20201216_0730.py b/songs/migrations/0002_auto_20201216_0730.py
deleted file mode 100644
index 0b87a8a..0000000
--- a/songs/migrations/0002_auto_20201216_0730.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 07:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('songs', '0001_initial'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='outsidesong',
- name='romanized_title',
- ),
- migrations.AddField(
- model_name='outsidesong',
- name='artist',
- field=models.CharField(blank=True, max_length=255),
- ),
- migrations.AlterField(
- model_name='outsidesong',
- name='origin',
- field=models.CharField(blank=True, max_length=255),
- ),
- migrations.AlterField(
- model_name='outsidesong',
- name='title',
- field=models.CharField(blank=True, max_length=255),
- ),
- migrations.AlterField(
- model_name='outsidesong',
- name='url',
- field=models.URLField(blank=True, max_length=255),
- ),
- ]
diff --git a/songs/migrations/0003_auto_20201216_0736.py b/songs/migrations/0003_auto_20201216_0736.py
deleted file mode 100644
index 3bcb841..0000000
--- a/songs/migrations/0003_auto_20201216_0736.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 07:36
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('songs', '0002_auto_20201216_0730'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Branch',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(blank=True, max_length=255)),
- ('acronym', models.CharField(blank=True, max_length=20)),
- ],
- ),
- migrations.AddField(
- model_name='song',
- name='branch',
- field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='songs.branch'),
- ),
- ]
diff --git a/songs/migrations/0004_remove_song_lyricist.py b/songs/migrations/0004_remove_song_lyricist.py
deleted file mode 100644
index 609615d..0000000
--- a/songs/migrations/0004_remove_song_lyricist.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:00
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('songs', '0003_auto_20201216_0736'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='song',
- name='lyricist',
- ),
- ]
diff --git a/songs/migrations/0005_auto_20201216_0838.py b/songs/migrations/0005_auto_20201216_0838.py
deleted file mode 100644
index 34d780b..0000000
--- a/songs/migrations/0005_auto_20201216_0838.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:38
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('songs', '0004_remove_song_lyricist'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='song',
- name='branch',
- field=models.ForeignKey(blank=True, default=1, on_delete=django.db.models.deletion.PROTECT, to='songs.branch'),
- preserve_default=False,
- ),
- ]
diff --git a/songs/migrations/0006_auto_20201216_0840.py b/songs/migrations/0006_auto_20201216_0840.py
deleted file mode 100644
index 796c17c..0000000
--- a/songs/migrations/0006_auto_20201216_0840.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('songs', '0005_auto_20201216_0838'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='song',
- name='romanized_title',
- field=models.CharField(blank=True, max_length=255),
- ),
- migrations.AlterField(
- model_name='song',
- name='title',
- field=models.CharField(blank=True, max_length=255),
- ),
- ]
diff --git a/songs/migrations/0007_song_lyricist.py b/songs/migrations/0007_song_lyricist.py
deleted file mode 100644
index c3caa85..0000000
--- a/songs/migrations/0007_song_lyricist.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('artists', '0004_auto_20201216_0724'),
- ('songs', '0006_auto_20201216_0840'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='song',
- name='lyricist',
- field=models.ManyToManyField(blank=True, related_name='written_songs', to='artists.Artist'),
- ),
- ]
diff --git a/songs/migrations/0008_auto_20201216_0851.py b/songs/migrations/0008_auto_20201216_0851.py
deleted file mode 100644
index 7bca78f..0000000
--- a/songs/migrations/0008_auto_20201216_0851.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-16 08:51
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('songs', '0007_song_lyricist'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='outsidesong',
- options={'ordering': ['composer', 'title']},
- ),
- migrations.AlterModelOptions(
- name='song',
- options={'ordering': ['romanized_title', 'title']},
- ),
- ]
diff --git a/songs/models.py b/songs/models.py
index f3c2328..92a493d 100644
--- a/songs/models.py
+++ b/songs/models.py
@@ -1,15 +1,9 @@
from django.db import models
-class Branch(models.Model):
- name = models.CharField(max_length=255,blank=True)
- acronym = models.CharField(max_length=20,blank=True)
-
- def __str__(self):
- return self.name+" ["+self.acronym+"]"
# Create your models here.
class Song(models.Model):
- branch = models.ForeignKey("Branch", blank=True, on_delete=models.PROTECT)
+ branch = models.ForeignKey("categories.Branch", blank=True, on_delete=models.PROTECT)
title = models.CharField(max_length=255,blank=True)
romanized_title = models.CharField(max_length=255,blank=True)
lyricist = models.ManyToManyField("artists.Artist", blank=True, related_name="written_songs")
diff --git a/templates/layouts/base.html b/templates/layouts/base.html
index 14009a1..a7d6e43 100644
--- a/templates/layouts/base.html
+++ b/templates/layouts/base.html
@@ -5,59 +5,35 @@
Altessimo
-
+
-
- Altessimo
-
-
-
-
-
-
-
+
+
-
-
+
{% block content %}
{% endblock %}
-
-
-
+