feat: merged forum and master branches

README.md

@@ -12,3 +12,5 @@ Created Homepage app, Git Repo, and Django Project
 JOAN DENISE NOCOS
 Created Assignments app
 
+RECORDING 
+https://drive.google.com/file/d/1h7ZKUgOm05asADkjp_4TqzfbnsMjiszC/view?usp=sharing

widget_group_17/homepage/admin.py

 from django.contrib import admin
 
 # Register your models here.
+from .models import WidgetUser
+
+admin.site.register(WidgetUser)

widget_group_17/homepage/migrations/0001_initial.py

+# Generated by Django 4.0.3 on 2022-03-16 13:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='WidgetUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=50)),
+                ('middle_name', models.CharField(max_length=50)),
+                ('last_name', models.CharField(max_length=50)),
+            ],
+        ),
+    ]

widget_group_17/homepage/models.py

 from django.db import models
 
 # Create your models here.
+class WidgetUser(models.Model):
+    first_name = models.CharField(max_length=50)
+    middle_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
\ No newline at end of file

widget_group_17/widget_group_17/settings.py

@@ -35,7 +35,11 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
+<<<<<<< HEAD
     'forum.apps.ForumConfig',
+=======
+    'homepage.apps.HomepageConfig',
+>>>>>>> 9ac5c77fcb761514f0f3910c70225dd0540640bd
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',