diff --git a/campics_/content/migrations/0001_initial.py b/campics_/content/migrations/0001_initial.py
index 08d487e36131203616dc0e08ad10c3bb47d40c0a..a89b832d78d8131b91503a1b07d4702e8e14a6d6 100644
--- a/campics_/content/migrations/0001_initial.py
+++ b/campics_/content/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.4 on 2022-05-31 14:31
+# Generated by Django 4.0.4 on 2022-06-05 08:43
from django.db import migrations, models
@@ -11,6 +11,14 @@ class Migration(migrations.Migration):
]
operations = [
+ migrations.CreateModel(
+ name='Bookmark',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('email', models.EmailField(max_length=100, verbose_name='email')),
+ ('feed_id', models.IntegerField()),
+ ],
+ ),
migrations.CreateModel(
name='Feed',
fields=[
@@ -20,10 +28,10 @@ class Migration(migrations.Migration):
('profile_image', models.TextField()),
('email', models.EmailField(blank=True, max_length=100, null=True, verbose_name='email')),
('user_id', models.CharField(blank=True, max_length=30, null=True)),
- ('like_count', models.IntegerField()),
- ('views', models.IntegerField()),
+ ('like_count', models.IntegerField(default=0)),
+ ('view_count', models.IntegerField(default=0)),
('type', models.BooleanField(default=False)),
- ('univ', models.CharField(max_length=30)),
+ ('univ', models.CharField(max_length=15)),
],
),
migrations.CreateModel(
@@ -39,10 +47,30 @@ class Migration(migrations.Migration):
name='FeedView',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('email', models.EmailField(max_length=100, verbose_name='email')),
('feed_id', models.IntegerField()),
+ ('email', models.CharField(blank=True, max_length=30, null=True)),
+ ('is_view', models.BooleanField(default=False)),
],
),
+ migrations.CreateModel(
+ name='Reply',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('feed_id', models.IntegerField()),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('user_id', models.CharField(blank=True, max_length=30, null=True)),
+ ('content', models.TextField()),
+ ('email', models.EmailField(blank=True, max_length=100, null=True, verbose_name='email')),
+ ],
+ ),
+ migrations.AddIndex(
+ model_name='reply',
+ index=models.Index(fields=['feed_id'], name='content_rep_feed_id_49ae3d_idx'),
+ ),
+ migrations.AddIndex(
+ model_name='feedview',
+ index=models.Index(fields=['feed_id'], name='content_fee_feed_id_0b2735_idx'),
+ ),
migrations.AddIndex(
model_name='feedview',
index=models.Index(fields=['email'], name='content_fee_email_a02fc8_idx'),
@@ -55,4 +83,8 @@ class Migration(migrations.Migration):
model_name='feedlike',
index=models.Index(fields=['email'], name='content_fee_email_3901d6_idx'),
),
+ migrations.AddIndex(
+ model_name='bookmark',
+ index=models.Index(fields=['email'], name='content_boo_email_03c3c8_idx'),
+ ),
]
diff --git a/campics_/content/migrations/0009_feed_created_at.py b/campics_/content/migrations/0009_feed_created_at.py
deleted file mode 100644
index 9bfd650ae4f2eb9c57618285bbb5837e889d2474..0000000000000000000000000000000000000000
--- a/campics_/content/migrations/0009_feed_created_at.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-01 06:23
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('content', '0008_auto_20211014_1246'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='feed',
- name='created_at',
- field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
- preserve_default=False,
- ),
- ]
diff --git a/campics_/content/migrations/0010_feed_univ.py b/campics_/content/migrations/0010_feed_univ.py
deleted file mode 100644
index fb3e1b8b73ca771fcdca26443806ac5386c2512d..0000000000000000000000000000000000000000
--- a/campics_/content/migrations/0010_feed_univ.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-01 07:43
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('content', '0009_feed_created_at'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='feed',
- name='univ',
- field=models.CharField(default=django.utils.timezone.now, max_length=15),
- preserve_default=False,
- ),
- ]
diff --git a/campics_/content/migrations/0011_remove_feed_created_at.py b/campics_/content/migrations/0011_remove_feed_created_at.py
deleted file mode 100644
index 17f8b920d16d78c2d223c6b19e99253a8da721bf..0000000000000000000000000000000000000000
--- a/campics_/content/migrations/0011_remove_feed_created_at.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-01 08:39
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('content', '0010_feed_univ'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='feed',
- name='created_at',
- ),
- ]
diff --git a/campics_/content/migrations/0012_feedview_feed_type_feed_views_and_more.py b/campics_/content/migrations/0012_feedview_feed_type_feed_views_and_more.py
deleted file mode 100644
index a1c273128c10f4faea0d391258365088b8c3ab9d..0000000000000000000000000000000000000000
--- a/campics_/content/migrations/0012_feedview_feed_type_feed_views_and_more.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-04 03:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('content', '0011_remove_feed_created_at'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='FeedView',
- fields=[
- ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('email', models.EmailField(max_length=100, verbose_name='email')),
- ('feed_id', models.IntegerField()),
- ],
- ),
- migrations.AddField(
- model_name='feed',
- name='type',
- field=models.BooleanField(default=False),
- ),
- migrations.AddField(
- model_name='feed',
- name='views',
- field=models.IntegerField(default=0),
- ),
- migrations.AddIndex(
- model_name='feedview',
- index=models.Index(fields=['email'], name='content_fee_email_a02fc8_idx'),
- ),
- ]
diff --git a/campics_/content/migrations/0013_rename_views_feed_view_count_feedview_is_view_and_more.py b/campics_/content/migrations/0013_rename_views_feed_view_count_feedview_is_view_and_more.py
deleted file mode 100644
index 0f53ca6a37f12c41120d20eff0b186ff4f29903b..0000000000000000000000000000000000000000
--- a/campics_/content/migrations/0013_rename_views_feed_view_count_feedview_is_view_and_more.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-04 06:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('content', '0012_feedview_feed_type_feed_views_and_more'),
- ]
-
- operations = [
- migrations.RenameField(
- model_name='feed',
- old_name='views',
- new_name='view_count',
- ),
- migrations.AddField(
- model_name='feedview',
- name='is_view',
- field=models.BooleanField(default=False),
- ),
- migrations.AlterField(
- model_name='feed',
- name='like_count',
- field=models.IntegerField(default=0),
- ),
- migrations.AlterField(
- model_name='feedview',
- name='email',
- field=models.CharField(blank=True, max_length=30, null=True),
- ),
- migrations.AddIndex(
- model_name='feedview',
- index=models.Index(fields=['feed_id'], name='content_fee_feed_id_0b2735_idx'),
- ),
- ]
diff --git a/campics_/content/urls.py b/campics_/content/urls.py
index 05f812bd6a96f33a4585b02d129f9f2b3c2b9007..eddfa34890108bb2510e16c7656f9fe744577902 100644
--- a/campics_/content/urls.py
+++ b/campics_/content/urls.py
@@ -1,5 +1,5 @@
from django.urls import path
-from .views import UploadFeed, CreateReply, LikeFeed, ViewFeed, BookmarkFeed, DeleteFeed, searchUniv, searchUser
+from .views import UploadFeed, LikeFeed, ViewFeed, DeleteFeed, searchUniv, searchUser
urlpatterns = [
@@ -7,8 +7,6 @@ urlpatterns = [
path('like', LikeFeed.as_view(), name='like'),
path('view', ViewFeed.as_view(), name='view'),
- path('bookmark', BookmarkFeed.as_view(), name='bookmark'),
-
## 시환님꺼
path('delete', DeleteFeed.as_view(), name='delete_feed'),
path('searchUniv', searchUniv.as_view(), name='seacrh_univ'),
diff --git a/campics_/content/views.py b/campics_/content/views.py
index 8b50b8839e75a2b47d12f1d079702fab250c51c8..953b6a2fe5a3871e210b1414384c146e868b2c85 100644
--- a/campics_/content/views.py
+++ b/campics_/content/views.py
@@ -1,6 +1,6 @@
from django.shortcuts import render
from rest_framework.views import APIView
-from content.models import Feed, Reply, FeedLike, FeedView, Bookmark
+from content.models import Feed, FeedLike, FeedView
from rest_framework.response import Response
from user.models import User, Univ
from rest_framework.response import Response
@@ -30,7 +30,6 @@ class UploadFeed(APIView):
Feed.objects.create(content=content, image=image, profile_image=profile_image, user_id=user_id, email=email, like_count=0, univ=univ)
return Response(status=200)
-
class LikeFeed(APIView):
def post(self, request):
feed_id = request.data.get('feed_id')
diff --git a/campics_/jinstagram/settings.py b/campics_/jinstagram/settings.py
index 0c5813da4e8222533f76e30593e2804229123bc4..413e24c3488e59324815285b06c1ad0c5392b73c 100644
--- a/campics_/jinstagram/settings.py
+++ b/campics_/jinstagram/settings.py
@@ -77,19 +77,18 @@ WSGI_APPLICATION = 'jinstagram.wsgi.application'
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.mysql',
- 'NAME': 'campics',
- 'USER': 'root',
- 'PASSWORD': '1101',
- 'HOST': 'localhost',
- 'PORT': '3306',
- }
# 'default': {
- # # 'ENGINE': 'django.db.backends.sqlite3',
- # # 'NAME': BASE_DIR / 'db.sqlite3',
- #
- # }
+ # 'ENGINE': 'django.db.backends.mysql',
+ # 'NAME': 'campics',
+ # 'USER': 'root',
+ # 'PASSWORD': '1101',
+ # 'HOST': 'localhost',
+ # 'PORT': '3306',
+ # }
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': BASE_DIR / 'db.sqlite3',
+ }
}
diff --git a/campics_/templates/jinstagram/imgboard.html b/campics_/templates/jinstagram/imgboard.html
index 65b98060f6fc4624165d6a28eb69d70a3bb1a065..a5a041ef9567163f2e8b5d34a80cc232499b4e65 100644
--- a/campics_/templates/jinstagram/imgboard.html
+++ b/campics_/templates/jinstagram/imgboard.html
@@ -350,7 +350,7 @@
</div>
- <div id="modal_add_feed_content" class="modal modal_overlay_content">
+ <div id="modal_add_feed_content" class="modal modal_overlay">
<div class="modal_window">
<div class="modal_title">
<div class="modal_title_side"></div>
diff --git a/campics_/user/migrations/0001_initial.py b/campics_/user/migrations/0001_initial.py
index 3f1ec9bd087bddbd6333dbe89621e8ad10a0ab25..eb8776a4d80abe4995143bf0d39a098f4c219803 100644
--- a/campics_/user/migrations/0001_initial.py
+++ b/campics_/user/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.4 on 2022-05-31 14:31
+# Generated by Django 4.0.4 on 2022-06-05 08:43
from django.db import migrations, models
@@ -21,17 +21,44 @@ class Migration(migrations.Migration):
('email', models.EmailField(blank=True, max_length=100, null=True, unique=True, verbose_name='email')),
('user_id', models.CharField(blank=True, max_length=30, null=True)),
('thumbnail', models.CharField(blank=True, default='default_profile.jpg', max_length=256, null=True)),
- ('univ', models.CharField(max_length=30)),
+ ('univ', models.CharField(max_length=15)),
],
options={
'db_table': 'users',
},
),
+ migrations.CreateModel(
+ name='Follow',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('follower', models.EmailField(max_length=100, verbose_name='email')),
+ ('following', models.EmailField(max_length=100, verbose_name='email')),
+ ('is_live', models.BooleanField(default=False)),
+ ],
+ options={
+ 'db_table': 'follow',
+ },
+ ),
migrations.CreateModel(
name='Univ',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('univ', models.CharField(max_length=30)),
+ ('univ', models.CharField(max_length=15)),
],
+ options={
+ 'db_table': 'univ',
+ },
+ ),
+ migrations.AddIndex(
+ model_name='follow',
+ index=models.Index(fields=['follower'], name='follow_followe_227ce4_idx'),
+ ),
+ migrations.AddIndex(
+ model_name='follow',
+ index=models.Index(fields=['following'], name='follow_followi_9fea95_idx'),
+ ),
+ migrations.AddConstraint(
+ model_name='follow',
+ constraint=models.UniqueConstraint(fields=('follower', 'following'), name='follower-following'),
),
]
diff --git a/campics_/user/migrations/0007_univ.py b/campics_/user/migrations/0007_univ.py
deleted file mode 100644
index 9667105e4bd00c15b81463ee2301fd0c1e281bbf..0000000000000000000000000000000000000000
--- a/campics_/user/migrations/0007_univ.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-01 02:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('user', '0006_auto_20211014_1134'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Univ',
- fields=[
- ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('univ', models.CharField(max_length=15)),
- ],
- options={
- 'db_table': 'univ',
- },
- ),
- ]
diff --git a/campics_/user/migrations/0008_user_univ.py b/campics_/user/migrations/0008_user_univ.py
deleted file mode 100644
index b24aa889978061587391fd8abcc313f81d2b9dd3..0000000000000000000000000000000000000000
--- a/campics_/user/migrations/0008_user_univ.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 4.0.4 on 2022-06-01 07:43
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('user', '0007_univ'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='user',
- name='univ',
- field=models.CharField(default=django.utils.timezone.now, max_length=15),
- preserve_default=False,
- ),
- ]