Merge conflict resolve

README.txt

 Neo Emmanuel D. Ballesteros, 210645, BS CS, Section C;
+<<<<<<< HEAD
 Lab 01: Song Library;
 February 20, 2023;
+=======
+Lab 02: Song Library v2;
+February 21, 2023;
+>>>>>>> lab02
 I have not discussed the Python language code in my program with anyone other than my instructor or the teaching assistants assigned to this course.
 
 I have not used Python language code obtained from another student, or any other unauthorized source, either modified or unmodified.
 
 If any Python language code or documentation used in my program was obtained from another source, such as a textbook or website, that has been clearly noted with a proper citation in the comments of my program.
 
-<sgd> Neo Emmanuel D. Ballesteros, February 20, 2023
+<sgd> Neo Emmanuel D. Ballesteros, February 21, 2023
\ No newline at end of file

homepage/admin.py

 from django.contrib import admin
 
-# Register your models here.
+from .models import Artist, Album, Song
+
+class ArtistAdmin(admin.ModelAdmin):
+    model = Artist
+
+    search_fields = ('artist_name',)
+    list_display = ('artist_name',)
+    list_filter = ('artist_name',)
+
+class AlbumAdmin(admin.ModelAdmin):
+    model = Album
+
+    search_fields = ('album_name', 'artist',)
+    list_display = ('album_name', 'artist',)
+    list_filter = ('album_name', 'artist',)
+
+class SongAdmin(admin.ModelAdmin):
+    model = Song
+
+    search_fields = ('album', 'artist', 'song_title',)
+    list_display = ('album', 'artist', 'song_title',)
+    list_filter = ('album', 'artist', 'song_title',)
+
+admin.site.register(Artist, ArtistAdmin)
+admin.site.register(Album, AlbumAdmin)
+admin.site.register(Song, SongAdmin)
\ No newline at end of file

homepage/migrations/0002_album_label_album_song_count_artist_bio_and_more.py

+# Generated by Django 4.1.7 on 2023-02-21 14:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='album',
+            name='label',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='album',
+            name='song_count',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='artist',
+            name='bio',
+            field=models.TextField(blank=True, max_length=700, null=True),
+        ),
+        migrations.AddField(
+            model_name='artist',
+            name='birth_name',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='song',
+            name='lyrics',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='song',
+            name='music_video',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='album',
+            name='album_name',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='album',
+            name='artist',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='album',
+            name='description',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='album',
+            name='release_date',
+            field=models.CharField(blank=True, max_length=20, null=True),
+        ),
+        migrations.AlterField(
+            model_name='artist',
+            name='artist_name',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='artist',
+            name='monthly_listeners',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='song',
+            name='album',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='song',
+            name='artist',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='song',
+            name='song_length',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='song',
+            name='song_title',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+    ]

homepage/migrations/0003_alter_song_song_length.py

+# Generated by Django 4.1.7 on 2023-02-21 14:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0002_album_label_album_song_count_artist_bio_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='song',
+            name='song_length',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+    ]

homepage/models.py

 from django.db import models
 
 class Artist(models.Model):
-    artist_name = models.CharField(max_length=50)
-    monthly_listeners = models.IntegerField()
+    artist_name = models.CharField(max_length=50, blank=True, null=True)
+    monthly_listeners = models.IntegerField(blank=True, null=True)
+    birth_name = models.TextField(blank=True, null=True)
+    bio = models.TextField(max_length=700, blank=True, null=True)
 
 class Album(models.Model):
-    album_name = models.CharField(max_length=50)
-    artist = models.CharField(max_length=50)
-    description = models.CharField(max_length=100)
-    release_date = models.CharField(max_length=20)
+    album_name = models.CharField(max_length=50, blank=True, null=True)
+    artist = models.CharField(max_length=50, blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
+    release_date = models.CharField(max_length=20, blank=True, null=True)
+    label = models.CharField(max_length=200, blank=True, null=True)
+    song_count = models.IntegerField(blank=True, null=True)
 
 class Song(models.Model):
-    song_title = models.CharField(max_length=50)
-    artist = models.CharField(max_length=50)
-    album = models.CharField(max_length=50)
-    song_length = models.IntegerField()
+    song_title = models.CharField(max_length=50, blank=True, null=True)
+    artist = models.CharField(max_length=50, blank=True, null=True)
+    album = models.CharField(max_length=50, blank=True, null=True)
+    song_length = models.CharField(max_length=10, blank=True, null=True)
\ No newline at end of file
+    music_video = models.BooleanField(default=False)
+    lyrics = models.TextField(blank=True, null=True)
\ No newline at end of file