Skip to content

Commit 52f8cf2

Browse files
authored
Merge pull request #70 from golony6449/main
Viewset에서 상속받는 Parent 수정 및 DEV 배포 중 발생하는 오류 수정
2 parents 44c81a0 + 92b0334 commit 52f8cf2

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

.github/workflows/front_deploy_on_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
- run: yarn install
5252

53-
- run: npm install [email protected]
53+
- run: yarn add [email protected]
5454

5555
- run: npm install -g env-cmd
5656

frontend/package.json

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,24 @@
3030
"styled-components": "^5.3.3"
3131
},
3232
"devDependencies": {
33-
"@serverless/typescript": "^3.15.2",
34-
"@types/next-seo": "^2.1.2",
35-
"@types/node": "17.0.21",
36-
"@types/react": "17.0.41",
37-
"@typescript-eslint/eslint-plugin": "^5.16.0",
38-
"@typescript-eslint/parser": "^5.16.0",
39-
"eslint": "8.11.0",
40-
"eslint-config-next": "12.1.0",
41-
"eslint-config-prettier": "^8.5.0",
42-
"eslint-plugin-prettier": "^4.0.0",
43-
"prettier": "^2.6.0",
44-
"raw-loader": "^4.0.2",
45-
"typescript": "4.6.2"
33+
"@mdi/font": "^6.7.96",
34+
"@mdi/js": "^6.7.96",
35+
"@mdi/react": "^1.6.0",
36+
"@sls-next/serverless-component": "^3.7.0",
37+
"axios": "^0.27.2",
38+
"babel-plugin-styled-components": "^2.0.6",
39+
"env-cmd": "^10.1.0",
40+
"gray-matter": "^4.0.3",
41+
"i18next": "^21.6.14",
42+
"ms": "^2.1.3",
43+
"next": "12.1.0",
44+
"next-seo": "^5.4.0",
45+
"react": "17.0.2",
46+
"react-dom": "17.0.2",
47+
"react-i18next": "^11.16.1",
48+
"react-markdown": "^8.0.3",
49+
"remark-gfm": "^3.0.1",
50+
"serverless": "^2.72.3",
51+
"styled-components": "^5.3.3"
4652
}
4753
}

pyconweb2022/program/viewsets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ProposalViewSet(ReadOnlyModelViewSet):
1212
permission_classes = [AllowAny]
1313

1414

15-
class ProposalDetailViewSet(ModelViewSet):
15+
class ProposalDetailViewSet(ReadOnlyModelViewSet):
1616
queryset = Proposal.objects.none() # 각 Viewset 메서드에서 쿼리셋 작성
1717
serializer_class = ProposalDetailSerializer
1818
permission_classes = [IsAuthenticated] # TODO: DjangoModelPermission 적용

pyconweb2022/sponsor/viewsets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
from django.shortcuts import get_object_or_404
22
from django.core.exceptions import PermissionDenied
33

4-
from rest_framework.viewsets import ModelViewSet
4+
from rest_framework.viewsets import ModelViewSet, ReadOnlyModelViewSet
55
from rest_framework.permissions import IsAuthenticatedOrReadOnly, AllowAny
66
from rest_framework.response import Response
77

88
from sponsor.serializers import SponsorSerializer, SponsorListSerializer
99
from sponsor.models import Sponsor
1010

1111

12-
class SponsorViewSet(ModelViewSet):
12+
class SponsorViewSet(ReadOnlyModelViewSet):
1313
serializer_class = SponsorSerializer
1414
permission_classes = [IsAuthenticatedOrReadOnly] # 로그인된 사용자에게만 허용
1515

0 commit comments

Comments
 (0)