Skip to content

Commit

Permalink
Merge pull request #73 from GDSC-Hongik/fix/dev-build-error
Browse files Browse the repository at this point in the history
[Fix] : 빌드 에러 수정
  • Loading branch information
SeieunYoo authored Jul 28, 2024
2 parents 6db6ffd + e478511 commit fa091b5
Show file tree
Hide file tree
Showing 16 changed files with 87 additions and 165 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: build

on:
push:
branches:
- main
- dev
pull_request:
branches:
- main
- dev

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Node.js 20.x
uses: actions/setup-node@v2
with:
node-version: 20.x

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
run_install: false

- name: Install dependencies
run: pnpm install

- name: Run build
run: pnpm run build
6 changes: 0 additions & 6 deletions src/apis/auth/createGuestUserApi.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/apis/auth/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { default as createGuestUserApi } from './createGuestUserApi';
export { default as verifyStudentApi } from './verifyStudentApi';
6 changes: 4 additions & 2 deletions src/apis/member/createBasicInfoApi.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import apiClient from '@/apis';

import { MemberBasicInfoType } from './memberType';
import { UserBasicInfo } from '@/types/user';

const createBasicInfoApi = {
BASIC_INFO: async (payload: MemberBasicInfoType) => {
BASIC_INFO: async (
payload: Omit<UserBasicInfo, 'discordName' | 'nickname' | 'discordUsername'>
) => {
const response = await apiClient.post(
'/onboarding/members/me/basic-info',
payload
Expand Down
26 changes: 13 additions & 13 deletions src/assets/Onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,14 @@ export const OnboardingLogo2 = () => {
<path
d="M445.043 84.3232C436.019 79.7142 409.206 74.5111 374.154 90.5707C330.34 110.645 324.003 153.693 355.647 168.369C387.29 183.045 412.913 145.538 398.267 123.231C383.62 100.924 337.23 89.8875 304.628 146.701C278.547 192.153 299.746 240.766 313.606 259.392"
stroke="#EA4335"
stroke-width="8.4"
stroke-linecap="round"
strokeWidth="8.4"
strokeLinecap="round"
/>
<path
d="M155.591 324.754C154.268 318.182 145.94 302.148 123.205 290.588C94.7866 276.137 69.8733 290.554 75.2796 312.986C80.6859 335.418 110.658 333.274 116.195 316.512C121.732 299.75 108.376 271.172 65.5301 277.639C31.253 282.812 14.7778 313.787 10.8248 328.627"
stroke="#1453BC"
stroke-width="8.4"
stroke-linecap="round"
strokeWidth="8.4"
strokeLinecap="round"
/>
<rect
x="96.2844"
Expand All @@ -200,12 +200,12 @@ export const OnboardingLogo2 = () => {
fill="#FBBC04"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
fillRule="evenodd"
clipRule="evenodd"
d="M97.5074 88.7708L87.7584 88.1645C87.1602 88.1273 86.7054 87.6122 86.7426 87.0139L87.3494 77.265C87.3866 76.6668 87.9018 76.212 88.5 76.2492C89.0983 76.2864 89.553 76.8015 89.5158 77.3998L89.0718 84.5336L100.125 74.7747C100.575 74.378 101.261 74.4207 101.657 74.87C102.054 75.3193 102.011 76.0052 101.562 76.4019L90.5084 86.1607L97.6422 86.6044C98.2405 86.6416 98.6953 87.1567 98.658 87.755C98.6208 88.3532 98.1056 88.808 97.5074 88.7708Z"
fill="#4792EE"
stroke="#4792EE"
stroke-width="1.2"
strokeWidth="1.2"
/>
<path
d="M273.438 45.1417C276.248 40.6452 282.17 39.2773 286.667 42.0864L311.094 57.347C313.423 58.8023 315.018 61.1858 315.474 63.8943L318.271 80.4981C319.077 85.2872 316.18 89.9242 311.523 91.2995L295.374 96.0678C292.74 96.8457 289.899 96.4579 287.569 95.0026L263.142 79.742C258.645 76.9329 257.277 71.0104 260.087 66.5138L273.438 45.1417Z"
Expand All @@ -214,18 +214,18 @@ export const OnboardingLogo2 = () => {
<path
d="M282.604 56.6639L287.921 79.6847"
stroke="#4792EE"
stroke-width="3.6"
stroke-linecap="round"
strokeWidth="3.6"
strokeLinecap="round"
/>
<path
d="M296.741 65.5679L273.72 70.885"
stroke="#4792EE"
stroke-width="3.6"
stroke-linecap="round"
strokeWidth="3.6"
strokeLinecap="round"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
fillRule="evenodd"
clipRule="evenodd"
d="M216.59 215.209C214.571 212.024 210.874 210.317 207.141 210.844L142.145 220.02C136.895 220.762 133.24 225.618 133.981 230.868L136.065 245.631L153.624 369.995C154.365 375.245 159.222 378.9 164.472 378.159L344.307 352.768C349.557 352.027 353.212 347.17 352.471 341.92L336.254 227.062C335.513 221.812 330.656 218.157 325.406 218.899L233.812 231.831C230.078 232.358 226.381 230.65 224.362 227.466L216.59 215.209Z"
fill="#FBBC04"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/assets/OnboardingArrow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const OnboardingArrow = () => {
<>
<style>
{`
@keyframes bounce {
@keyframes bounce {
0%, 100% { transform: translateY(0); }
50% { transform: translateY(-5px); }
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/SelectBoxArrorw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const SelectBoxArrow = () => {
viewBox="0 0 14 8"
fill="none"
xmlns="http://www.w3.org/2000/svg">
<path d="M1 1L7 7L13 1" stroke="#CCCCCC" stroke-linecap="round" />
<path d="M1 1L7 7L13 1" stroke="#CCCCCC" strokeLinecap="round" />
</svg>
);
};
21 changes: 12 additions & 9 deletions src/components/auth/DepartmentSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import { Control, Controller } from 'react-hook-form';
import DropDown from 'wowds-ui/DropDown';
import DropDownOption from 'wowds-ui/DropDownOption';
type DepartmentSelectProps = {
control: Control<{
name: '';
studentId: '';
phone: '';
department: '';
email: '';
terms: false;
personalPrivacy: false;
}>;
control:
| Control<{
name: string;
studentId: string;
phone: string;
department: string;
email: string;
emailDomain: string;
terms: boolean;
personalPrivacy: boolean;
}>
| undefined;
};

const DepartmentSelect = ({ control }: DepartmentSelectProps) => {
Expand Down
7 changes: 2 additions & 5 deletions src/components/auth/guard/StudentVerificationAccessGuard.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import LandingStatus from '@/constants/landingStatus';
import useLandingStatus from '@/hooks/zustand/useLandingStatus';
import { getAuthRedirectPath } from '@/utils/auth';
import { Navigate, Outlet } from 'react-router-dom';
import { Outlet } from 'react-router-dom';

export default function StudentVerificationAccessGuard() {
const { landingStatus } = useLandingStatus();
// const { landingStatus } = useLandingStatus();

// if (landingStatus !== LandingStatus.StudentAuthentication) {
// return <Navigate to={getAuthRedirectPath(landingStatus)} />;
Expand Down
17 changes: 16 additions & 1 deletion src/components/myPage/JoinRegularMember.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
import { Text, Flex } from '@/components/common/Wrapper';
import RoutePath from '@/routes/routePath';
import { useNavigate } from 'react-router-dom';
import Box from 'wowds-ui/Box';

const JoinRegularMember = ({
paymentStatus
}: {
paymentStatus: 'PENDING' | 'SATISFIED';
}) => {
const navigate = useNavigate();

const handleClickRoute = () => {
if (paymentStatus !== 'PENDING') {
return;
}
navigate(RoutePath.PaymentsCheckout);
};
return (
<Flex gap="sm" justify="flex-start" direction="column" align="flex-start">
<Flex
gap="sm"
justify="flex-start"
direction="column"
align="flex-start"
onClick={handleClickRoute}>
<Text typo="h2" color="textBlack">
정회원 가입 조건
</Text>
Expand Down
65 changes: 0 additions & 65 deletions src/components/myPage/PaymentStatus.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/hooks/auth/useStudentVerification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function useStudentVerification() {
const { sendStudentEmail, ...rest } = useSendStudentEmail();

const onSubmit = async ({ univEmail }: FieldValues) => {
event.preventDefault();
event?.preventDefault();
updateUnivEmail(univEmail);
sendStudentEmail(univEmail);
};
Expand Down
1 change: 0 additions & 1 deletion src/hooks/mutation/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { default as useCreateGuestUser } from './useCreateGuestUser';
export { default as useSendStudentEmail } from './useSendStudentEmail';
20 changes: 0 additions & 20 deletions src/hooks/mutation/useCreateGuestUser.ts

This file was deleted.

38 changes: 0 additions & 38 deletions src/pages/ForwardRef.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/pages/StudentVerification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import GlobalSize from '@/constants/globalSize';
export const StudentVerification = () => {
const navigate = useNavigate();
//TODO: 추후 pending 상태 백엔드 API 수정하면 반영해둘것.
const [pending, setPending] = useState(false);
const [, setPending] = useState(false);
const [isClicked, setIsClicked] = useState(false);
const { onSubmit, control, isValid, onVerifyStudent, loading } =
useStudentVerification();
Expand Down

0 comments on commit fa091b5

Please sign in to comment.