resolve conflict: whiel rebase on master

skkuding · Apr 1, 2022 · 5b22513 · 5b22513
1 parent 148ce9a
commit 5b22513
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 26 deletions.
diff --git a/...est/migrations/0013_auto_20220302_1413.py → ...est/migrations/0014_auto_20220302_1508.py b/...est/migrations/0013_auto_20220302_1413.py → ...est/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
diff --git a/...migrations/0014_submission_code_length.py → ...ion/migrations/0017_auto_20220302_1508.py b/...migrations/0014_submission_code_length.py → ...ion/migrations/0017_auto_20220302_1508.py
@@ -1,12 +1,12 @@
-# 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
 
 
 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
@@ -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
@@ -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
@@ -34,7 +34,7 @@ export {
   ApplyResetPassword, ResetPassword, EmailAuth, ProfileSetting,
   ContestList, ContestDetail, ContestProblemList, ContestRanking, Register,
   LectureList, LectureDashboard, LectureAssignmentList, LectureAssignmentDetail, LectureQna, LectureQnaDetail,
-  Profile, ProfileContest
+  Profile
 }
 /* 구성 요소 내보내기는 두 가지 범주로 나뉩니다.
  *   하나는 일반적으로 직접 내보내기에 사용되며