Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build fixing #32

Merged
merged 5 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'
import js from '@eslint/js';
import reactHooks from 'eslint-plugin-react-hooks';
import reactRefresh from 'eslint-plugin-react-refresh';
import globals from 'globals';
import tseslint from 'typescript-eslint';

export default tseslint.config({
extends: [js.configs.recommended, ...tseslint.configs.recommended],
Expand All @@ -17,10 +17,8 @@ export default tseslint.config({
'react-refresh': reactRefresh,
},
rules: {
'@typescript-eslint/no-explicit-any': 'off',
...reactHooks.configs.recommended.rules,
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
},
})
});
13 changes: 2 additions & 11 deletions src/Router.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Router.tsx
import { GoormLoader, GoormLoaderProps } from '@goorm-dev/gds-components';
import { GoormLoader } from '@goorm-dev/gds-components';
import { Suspense, lazy } from 'react';
import { RouterProvider, createBrowserRouter } from 'react-router-dom';
import Layout from './components/layout/Layout';
Expand All @@ -8,7 +8,6 @@ import Layout from './components/layout/Layout';
const About = lazy(() => import('./pages/about/About'));
const Project = lazy(() => import('./pages/project/Project'));
const Recruit = lazy(() => import('./pages/recruit/Recruit'));
const Apply = lazy(() => import('./pages/apply/Apply'));
const NotFound = lazy(() => import('./pages/errors/NotFound'));
const SearchUniv = lazy(() => import('./pages/searchUniv/SearchUniv'));
const SignUp = lazy(() => import('./pages/signUp/SignUp'));
Expand All @@ -17,7 +16,7 @@ const MyPage = lazy(() => import('./pages/myPage/MyPage'));
const UpdatePW = lazy(() => import('./pages/updatePW/UpdatePW'));

// GoormLoader μ»΄ν¬λ„ŒνŠΈμ— 전달할 props μ„€μ •
const loaderProps: GoormLoaderProps = {
const loaderProps = {
color: 'black', // μ˜ˆμ‹œ 색상
lottieProps: {
loop: true,
Expand Down Expand Up @@ -62,14 +61,6 @@ const router = createBrowserRouter([
</Suspense>
),
},
{
path: 'apply',
element: (
<Suspense fallback={<GoormLoader {...loaderProps} />}>
<Apply />
</Suspense>
),
},
{
path: 'login',
element: (
Expand Down
1 change: 0 additions & 1 deletion src/components/apply/ApplyHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import * as S from './style';

function ApplyHeader() {
Expand Down
3 changes: 1 addition & 2 deletions src/components/about/activity/Activity.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@
width: 100%;
height: 100%;
background-color: var(--gray-000);
padding-bottom: 15rem;
}

.titleText {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 10.19rem;
gap: var(--space-050);
}

.activityList {
margin-top: var(--space-500);
margin-bottom: 15rem;
gap: 2rem;
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
position: relative;
background-color: var(--gray-000);
padding-top: 15rem;
padding-bottom: 15rem;
}

.benefitTitleWrapper {
Expand Down
16 changes: 3 additions & 13 deletions src/components/about/benefit/BenefitDesktop/HorizontalScroll.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
import { motion, useMotionValue, useSpring, useTransform } from 'framer-motion';
import { useRef, useState } from 'react';
import { motion } from 'framer-motion';
import { useRef } from 'react';
import { BENEFIT_ITEM_DATA } from '../../../../utilities/AboutData';
import BenefitItem from './BenefitItem';

import styles from './BenefitDesktop.module.scss';

export default function HorizontalScroll() {
const scrollRef = useRef(null);
const ghostRef = useRef(null);
const [scrollRange, setScrollRange] = useState(0);
const [viewportW, setViewportW] = useState(0);

const scrollPercentage = useMotionValue(0);

const transform = useTransform(scrollPercentage, [0, 1], [0, -scrollRange + viewportW]);
const physics = { damping: 15, mass: 0.27, stiffness: 55 };
const spring = useSpring(transform, physics);

return (
<div>
<motion.section className={styles.motionContainer} ref={scrollRef} style={{ x: spring }}>
<motion.section className={styles.motionContainer} ref={scrollRef}>
{BENEFIT_ITEM_DATA.map((item) => (
<BenefitItem key={item.title} title={item.title} description={item.description} url={item.url} />
))}
</motion.section>
<div ref={ghostRef} />
</div>
);
}
4 changes: 1 addition & 3 deletions src/components/about/goal/Goal.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from 'react';

import GoalImgWhole from '../../../assets/svgs/goal-graphic_whole.svg';
import classNames from 'classnames/bind';
import GoalImgWhole from '../../../assets/svgs/goal-graphic_whole.svg';

import styles from './Goal.module.scss';

Expand Down
4 changes: 2 additions & 2 deletions src/components/about/intro/Intro.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
display: flex;
flex-direction: column;
background-color: var(--gray-000);
padding-bottom: 16rem;
padding-top: 9.8rem;
padding-bottom: 15rem;
padding-top: 15rem;
width: 100%;
align-items: center;
}
Expand Down
8 changes: 1 addition & 7 deletions src/components/about/intro/Intro.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import React from 'react';

import { Text } from '@goorm-dev/vapor-components';
import styles from './Intro.module.scss';

interface IntroProps {
scrollTarget: React.RefObject<HTMLDivElement>;
}

const TEXT = `μΉ΄μΉ΄μ˜€μ™€ ꡬ름, 그리고 λ²šκ½ƒκ³Ό 단풍이 ν•¨κ»˜ν•˜λŠ” \n μ „κ΅­ λŒ€ν•™ IT μ—°ν•© λ™μ•„λ¦¬μž…λ‹ˆλ‹€.`;

export default function Intro({ scrollTarget }: IntroProps) {
export default function Intro() {
// console.log(scrollTarget);
return (
<div className={styles.intro}>
Expand Down
22 changes: 11 additions & 11 deletions src/components/about/mainBanner/MainBanner.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
top: 0;
left: 0;
z-index: 1;

// NOTE: GDSκ°’ μ •μ˜ 되면 μˆ˜μ • ν•„μš”
background-color: rgba(0, 0, 0, 0.32);
width: 100%;
height: 100vw;
height: 100%;
}

.headerText {
Expand Down Expand Up @@ -108,33 +109,32 @@
.mainImg {
cursor: pointer;

stroke-dashoffset: -65;

&:hover {
stroke-dashoffset: 0;
}

bottom: 6.75rem;
left: 50%;
transform: translate(-50%);

stroke-dasharray: 500;
transition: stroke-dashoffset 0.5s ease-in-out;
}

.mainImgSmall {
cursor: pointer;

stroke-dashoffset: -65;

&:hover {
stroke-dashoffset: 0;
}
}

.mainImgSmall {
bottom: 6.5rem;
left: 50%;
transform: translate(-50%);

stroke-dasharray: 500;
transition: stroke-dashoffset 0.5s ease-in-out;
cursor: pointer;

stroke-dashoffset: -65;

&:hover {
stroke-dashoffset: 0;
}
}
1 change: 1 addition & 0 deletions src/components/about/mainBanner/MainBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export default function MainBanner() {
position: 'absolute',
width: '100%',
height: '100%',
backgroundColor: 'rgba(0, 0, 0, 0.32)',
},
},
}}
Expand Down
9 changes: 5 additions & 4 deletions src/components/about/plan/planDesktop/PlanDesktop.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
flex-direction: column;
justify-content: center;
position: relative;
padding-bottom: 15rem;
}

.title {
Expand Down Expand Up @@ -67,6 +68,10 @@
// card

.cardList {
display: grid;
gap: var(--space-200);
margin: 0 auto;

@include container-xs {
margin: 0 auto;
width: 20.25rem;
Expand All @@ -83,10 +88,6 @@
grid-template-columns: repeat(3, 1fr);
width: 62.325rem;
}

display: grid;
gap: var(--space-200);
margin: 0 auto;
}

.card {
Expand Down
4 changes: 0 additions & 4 deletions src/components/about/projectPreiview/ProjectCarousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import styles from './projectPreview.module.scss';

export default function ProjectCarousel() {
const [activeIndex, setActiveIndex] = useState(1);
const [animating, setAnimating] = useState(false);

const { isMobile } = useIsMobile();
const CardNumber = isMobile ? 1 : 3;
Expand All @@ -23,19 +22,16 @@ export default function ProjectCarousel() {
}

const next = () => {
if (animating) return;
const nextIndex = activeIndex === splitProjects().length - 1 ? 0 : activeIndex + 1;
setActiveIndex(nextIndex);
};

const prev = () => {
if (animating) return;
const prevIndex = activeIndex === 0 ? splitProjects().length - 1 : activeIndex - 1;
setActiveIndex(prevIndex);
};

const goToIndex = (newIndex: number) => {
if (animating) return;
setActiveIndex(newIndex);
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/about/projectPreiview/ProjectPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styles from './ProjectPreview.module.scss';

export default function ProjectPreview() {
return (
<div className={styles.container}>
<div className={styles.previewContainer}>
<div>
<Text typography="heading2" color="gray-900">
μž‘μ€ 아이디어가 ν˜„μ‹€λ‘œ!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.container {
padding: 11.5rem 4rem;
.previewContainer {
padding: 7.5rem 4rem;
display: flex;
position: relative;
flex-direction: column;
Expand Down
1 change: 0 additions & 1 deletion src/components/about/slidingText/SlidingText.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import * as S from './style';

import TextContent from './TextContent';
Expand Down
4 changes: 1 addition & 3 deletions src/components/about/slidingText/TextContent.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import React from 'react';
import * as S from './style';

import AmpersandImg from '../../../assets/svgs/ampersand.svg';
import DanpoongImg from '../../../assets/svgs/danpoong.svg';
import ArrowRightImg from '../../../assets/svgs/arrow-right.svg';
import BeotkkotImg from '../../../assets/svgs/beotkkot.svg';
import DanpoongImg from '../../../assets/svgs/danpoong.svg';

export default function TextContent() {
return (
Expand Down
22 changes: 11 additions & 11 deletions src/components/information/Information.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import styles from './information.module.scss';
import { BackPageIcon, PlusIcon, WarningIcon, ErrorCircleIcon } from '@goorm-dev/gds-icons';
import { BackPageIcon, PlusIcon, WarningIcon } from '@goorm-dev/gds-icons';
import {
Text,
Input,
Alert,
Button,
Checkbox,
Dropdown,
DropdownToggle,
DropdownMenu,
DropdownItem,
Alert,
ListGroupItem,
DropdownMenu,
DropdownToggle,
Input,
ListGroup,
ListGroupItem,
Text,
} from '@goorm-dev/vapor-components';
import { useState } from 'react';
import Universities from '../../utilities/UnivData';
import { ChangeEvent, useState } from 'react';
import errorCircleIcon from '../../assets/svgs/ErrorCircleIcon.svg';
import Universities from '../../utilities/UnivData';
import styles from './information.module.scss';

interface SeasonPartSelection {
selectedSeason: string;
selectedPart: string;
}

export default function information() {
export default function Information() {
const [openSeasonIndex, setOpenSeasonIndex] = useState<number | null>(null);
const [openPartIndex, setOpenPartIndex] = useState<number | null>(null);
const [selections, setSelections] = useState<SeasonPartSelection[]>([
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/GridContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { ReactNode } from 'react';
import styled from 'styled-components';

export default function GridContainer({ children }) {
export default function GridContainer({ children }: { children: ReactNode }) {
return <GridContainerWrapper>{children}</GridContainerWrapper>;
}

Expand Down
6 changes: 2 additions & 4 deletions src/components/layout/footer/CustomFooter.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import { GithubIcon, InstagramIcon } from '@goorm-dev/gds-icons';
import * as S from './style';
import { FacebookIcon, GithubIcon, InstagramIcon } from '@goorm-dev/gds-icons';

function CustomFooter() {
return (
Expand All @@ -14,8 +13,7 @@ function CustomFooter() {
<S.SocialIcon
href="https://www.instagram.com/9oormthonuniv.official/"
target="_blank"
rel="noopener noreferrer"
>
rel="noopener noreferrer">
<InstagramIcon width="40" height="40" />
</S.SocialIcon>
{/*} <S.SocialIcon href="https://facebook.com/9oormthonuniv.official/" target="_blank" rel="noopener noreferrer">
Expand Down
Loading