Merge branch 'devdev' into feature/sponsors

# Conflicts:
#	pyconweb2022/pyconweb2022/settings.py

Author: golony6449

.github/workflows/front_deploy_on_dev.yml

@@ -50,7 +50,7 @@ jobs:
 
         - run: yarn install
 
-        - run: npm install [email protected]
+        - run: yarn add [email protected]
 
         - run: npm install -g env-cmd
 

.gitignore

@@ -130,6 +130,12 @@ dmypy.json
 /.idea/
 /requirements_dev.txt
 
+# Migrations
+/pyconweb2022/sponsor/migrations/
+/pyconweb2022/program/migrations/
+/pyconweb2022/pyconemailer/migrations/
+/pyconweb2022/content/migrations/
+
 # to use pyconkr-secrets
 /pyconweb2022/zappa_settings.json
 

frontend/package.json

@@ -13,6 +13,7 @@
     "@mdi/js": "^6.7.96",
     "@mdi/react": "^1.6.0",
     "@sls-next/serverless-component": "^3.7.0",
+    "@types/react": "18.0.1",
     "axios": "^0.27.2",
     "babel-plugin-styled-components": "^2.0.6",
     "env-cmd": "^10.1.0",
@@ -27,21 +28,30 @@
     "react-markdown": "^8.0.3",
     "remark-gfm": "^3.0.1",
     "serverless": "^2.72.3",
-    "styled-components": "^5.3.3"
+    "styled-components": "^5.3.3",
+    "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@serverless/typescript": "^3.15.2",
-    "@types/next-seo": "^2.1.2",
-    "@types/node": "17.0.21",
-    "@types/react": "17.0.41",
-    "@typescript-eslint/eslint-plugin": "^5.16.0",
-    "@typescript-eslint/parser": "^5.16.0",
-    "eslint": "8.11.0",
-    "eslint-config-next": "12.1.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "prettier": "^2.6.0",
-    "raw-loader": "^4.0.2",
-    "typescript": "4.6.2"
+    "@mdi/font": "^6.7.96",
+    "@mdi/js": "^6.7.96",
+    "@mdi/react": "^1.6.0",
+    "@sls-next/serverless-component": "^3.7.0",
+    "@types/react": "18.0.1",
+    "axios": "^0.27.2",
+    "babel-plugin-styled-components": "^2.0.6",
+    "env-cmd": "^10.1.0",
+    "gray-matter": "^4.0.3",
+    "i18next": "^21.6.14",
+    "ms": "^2.1.3",
+    "next": "12.1.0",
+    "next-seo": "^5.4.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-i18next": "^11.16.1",
+    "react-markdown": "^8.0.3",
+    "remark-gfm": "^3.0.1",
+    "serverless": "^2.72.3",
+    "styled-components": "^5.3.3",
+    "typescript": "^4.7.4"
   }
 }

frontend/yarn.lock

@@ -8,11 +8,20 @@
 class ContentSerializer(serializers.ModelSerializer):
     created_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S")
     # SerializerMethodField: https://ssungkang.tistory.com/entry/Django-Serializer-Custom-Field-SerializerMethodField
-    # content = serializers.SerializerMethodField()
-    # eng_content = serializers.SerializerMethodField()
-    content = serializers.CharField()
-    eng_content = serializers.CharField()
+    content = serializers.SerializerMethodField()
+
+    def get_content(self, obj):
+        context = dict()
+        context["content"] = obj.content
+
+        # html_template = Template(
+        #     render_to_string("markdown.html", context)
+        # )  # 마크다운 렌더링
+
+        html_template = loader.get_template("markdown.html")
+
+        return html_template.render(context)
 
     class Meta:
         model = Content
-        fields = ["slug", "title", "content", "eng_content", "created_at"]
+        fields = ["slug", "title", "content", "created_at"]

pyconweb2022/content/serializers.py

@@ -1,3 +1,17 @@
 from django.contrib import admin
 
-# Register your models here.
+from news.models import News
+
+
+class NewsAdmin(admin.ModelAdmin):
+    app_label = "News"
+    list_display = (
+        "id",
+        "title",
+        "visible_at",
+        "created_at",
+        "updated_at",
+    )
+
+
+admin.site.register(News, NewsAdmin)

pyconweb2022/news/admin.py

@@ -12,6 +12,8 @@ class News(models.Model):
 
     class Meta:
         app_label = "news"
+        verbose_name = "news"
+        verbose_name_plural = "news"
 
     def __str__(self):
         return self.title

pyconweb2022/news/models.py

@@ -1,23 +1,13 @@
-from rest_framework import mixins, viewsets
-from rest_framework.permissions import IsAuthenticatedOrReadOnly
+from datetime import datetime, timezone, timedelta
 
-from .models import News
+from rest_framework import viewsets
 
+from .models import News
 from .serializers import NewsSerializer
 
 
-class NewsViewSet(
-    mixins.CreateModelMixin,
-    mixins.RetrieveModelMixin,
-    mixins.UpdateModelMixin,
-    mixins.DestroyModelMixin,
-    viewsets.GenericViewSet,
-):
+class NewsViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = NewsSerializer
-    permission_class = (IsAuthenticatedOrReadOnly,)
-
-    def get_queryset(self):
-        return News.objects.all()
-
-    def get_object(self):
-        return News.objects.filter(id=self.kwargs["pk"]).first()
+    queryset = News.objects.filter(
+        visible_at__lte=datetime.now(tz=timezone(timedelta(hours=9)))
+    )

pyconweb2022/news/viewsets.py

@@ -12,7 +12,7 @@ class ProposalViewSet(ReadOnlyModelViewSet):
     permission_classes = [AllowAny]
 
 
-class ProposalDetailViewSet(ModelViewSet):
+class ProposalDetailViewSet(ReadOnlyModelViewSet):
     queryset = Proposal.objects.none()  # 각 Viewset 메서드에서 쿼리셋 작성
     serializer_class = ProposalDetailSerializer
     permission_classes = [IsAuthenticated]  # TODO: DjangoModelPermission 적용

pyconweb2022/program/viewsets.py

@@ -47,6 +47,7 @@
     "content",
     "zappa_django_utils",
     "martor",
+    "drf_spectacular",
 ]
 
 MIDDLEWARE = [
@@ -123,7 +124,7 @@
 
 USE_I18N = True
 
-# USE_TZ = True
+USE_TZ = False
 
 
 # Static files (CSS, JavaScript, Images)
@@ -146,7 +147,8 @@
 REST_FRAMEWORK = {
     "DEFAULT_PERMISSION_CLASSES": [
         "rest_framework.permissions.IsAuthenticated",
-    ]
+    ],
+    "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
 }
 
 # Amazon SES