Skip to content

Commit 7c347be

Browse files
authored
Merge pull request #51 from pythonkr/devdev
운영 배포
2 parents 6613c38 + 9b65283 commit 7c347be

24 files changed

+223
-30
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @pythonkr/PyConKR-2023

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
### 목표
22
*
33

4-
### 작업내용
4+
### 작업 내용
55
*
66

7-
### 유의사항
8-
* 리뷰어는 `PyConKR-2023`지정 해 주세요.
7+
### 유의 사항
8+
* 리뷰어는 `PyConKR-2023`지정해주세요.
99
* 작업한 내용을 상세하게 작성해주세요.

.github/workflows/deploy_on_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- uses: psf/black@stable
1919
with:
20-
options: "--check --verbose --exclude migrations"
20+
options: "--check --verbose"
2121

2222
- name: Set up Python ${{ matrix.python-version }}
2323
uses: actions/setup-python@v2

.github/workflows/deploy_on_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: psf/black@stable
1818
with:
19-
options: "--check --verbose --exclude migrations"
19+
options: "--check --verbose"
2020

2121
- name: Set up Python ${{ matrix.python-version }}
2222
uses: actions/setup-python@v2

.github/workflows/pull-request-merge-precondition.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222

2323
- uses: psf/black@stable
2424
with:
25-
options: "--check --verbose --exclude migrations"
25+
options: "--check --verbose"
2626

2727
- uses: isort/isort-action@master
2828
with:
29-
configuration: "--check-only --diff --profile black"
29+
configuration: "--check-only --diff"
3030
requirementsFiles: "requirements.txt"
3131

3232
- name: install dependencies

program/__init__.py

Whitespace-only changes.

program/admin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from django.contrib import admin
2+
3+
# Register your models here.

program/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class ProgramConfig(AppConfig):
5+
default_auto_field = "django.db.models.BigAutoField"
6+
name = "program"

program/migrations/__init__.py

Whitespace-only changes.

program/models.py

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
from django.contrib.auth import get_user_model
2+
from django.db import models
3+
4+
User = get_user_model()
5+
6+
7+
class ProposalCategory(models.Model):
8+
name = models.CharField(max_length=100, db_index=True)
9+
visible = models.BooleanField(default=True)
10+
11+
def __str__(self):
12+
return self.name
13+
14+
15+
class Proposal(models.Model):
16+
user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
17+
18+
title = models.CharField(max_length=255)
19+
brief = models.TextField(max_length=1000, help_text="리뷰용: 발표에 대한 간단한 설명.")
20+
desc = models.TextField(max_length=4000, help_text="리뷰용: 발표에 대한 자세한 설명")
21+
comment = models.TextField(
22+
max_length=4000, null=True, blank=True, help_text="리뷰용: 파준위에게 전하고 싶은 말"
23+
)
24+
25+
difficulty = models.CharField(
26+
max_length=15,
27+
choices=(
28+
("BEGINNER", "Beginner"),
29+
("INTERMEDIATE", "Intermediate"),
30+
("EXPERIENCED", "Experienced"),
31+
),
32+
)
33+
34+
duration = models.CharField(
35+
max_length=15,
36+
choices=(
37+
("SHORT", "25min"),
38+
("LONG", "40min"),
39+
),
40+
)
41+
42+
language = models.CharField(
43+
max_length=15,
44+
choices=(
45+
("", "---------"),
46+
("KOREAN", "Korean"),
47+
("ENGLISH", "English"),
48+
),
49+
default="",
50+
)
51+
52+
category = models.ForeignKey(
53+
ProposalCategory,
54+
on_delete=models.SET_DEFAULT,
55+
null=True,
56+
blank=True,
57+
default=14,
58+
)
59+
accepted = models.BooleanField(default=False)
60+
introduction = models.TextField(
61+
max_length=2000,
62+
null=True,
63+
blank=True,
64+
help_text="발표 소개 페이지에 들어가는 내용입니다. 변경 사항은 최대 60분 이내에 적용됩니다.",
65+
)
66+
video_url = models.CharField(
67+
max_length=255, null=True, blank=True, help_text="발표 영상 URL"
68+
)
69+
slide_url = models.CharField(
70+
max_length=255, null=True, blank=True, help_text="발표 자료 URL"
71+
)
72+
room_num = models.CharField(
73+
max_length=15,
74+
null=True,
75+
blank=True,
76+
help_text="발표장소",
77+
choices=(
78+
("101", "101"),
79+
("102", "102"),
80+
("103", "103"),
81+
("104", "104"),
82+
("105", "105"),
83+
),
84+
)
85+
created_at = models.DateTimeField(auto_now_add=True)
86+
updated_at = models.DateTimeField(auto_now=True)
87+
88+
def __str__(self):
89+
return self.title

0 commit comments

Comments
 (0)