Merge branch 'lab02' into 'master'

Lab02

See merge request !2

README.txt

 Nate Brevin A. Que
 214754
 CSCI 40 - F
-Lab 01: Song Library
-February 13, 2023
+Lab 02: Song Library v2
+February 20, 2023
 
 I, Nate Brevin Que, have truthfully
 completed this lab activity by myself.
 
 <sgd>
 Nate Brevin A. Que
-February 13, 2023
+February 20, 2023
\ No newline at end of file

brevinque_music/homepage/admin.py

 from django.contrib import admin
 
-# Register your models here.
+from .models import Artist, Album, Song
+
+
+class ArtistAdmin(admin.ModelAdmin):
+	model = Artist
+	list_display = ('artist_name', 'birth_name', 'monthly_listeners',)
+	search_fields = ('artist_name', 'birth_name',)
+	list_filter = ('artist_name', 'birth_name',)
+
+
+
+class AlbumAdmin(admin.ModelAdmin):
+	model = Album
+	list_display = ('album_name', 'description', 'release_date', 'label', 'song_count',)
+	search_fields = ('album_name', 'description', 'label',)
+	list_filter = ('album_name',)
+
+
+class SongAdmin(admin.ModelAdmin):
+	model = Song
+	list_display = ('song_title', 'song_length', 'lyrics', 'music_video',)
+	search_fields = ('song_title', 'lyrics',)
+	list_filter = ('song_title',)
+
+
+admin.site.register(Artist, ArtistAdmin)
+admin.site.register(Album, AlbumAdmin)
+admin.site.register(Song, SongAdmin)
\ No newline at end of file

brevinque_music/homepage/migrations/0002_auto_20230220_1240.py

+# Generated by Django 3.2 on 2023-02-20 04:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='artist',
+            name='bio',
+            field=models.TextField(default='', max_length=700),
+        ),
+        migrations.AddField(
+            model_name='artist',
+            name='birth_name',
+            field=models.CharField(default='', max_length=50),
+        ),
+    ]

brevinque_music/homepage/migrations/0003_auto_20230220_1243.py

+# Generated by Django 3.2 on 2023-02-20 04:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0002_auto_20230220_1240'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='album',
+            name='label',
+            field=models.CharField(default='', max_length=50),
+        ),
+        migrations.AddField(
+            model_name='album',
+            name='song_count',
+            field=models.IntegerField(default=1),
+        ),
+    ]

brevinque_music/homepage/migrations/0004_auto_20230220_1247.py

+# Generated by Django 3.2 on 2023-02-20 04:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0003_auto_20230220_1243'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='song',
+            name='lyrics',
+            field=models.TextField(default=''),
+        ),
+        migrations.AddField(
+            model_name='song',
+            name='music_video',
+            field=models.BooleanField(default=False),
+        ),
+    ]

brevinque_music/homepage/models.py

@@ -4,6 +4,8 @@ from django.db import models
 class Artist(models.Model):
 	artist_name = models.CharField(max_length=50)
 	monthly_listeners = models.IntegerField()
+	birth_name = models.CharField(max_length=50, default="")
+	bio = models.TextField(max_length=700, default="")
 
 
 class Album(models.Model):
@@ -11,10 +13,14 @@ class Album(models.Model):
 	artist = models.ForeignKey(Artist, on_delete=models.CASCADE)
 	description = models.CharField(max_length=255)
 	release_date = models.DateField()
+	label = models.CharField(max_length=50, default="")
+	song_count = models.IntegerField(default=1)
 
 
 class Song(models.Model):
 	song_title = models.CharField(max_length=100)
 	artist = models.ForeignKey(Artist, on_delete=models.CASCADE)
 	album = models.ForeignKey(Album, on_delete=models.CASCADE)
-	song_length = models.IntegerField()
+	song_length = models.IntegerField()
\ No newline at end of file
+	music_video = models.BooleanField(default=False)
+	lyrics = models.TextField(default="")
\ No newline at end of file