dev release

.github/workflows/web-client-deploy-development.yml

@@ -11,28 +11,27 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # TODO: 패키지 구조 변경 및 s3 배포에 따라 변경해야함
-      # - uses: actions/setup-node@v4
-      #   with:
-      #     node-version: '20'
-      #     cache: 'yarn'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'yarn'
+          # @see https://github.com/cypress-io/github-action#yarn-modern
+          cache-dependency-path: ./yarn.lock
 
-      # - name: build
-      #   run: |
-      #     rm ./apps/web/.env && mv ./apps/web/.env.dev ./apps/web/.env
-      #     yarn set version 3.8.1
-      #     yarn install --immutable --immutable-cache
-      #     yarn web codegen
-      #     yarn web build
+      - name: build
+        run: |
+          rm ./websites/poolc.org/.env && mv ./websites/poolc.org/.env.dev ./websites/poolc.org/.env
+          yarn set version 4.9.2
+          yarn install --immutable
+          yarn workspace @dialga/poolc.org build
 
-      # - name: scp
-      #   uses: appleboy/scp-action@v0.1.7
-      #   with:
-      #     host: ${{ secrets.SSH_HOST }}
-      #     username: ${{ secrets.SSH_USERNAME }}
-      #     key: ${{ secrets.SSH_PEM_KEY }}
-      #     port: ${{ secrets.SSH_PORT }}
-      #     source: ./apps/web/build/*
-      #     # TODO: 패키지 구조 변경에 따라 target 디렉토리도 변경해야함
-      #     target: ~/dialga/apps/web-client/build
-      #     strip_components: 3
+      - name: scp
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_PEM_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          source: ./websites/poolc.org/build/*
+          target: ~/k8s/dialga/build
+          strip_components: 3

.nvmrc

@@ -0,0 +1 @@
+v20.19.3

websites/poolc.org/.env

@@ -1,3 +1,3 @@
-VITE_API_BASE_URL=https://api.poolc.org
-VITE_FILE_URL=https://api.poolc.org
+VITE_API_BASE_URL=https://dev.poolc.org/api
+VITE_FILE_URL=https://dev.poolc.org/api
 VITE_MAX_FILE_SIZE=50000000 # 50mb

websites/poolc.org/package.json

@@ -10,7 +10,7 @@
     "sync:type": "yarn dlx typesync",
     "check:type": "tsc",
     "check:type:watch": "yarn check:type --watch",
-    "codegen": "openapi -i https://api.poolc.org/v2/api-docs -o src/lib/api-v2/__generated__ --useUnionTypes --useOptions -c axios",
+    "codegen": "dotenv -e ./.env -- bash -c 'openapi -i $VITE_API_BASE_URL/v2/api-docs -o src/lib/api-v2/__generated__ --useUnionTypes --useOptions -c axios'",
     "postinstall": "yarn codegen",
     "lint": "eslint . && prettier . --check --ignore-path .gitignore",
     "format": "eslint . --fix && prettier . --write --ignore-path .gitignore"
@@ -20,6 +20,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.15.3",
+    "dotenv-cli": "^10.0.0",
     "eslint": "^8.57.0",
     "openapi-typescript-codegen": "^0.28.0",
     "prettier": "^3.1.1",

websites/poolc.org/src/components/header/Menus/Menus.tsx

@@ -75,6 +75,11 @@ const Menus = ({
       visible: isLogin,
       content: 'Room',
     },
+    {
+      to: `/${MENU.MY_PAGE}#pks`,
+      visible: isLogin,
+      content: 'K8s',
+    },
     {
       to: `/${MENU.APPLY}`,
       visible: !isLogin || (isLogin && !isAuthorizedRole(role)),

websites/poolc.org/src/components/header/Notification/Notification.tsx

@@ -222,7 +222,7 @@ export default function Notification() {
 
   return (
     <div>
-      <Dropdown menu={{ items: dropDownItems }} dropdownRender={Menu}>
+      <Dropdown menu={{ items: dropDownItems }} popupRender={Menu}>
         <Button shape="circle" className={styles.dropdownButton}>
           <Space size="large" className={styles.dropdownShape}>
             <Badge count={data.unreadCount ?? 0}>

websites/poolc.org/src/components/home/HomeEntry.tsx

@@ -3,7 +3,7 @@ import Carousel from '~/components/home/Carousel';
 import RecentNotice from '~/components/home/RecentNotice';
 import RecentProject from '~/components/home/RecentProject';
 import { useAppSelector } from '~/hooks/useAppSelector';
-import { PoolcControllerService, PostControllerService, ProjectControllerService, queryKey, useAppSuspeneseQueries } from '~/lib/api-v2';
+import { PoolcControllerService, PostControllerService, ProjectControllerService, queryKey, useAppSuspenseQueries } from '~/lib/api-v2';
 import { getBoardTitleForRequest } from '~/lib/utils/boardUtil';
 import ApplyBanner from '~/components/home/ApplyBanner';
 
@@ -20,7 +20,7 @@ const useStyles = createStyles(({ css }) => ({
 export default function HomeEntry() {
   const { styles } = useStyles();
 
-  const [{ data: poolcInfo }, { data: projectInfo }, { data: noticeInfo }] = useAppSuspeneseQueries({
+  const [{ data: poolcInfo }, { data: projectInfo }, { data: noticeInfo }] = useAppSuspenseQueries({
     queries: [
       {
         queryKey: queryKey.poolc.poolc,

websites/poolc.org/src/components/members/MemberDetail/MemberDetailContent.tsx

@@ -20,12 +20,12 @@ import {
   ActivityContainer,
   Activities,
 } from './MemberDetailContent.styles';
-import { ConversationControllerService, MemberControllerService, MemberResponse, queryKey, useAppMutation, useAppSuspeneseQueries } from '~/lib/api-v2';
+import { ConversationControllerService, MemberControllerService, MemberResponse, queryKey, useAppMutation, useAppSuspenseQueries } from '~/lib/api-v2';
 import { MENU } from '~/constants/menus';
 
 export default function MemberDetailContent({ loginId }: { loginId: string }) {
   const history = useHistory();
-  const [{ data: _member }, { data: me }] = useAppSuspeneseQueries({
+  const [{ data: _member }, { data: me }] = useAppSuspenseQueries({
     queries: [
       {
         queryKey: queryKey.member.id(loginId),
@@ -96,7 +96,9 @@ export default function MemberDetailContent({ loginId }: { loginId: string }) {
       <ActivityContainer>
         <h2>참여 활동</h2>
         <Activities>
-          {member.projects?.map((project) => <ProjectCard key={project.id} project={project} />)}
+          {member.projects?.map((project) => (
+            <ProjectCard key={project.id} project={project} />
+          ))}
           {/* TODO: fill undefined props */}
           {member.hostActivities?.map((activity) => (
             <ActivityCard key={activity.id} activity={activity} onToggleRegisterActivity={undefined} onDeleteActivity={undefined} isLogin={undefined} memberId={undefined} role={undefined} />

websites/poolc.org/src/components/message/MessageAllListContent.tsx

@@ -2,7 +2,7 @@ import { Button, List, Space, Typography } from 'antd';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 import { Link, useHistory } from 'react-router-dom';
 import { createStyles } from 'antd-style';
-import { ConversationControllerService, MemberControllerService, queryKey, useAppSuspeneseQueries } from '~/lib/api-v2';
+import { ConversationControllerService, MemberControllerService, queryKey, useAppSuspenseQueries } from '~/lib/api-v2';
 import { dayjs } from '~/lib/utils/dayjs';
 import { MENU } from '~/constants/menus';
 
@@ -41,7 +41,7 @@ export default function MessageAllListContent() {
   const { styles } = useStyles();
   const history = useHistory();
 
-  const [{ data: conversations }, { data: me }] = useAppSuspeneseQueries({
+  const [{ data: conversations }, { data: me }] = useAppSuspenseQueries({
     queries: [
       {
         queryKey: queryKey.conversation.all,

websites/poolc.org/src/components/my-page/MyPageArgoCDForm.tsx

@@ -0,0 +1,32 @@
+import { Form, Input } from 'antd';
+import { CopyOutlined, CheckOutlined } from '@ant-design/icons';
+import { createStyles } from 'antd-style';
+import useCopy from '../../hooks/useCopy';
+
+const USER_NAME = 'poolini';
+
+const PASSWORD = 'rgbc0ffee';
+
+export default function MyPageArgoCDForm() {
+  const { styles } = useStyles();
+
+  const { isCopied: isUserNameCopied, copy: copyUserName } = useCopy();
+  const { isCopied: isPasswordCopied, copy: copyPassword } = useCopy();
+
+  return (
+    <Form layout="vertical">
+      <Form.Item label="username" className={styles.inputWrap}>
+        <Input value={USER_NAME} readOnly addonAfter={isUserNameCopied ? <CheckOutlined /> : <CopyOutlined onClick={() => copyUserName(USER_NAME)} />} />
+      </Form.Item>
+      <Form.Item label="password" className={styles.inputWrap}>
+        <Input value={PASSWORD} readOnly addonAfter={isPasswordCopied ? <CheckOutlined /> : <CopyOutlined onClick={() => copyPassword(PASSWORD)} />} />
+      </Form.Item>
+    </Form>
+  );
+}
+
+const useStyles = createStyles(({ css }) => ({
+  inputWrap: css({
+    marginBottom: '8px',
+  }),
+}));