Merge pull request #344 from boostcampwm-2022/dev

실서버에 0.2.0 버전을 배포합니다.

.github/workflows/dev-scheduler-server-deploy.yml

@@ -0,0 +1,46 @@
+name: "Dev Scheduler Server Auto Deploy"
+on:
+  push: # dev 브랜치 & scheduler-server 경로에 push가 일어났을 때 발생한다
+    branches:
+      - dev
+    paths:
+      - "scheduler-server/**"
+  workflow_dispatch: # POST 요청 및 버튼 클릭 등 임의 (수동) 실행
+
+jobs:
+  deployment:
+    name: deployment
+    runs-on: ubuntu-18.04
+    defaults:
+      run:
+        working-directory: scheduler-server
+    steps: # job 구동 과정
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+
+      - name: Build and Push Docker Image # 도커 허브에 이미지 push
+        uses: docker/build-push-action@v3
+        with:
+          context: ./scheduler-server
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/weview-scheduler-dev:latest
+
+      - name: Deploy with SSH
+        uses: appleboy/ssh-action@master
+        with: # 도커파일의 위치는 weview/server 위치 변경할지 고민해보기.
+          host: ${{ secrets.DEV_NCLOUD_HOST }}
+          username: ${{ secrets.DEV_NCLOUD_USERNAME }}
+          password: ${{ secrets.DEV_NCLOUD_PASSWORD }}
+          port: ${{ secrets.DEV_NCLOUD_PORT }}
+          script: |
+            cd /home/weview/server && docker compose pull
+            cd /home/weview/server && docker compose up --detach

.github/workflows/main-scheduler-server-deploy.yml

@@ -0,0 +1,47 @@
+name: "Main Scheduler Server Auto Deploy"
+on:
+  push:
+    tags:
+      - "v*"
+    paths:
+      - "scheduler-server/**"
+  workflow_dispatch:
+jobs:
+  deployment:
+    name: deployment
+    runs-on: ubuntu-18.04
+    defaults:
+      run:
+        working-directory: scheduler-server
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./scheduler-server
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/weview-scheduler-main:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/weview-scheduler-main:${{github.ref_name}}
+
+      - name: Deploy with SSH
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.MAIN_NCLOUD_HOST }}
+          username: ${{ secrets.MAIN_NCLOUD_USERNAME }}
+          password: ${{ secrets.MAIN_NCLOUD_PASSWORD }}
+          port: ${{ secrets.MAIN_NCLOUD_PORT }}
+          script: |
+            cd /home/weview/server && docker compose pull
+            cd /home/weview/server && docker compose up --detach

.github/workflows/scheduler-server-integration.yml

@@ -0,0 +1,33 @@
+name: "Scheduler Server Test Build (Pull Request)"
+
+on:
+  pull_request:
+    branches: ["main", "dev"]
+    paths:
+      - "scheduler-server/**"
+  workflow_dispatch:
+
+jobs:
+  integration: # 식별자
+    name: integration #이름
+    runs-on: ubuntu-18.04 # Job 구동되는 환경 명시
+    defaults:
+      run:
+        working-directory: scheduler-server
+    steps: # job 구동 과정
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Use Node JS
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16.x"
+
+      - name: Install npm
+        run: npm ci
+
+      - name: Test
+        run: npm test
+
+      - name: Build Files
+        run: npm run build

client/.stylelintrc.json

@@ -1,5 +1,8 @@
 {
   "plugin": ["stylelint-prettier"],
+  "rules": {
+    "selector-class-pattern": null
+  },
   "extends": [
     "stylelint-config-sass-guidelines",
     "stylelint-config-prettier",

client/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WeView | 함께하는 코드리뷰 커뮤니티</title>
   </head>

client/src/App.scss

@@ -1,8 +1,19 @@
 // fonts
 @import url("https://webfontworld.github.io/gmarket/GmarketSans.css");
+/*
+ * D2 coding (Korean) http://dev.naver.com/projects/d2coding/
+ */
+@font-face {
+  font-family: "D2Coding";
+  font-style: normal;
+  font-weight: normal;
+  src: url("https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/D2Coding.woff")
+    format("woff");
+}
+
 // pages
-@import "@/styles/_global-style";
-@import "@/styles/_theme";
+@import "@/styles/global-style";
+@import "@/styles/theme";
 
 html,
 body {

client/src/App.tsx

@@ -6,11 +6,12 @@ import { queryClient } from "@/react-query/queryClient";
 import { isEmpty } from "@/utils/typeCheck";
 import ReactRouter from "@/ReactRouter";
 import CommonModalWrapper from "@/components/main/Modal/ModalWrapper/CommonModalWrapper";
-import OtherModalWrapper from "@/components/main/Modal/ModalWrapper/OtherModalWrapper";
+import { useRefreshInterceptor } from "@/hooks/useRefreshInterceptor";
 
 import "./App.scss";
 
 function App(): JSX.Element {
+  useRefreshInterceptor();
   const queryClientRef = useRef<QueryClient>();
   if (isEmpty(queryClientRef.current)) {
     // current 값이 null 값일 때 변경이 발생하더라도 재렌더링이 일어나지 않기 위해 useRef 사용
@@ -20,7 +21,6 @@ function App(): JSX.Element {
     <QueryClientProvider client={queryClient}>
       <ReactRouter />
       <CommonModalWrapper />
-      <OtherModalWrapper />
       <ReactQueryDevtools initialIsOpen={false} />
     </QueryClientProvider>
   );

client/src/ReactRouter.tsx

@@ -3,6 +3,7 @@ import React from "react";
 
 import LoginCallback from "@/pages/LoginCallback/LoginCallback";
 import Main from "@/pages/Main/Main";
+import Post from "@/pages/Post/Post";
 
 const ReactRouter = (): React.ReactElement => {
   const router = createBrowserRouter([
@@ -14,6 +15,10 @@ const ReactRouter = (): React.ReactElement => {
       path: "/redirect/github",
       element: <LoginCallback />,
     },
+    {
+      path: "/post/:postId",
+      element: <Post />,
+    },
   ]);
 
   return <RouterProvider router={router} />;

client/src/apis/auth.ts

@@ -1,6 +1,4 @@
-import axios from "axios";
-
-import { AccessTokenInfo, MyInfo, PreSignedData } from "@/types/auth";
+import { MyInfo, PreSignedData } from "@/types/auth";
 import { API_SERVER_URL } from "@/constants/env";
 
 import axiosInstance from "./axios";
@@ -10,11 +8,6 @@ export const githubLogInAPI = async (code: string): Promise<MyInfo> => {
   return data;
 };
 
-export const tokenRefreshAPI = async (): Promise<AccessTokenInfo> => {
-  const { data } = await axios.get(`${API_SERVER_URL}/auth/refresh`);
-  return data;
-};
-
 export const logOutAPI = async (): Promise<void> => {
   await axiosInstance.delete("/auth/logout");
 };

client/src/apis/axios.ts

@@ -2,11 +2,6 @@ import axios, { AxiosRequestConfig } from "axios";
 
 import { API_SERVER_URL } from "@/constants/env";
 
-import {
-  refreshErrorHandler,
-  refreshInterceptor,
-} from "./interceptors/refresh";
-
 const axiosConfig: AxiosRequestConfig = {
   baseURL: API_SERVER_URL,
   timeout: 10000,
@@ -15,6 +10,4 @@ const axiosConfig: AxiosRequestConfig = {
 
 const axiosInstance = axios.create(axiosConfig);
 
-axiosInstance.interceptors.request.use(refreshInterceptor, refreshErrorHandler);
-
 export default axiosInstance;

client/src/apis/bookmark.ts

@@ -0,0 +1,11 @@
+import axiosInstance from "@/apis/axios";
+
+export const addBookmarkPost = async (postId: string): Promise<void> => {
+  await axiosInstance.post(`/bookmarks`, {
+    postId,
+  });
+};
+
+export const removeBookmarkPost = async (postId: string): Promise<void> => {
+  await axiosInstance.delete(`/bookmarks?postId=${postId}`);
+};