Merge pull request #72 from junnie082/develop

Develop

scoopadive/board/migrations/0001_initial.py

@@ -1,6 +1,7 @@
-# Generated by Django 5.0 on 2024-01-19 06:40
+# Generated by Django 5.0 on 2024-01-26 05:14
 
 import django.db.models.deletion
+from django.conf import settings
 from django.db import migrations, models
 
 
@@ -9,18 +10,24 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Post',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=200)),
+                ('postName', models.CharField(max_length=200)),
                 ('content', models.TextField()),
                 ('writer', models.CharField(max_length=20)),
                 ('date', models.DateTimeField()),
+                ('images', models.ImageField(blank=True, null=True, upload_to='')),
+                ('voter', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
             ],
+            options={
+                'db_table': 'Post',
+            },
         ),
         migrations.CreateModel(
             name='Answer4Post',
@@ -29,7 +36,11 @@ class Migration(migrations.Migration):
                 ('content', models.TextField()),
                 ('writer', models.CharField(max_length=20)),
                 ('date', models.DateTimeField()),
+                ('voter', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
                 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='board.post')),
             ],
+            options={
+                'db_table': 'Answer4Post',
+            },
         ),
     ]

scoopadive/board/views.py

@@ -81,7 +81,6 @@ def answer_create(request, post_id):
     post = get_object_or_404(Post, pk=post_id)
     writer = request.user
     content = request.POST.get('content')
-    print("content: " + str(content))
 
     # Check if content is not None and not an empty string
     if content is not None and content.strip():

scoopadive/common/views.py

@@ -10,24 +10,6 @@ def logout_view(request):
     logout(request)
     return redirect('main:index')
 
-# def signup(request):
-#     if request.method == "POST":
-#         form = UserForm(request.POST)
-#         if form.is_valid():
-#             form.save()
-#             username = form.cleaned_data.get('username')
-#             raw_password = form.cleaned_data.get('password1')
-#             user = authenticate(username=username, password=raw_password)
-#             login(request, user)
-#             return redirect('main:index')
-#         else:
-#             print("Form is not valid. Errors:", form.errors)
-#     else:
-#         form = UserForm()
-#
-#     return render(request, 'common/signup.html', {'form': form})
-
-
 def signup(request):
     if request.method == 'POST':
         # Extract user registration data from the POST request