From 5b22513419053782cb9a608c83031f51c5b850a1 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Wed, 2 Mar 2022 06:37:37 +0000
Subject: [PATCH] resolve conflict: whiel rebase on master

---
 ...0302_1413.py => 0014_auto_20220302_1508.py} |  4 ++--
 .../migrations/0015_submission_title.py        | 18 ------------------
 ...de_length.py => 0017_auto_20220302_1508.py} |  9 +++++++--
 backend/submission/urls.py                     |  2 +-
 frontend/src/pages/oj/router/routes.js         |  3 +--
 frontend/src/pages/oj/views/index.js           |  2 +-
 6 files changed, 12 insertions(+), 26 deletions(-)
 rename backend/contest/migrations/{0013_auto_20220302_1413.py => 0014_auto_20220302_1508.py} (92%)
 delete mode 100644 backend/submission/migrations/0015_submission_title.py
 rename backend/submission/migrations/{0014_submission_code_length.py => 0017_auto_20220302_1508.py} (54%)

diff --git a/backend/contest/migrations/0013_auto_20220302_1413.py b/backend/contest/migrations/0014_auto_20220302_1508.py
similarity index 92%
rename from backend/contest/migrations/0013_auto_20220302_1413.py
rename to backend/contest/migrations/0014_auto_20220302_1508.py
index 5727aedff..e77580b74 100644
--- a/backend/contest/migrations/0013_auto_20220302_1413.py
+++ b/backend/contest/migrations/0014_auto_20220302_1508.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.12 on 2022-03-02 05:13
+# Generated by Django 3.2.12 on 2022-03-02 06:08
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('contest', '0012_rename_total_score_acmcontestrank_total_penalty'),
+        ('contest', '0013_contestannouncement_problem'),
     ]
 
     operations = [
diff --git a/backend/submission/migrations/0015_submission_title.py b/backend/submission/migrations/0015_submission_title.py
deleted file mode 100644
index d73d95187..000000000
--- a/backend/submission/migrations/0015_submission_title.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-02-11 07:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submission', '0014_submission_code_length'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='submission',
-            name='title',
-            field=models.TextField(null=True),
-        ),
-    ]
diff --git a/backend/submission/migrations/0014_submission_code_length.py b/backend/submission/migrations/0017_auto_20220302_1508.py
similarity index 54%
rename from backend/submission/migrations/0014_submission_code_length.py
rename to backend/submission/migrations/0017_auto_20220302_1508.py
index 5a0cc7eef..a4a912204 100644
--- a/backend/submission/migrations/0014_submission_code_length.py
+++ b/backend/submission/migrations/0017_auto_20220302_1508.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.12 on 2022-02-10 10:37
+# Generated by Django 3.2.12 on 2022-03-02 06:08
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('submission', '0013_auto_20211030_1535'),
+        ('submission', '0016_auto_20211226_1458'),
     ]
 
     operations = [
@@ -15,4 +15,9 @@ class Migration(migrations.Migration):
             name='code_length',
             field=models.IntegerField(default=0),
         ),
+        migrations.AddField(
+            model_name='submission',
+            name='title',
+            field=models.TextField(null=True),
+        ),
     ]
diff --git a/backend/submission/urls.py b/backend/submission/urls.py
index 6527232df..dd88cac4a 100644
--- a/backend/submission/urls.py
+++ b/backend/submission/urls.py
@@ -2,7 +2,7 @@
 
 from .views import (SubmissionAPI, SubmissionListAPI, ContestSubmissionListAPI, AssignmentSubmissionListAPI,
                     AssignmentSubmissionListProfessorAPI, SubmissionExistsAPI, EditSubmissionScoreAPI)
-from .views import ProfileSubmissionListAPI, SubmissionAPI, SubmissionListAPI, ContestSubmissionListAPI, SubmissionExistsAPI
+from .views import ProfileSubmissionListAPI
 
 urlpatterns = [
     path("submission/", SubmissionAPI.as_view(), name="submission_api"),
diff --git a/frontend/src/pages/oj/router/routes.js b/frontend/src/pages/oj/router/routes.js
index 5ca922348..c2b99e860 100644
--- a/frontend/src/pages/oj/router/routes.js
+++ b/frontend/src/pages/oj/router/routes.js
@@ -22,8 +22,7 @@ import {
   LectureAssignmentDetail,
   LectureQna,
   LectureQnaDetail,
-  Profile,
-  ProfileContest
+  Profile
 } from '../views'
 
 export default [
diff --git a/frontend/src/pages/oj/views/index.js b/frontend/src/pages/oj/views/index.js
index 2074b4e6f..5ba68ebbf 100644
--- a/frontend/src/pages/oj/views/index.js
+++ b/frontend/src/pages/oj/views/index.js
@@ -34,7 +34,7 @@ export {
   ApplyResetPassword, ResetPassword, EmailAuth, ProfileSetting,
   ContestList, ContestDetail, ContestProblemList, ContestRanking, Register,
   LectureList, LectureDashboard, LectureAssignmentList, LectureAssignmentDetail, LectureQna, LectureQnaDetail,
-  Profile, ProfileContest
+  Profile
 }
 /* 구성 요소 내보내기는 두 가지 범주로 나뉩니다.
  *   하나는 일반적으로 직접 내보내기에 사용되며