Skip to content

Commit 4d11c17

Browse files
jinhodotchoijinhodotchoi
authored
Merge pull request #152 from PoolC/dev
dev release
2 parents 91bbdfd + 3757aca commit 4d11c17

File tree

18 files changed

+608
-289
lines changed

18 files changed

+608
-289
lines changed

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,27 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
# TODO: 패키지 구조 변경 및 s3 배포에 따라 변경해야함
15-
# - uses: actions/setup-node@v4
16-
# with:
17-
# node-version: '20'
18-
# cache: 'yarn'
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: '20'
17+
cache: 'yarn'
18+
# @see https://github.com/cypress-io/github-action#yarn-modern
19+
cache-dependency-path: ./yarn.lock
1920

20-
# - name: build
21-
# run: |
22-
# rm ./apps/web/.env && mv ./apps/web/.env.dev ./apps/web/.env
23-
# yarn set version 3.8.1
24-
# yarn install --immutable --immutable-cache
25-
# yarn web codegen
26-
# yarn web build
21+
- name: build
22+
run: |
23+
rm ./websites/poolc.org/.env && mv ./websites/poolc.org/.env.dev ./websites/poolc.org/.env
24+
yarn set version 4.9.2
25+
yarn install --immutable
26+
yarn workspace @dialga/poolc.org build
2727
28-
# - name: scp
29-
# uses: appleboy/scp-action@v0.1.7
30-
# with:
31-
# host: ${{ secrets.SSH_HOST }}
32-
# username: ${{ secrets.SSH_USERNAME }}
33-
# key: ${{ secrets.SSH_PEM_KEY }}
34-
# port: ${{ secrets.SSH_PORT }}
35-
# source: ./apps/web/build/*
36-
# # TODO: 패키지 구조 변경에 따라 target 디렉토리도 변경해야함
37-
# target: ~/dialga/apps/web-client/build
38-
# strip_components: 3
28+
- name: scp
29+
uses: appleboy/scp-action@v0.1.7
30+
with:
31+
host: ${{ secrets.SSH_HOST }}
32+
username: ${{ secrets.SSH_USERNAME }}
33+
key: ${{ secrets.SSH_PEM_KEY }}
34+
port: ${{ secrets.SSH_PORT }}
35+
source: ./websites/poolc.org/build/*
36+
target: ~/k8s/dialga/build
37+
strip_components: 3

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.19.3

‎websites/poolc.org/.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
VITE_API_BASE_URL=https://api.poolc.org
2-
VITE_FILE_URL=https://api.poolc.org
1+
VITE_API_BASE_URL=https://dev.poolc.org/api
2+
VITE_FILE_URL=https://dev.poolc.org/api
33
VITE_MAX_FILE_SIZE=50000000 # 50mb

‎websites/poolc.org/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"sync:type": "yarn dlx typesync",
1111
"check:type": "tsc",
1212
"check:type:watch": "yarn check:type --watch",
13-
"codegen": "openapi -i https://api.poolc.org/v2/api-docs -o src/lib/api-v2/__generated__ --useUnionTypes --useOptions -c axios",
13+
"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'",
1414
"postinstall": "yarn codegen",
1515
"lint": "eslint . && prettier . --check --ignore-path .gitignore",
1616
"format": "eslint . --fix && prettier . --write --ignore-path .gitignore"
@@ -20,6 +20,7 @@
2020
},
2121
"devDependencies": {
2222
"@types/node": "^18.15.3",
23+
"dotenv-cli": "^10.0.0",
2324
"eslint": "^8.57.0",
2425
"openapi-typescript-codegen": "^0.28.0",
2526
"prettier": "^3.1.1",

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ const Menus = ({
7575
visible: isLogin,
7676
content: 'Room',
7777
},
78+
{
79+
to: `/${MENU.MY_PAGE}#pks`,
80+
visible: isLogin,
81+
content: 'K8s',
82+
},
7883
{
7984
to: `/${MENU.APPLY}`,
8085
visible: !isLogin || (isLogin && !isAuthorizedRole(role)),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export default function Notification() {
222222

223223
return (
224224
<div>
225-
<Dropdown menu={{ items: dropDownItems }} dropdownRender={Menu}>
225+
<Dropdown menu={{ items: dropDownItems }} popupRender={Menu}>
226226
<Button shape="circle" className={styles.dropdownButton}>
227227
<Space size="large" className={styles.dropdownShape}>
228228
<Badge count={data.unreadCount ?? 0}>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Carousel from '~/components/home/Carousel';
33
import RecentNotice from '~/components/home/RecentNotice';
44
import RecentProject from '~/components/home/RecentProject';
55
import { useAppSelector } from '~/hooks/useAppSelector';
6-
import { PoolcControllerService, PostControllerService, ProjectControllerService, queryKey, useAppSuspeneseQueries } from '~/lib/api-v2';
6+
import { PoolcControllerService, PostControllerService, ProjectControllerService, queryKey, useAppSuspenseQueries } from '~/lib/api-v2';
77
import { getBoardTitleForRequest } from '~/lib/utils/boardUtil';
88
import ApplyBanner from '~/components/home/ApplyBanner';
99

@@ -20,7 +20,7 @@ const useStyles = createStyles(({ css }) => ({
2020
export default function HomeEntry() {
2121
const { styles } = useStyles();
2222

23-
const [{ data: poolcInfo }, { data: projectInfo }, { data: noticeInfo }] = useAppSuspeneseQueries({
23+
const [{ data: poolcInfo }, { data: projectInfo }, { data: noticeInfo }] = useAppSuspenseQueries({
2424
queries: [
2525
{
2626
queryKey: queryKey.poolc.poolc,

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import {
2020
ActivityContainer,
2121
Activities,
2222
} from './MemberDetailContent.styles';
23-
import { ConversationControllerService, MemberControllerService, MemberResponse, queryKey, useAppMutation, useAppSuspeneseQueries } from '~/lib/api-v2';
23+
import { ConversationControllerService, MemberControllerService, MemberResponse, queryKey, useAppMutation, useAppSuspenseQueries } from '~/lib/api-v2';
2424
import { MENU } from '~/constants/menus';
2525

2626
export default function MemberDetailContent({ loginId }: { loginId: string }) {
2727
const history = useHistory();
28-
const [{ data: _member }, { data: me }] = useAppSuspeneseQueries({
28+
const [{ data: _member }, { data: me }] = useAppSuspenseQueries({
2929
queries: [
3030
{
3131
queryKey: queryKey.member.id(loginId),
@@ -96,7 +96,9 @@ export default function MemberDetailContent({ loginId }: { loginId: string }) {
9696
<ActivityContainer>
9797
<h2>참여 활동</h2>
9898
<Activities>
99-
{member.projects?.map((project) => <ProjectCard key={project.id} project={project} />)}
99+
{member.projects?.map((project) => (
100+
<ProjectCard key={project.id} project={project} />
101+
))}
100102
{/* TODO: fill undefined props */}
101103
{member.hostActivities?.map((activity) => (
102104
<ActivityCard key={activity.id} activity={activity} onToggleRegisterActivity={undefined} onDeleteActivity={undefined} isLogin={undefined} memberId={undefined} role={undefined} />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Button, List, Space, Typography } from 'antd';
22
import { ArrowLeftOutlined } from '@ant-design/icons';
33
import { Link, useHistory } from 'react-router-dom';
44
import { createStyles } from 'antd-style';
5-
import { ConversationControllerService, MemberControllerService, queryKey, useAppSuspeneseQueries } from '~/lib/api-v2';
5+
import { ConversationControllerService, MemberControllerService, queryKey, useAppSuspenseQueries } from '~/lib/api-v2';
66
import { dayjs } from '~/lib/utils/dayjs';
77
import { MENU } from '~/constants/menus';
88

@@ -41,7 +41,7 @@ export default function MessageAllListContent() {
4141
const { styles } = useStyles();
4242
const history = useHistory();
4343

44-
const [{ data: conversations }, { data: me }] = useAppSuspeneseQueries({
44+
const [{ data: conversations }, { data: me }] = useAppSuspenseQueries({
4545
queries: [
4646
{
4747
queryKey: queryKey.conversation.all,

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { Form, Input } from 'antd';
2+
import { CopyOutlined, CheckOutlined } from '@ant-design/icons';
3+
import { createStyles } from 'antd-style';
4+
import useCopy from '../../hooks/useCopy';
5+
6+
const USER_NAME = 'poolini';
7+
8+
const PASSWORD = 'rgbc0ffee';
9+
10+
export default function MyPageArgoCDForm() {
11+
const { styles } = useStyles();
12+
13+
const { isCopied: isUserNameCopied, copy: copyUserName } = useCopy();
14+
const { isCopied: isPasswordCopied, copy: copyPassword } = useCopy();
15+
16+
return (
17+
<Form layout="vertical">
18+
<Form.Item label="username" className={styles.inputWrap}>
19+
<Input value={USER_NAME} readOnly addonAfter={isUserNameCopied ? <CheckOutlined /> : <CopyOutlined onClick={() => copyUserName(USER_NAME)} />} />
20+
</Form.Item>
21+
<Form.Item label="password" className={styles.inputWrap}>
22+
<Input value={PASSWORD} readOnly addonAfter={isPasswordCopied ? <CheckOutlined /> : <CopyOutlined onClick={() => copyPassword(PASSWORD)} />} />
23+
</Form.Item>
24+
</Form>
25+
);
26+
}
27+
28+
const useStyles = createStyles(({ css }) => ({
29+
inputWrap: css({
30+
marginBottom: '8px',
31+
}),
32+
}));

0 commit comments

Comments
 (0)