Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/#183_dynamic-import
Browse files Browse the repository at this point in the history
  • Loading branch information
SeojinSeojin committed Sep 23, 2023
2 parents 7ede36d + b07dcf1 commit a41af85
Show file tree
Hide file tree
Showing 33 changed files with 112 additions and 94 deletions.
10 changes: 5 additions & 5 deletions src/components/Footer/Channels/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@ function Channels({ isFooter = false }: ChannelsProps) {
width={30}
height={30}
id="mail"
alt="mail"
alt="메일"
onClick={handleClick}
/>
<S.ClickableChannelButton
src={facebookLogo}
width={30}
height={30}
id="facebook"
alt="facebook"
alt="페이스북"
onClick={handleClick}
/>
<S.ClickableChannelButton
src={instagramLogo}
width={30}
height={30}
id="instagram"
alt="instagram"
alt="인스타그램"
onClick={handleClick}
/>
<S.ClickableChannelButton
src={youtubeLogo}
width={30}
height={30}
id="youtube"
alt="youtube"
alt="유튜브"
onClick={handleClick}
/>
<S.ClickableChannelButton
src={kakaoLogo}
width={30}
height={30}
id="kakao"
alt="kakao"
alt="카카오톡 채널"
onClick={handleClick}
/>
</S.ChannelButtonsWrap>
Expand Down
6 changes: 1 addition & 5 deletions src/components/Header/Mobile/MobileHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ function MobileHeader() {
<StyledHeader>
<Logo onClick={() => router.push('/')} />
<ToggleButton onClick={handleHeaderToggleButton}>
<Image
src={isMenuShown === 'open' ? xButton.src : menuBar}
alt="header toggle button"
fill
/>
<Image src={isMenuShown === 'open' ? xButton.src : menuBar} alt="메뉴 토글 버튼" fill />
</ToggleButton>
</StyledHeader>
<Condition statement={isMenuShown === 'open'}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/corporate/JobPostingCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const JobPostingCard = ({
}: JobPostingCardProps) => {
return (
<St.Card>
<St.Image src={imgSrc} alt={corporation} />
<St.Logo src={imgSrc} alt={`${corporation} 로고`} width={80} height={80} />
<St.Contents>
<St.Chip>{type}</St.Chip>
<St.Title>{title}</St.Title>
Expand Down
5 changes: 3 additions & 2 deletions src/components/corporate/JobPostingCard/style.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import styled from '@emotion/styled';
import Image from 'next/image';
import { textpluralLinesEllipsis } from '@src/styles/textEllipsis';

const Card = styled.article`
Expand Down Expand Up @@ -28,7 +29,7 @@ const Card = styled.article`
}
`;

const Image = styled.img`
const Logo = styled(Image)`
width: 80px;
height: 80px;
border-radius: 10px;
Expand Down Expand Up @@ -120,7 +121,7 @@ const RestInfo = styled.p`

export const St = {
Card,
Image,
Logo,
Contents,
Chip,
Title,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/constants/googlesheet-env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const googleSheetCredential = {
type: 'service_account',
project_id: process.env.NEXT_GOOGLE_SHEET_PROJECT_ID,
private_key_id: process.env.NEXT_GOOGLE_SHEET_PRIVATE_KEY_ID,
private_key: process.env.NEXT_GOOGLE_SHEET_PRIVATE_KEY,
private_key: process.env.NEXT_GOOGLE_SHEET_PRIVATE_KEY?.split(String.raw`\n`).join('\n'),
client_email: process.env.NEXT_GOOGLE_SHEET_CLIENT_EMAIL,
client_id: process.env.NEXT_GOOGLE_SHEET_CLIENT_ID,
auth_uri: process.env.NEXT_GOOGLE_SHEET_AUTH_URI,
Expand Down
5 changes: 3 additions & 2 deletions src/lib/constants/rules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,17 @@ export const RULES = [
6) 디자인파트장
7) 운영팀장
8) 미디어팀장
9) 메이커스팀장
자격: 본 회의 임원이라 함은 각 단위기구의 장 및 간부회원으로서 제 5장의 선거 절차를 필한 자로 한다.
권리: 각 단위기구의 운영에 대한 권한을 갖는다.
의무: 본 회의 규정을 준수해야 한다.
그 외 각 단위기구의 장에 의해 해당 단위기구의 임원을 둘 수 있다.
임원이 임기를 마치지 못하고 특정 사유로 인해 중도 하차할 경우 별도 규정의 운영위원 인준절차를 걸쳐 해당 직책의 임원을 선출할 수 있다.
제12조(특수 임원)
본 회에서 매 기수활동과 별개로 독립적으로 진행되는 행사에 한해서 특수 임원을 둘 수 있다.
본 회에서 매 기수활동과 별개로 독립적으로 진행되는 행사 및 조직에 한해서 특수 임원을 둘 수 있다. 특수 임원의 활동은 정, 부회장의 동의 하에 업무를 진행할 수 있다.
1) Scon 위원장: 본 회에서 기획, 진행되는 Conference의 장으로서 Conference 진행에 정, 부회장의 동의 하에 독립적으로 업무를 진행할 수 있다.
2) makers 팀장: 본 회를 위한 서비스를 만드는 것을 담당한다. 정, 부회장의 동의 하에 독립적으로 업무를 진행할 수 있다.
2) MIND 팀장 : 본 회가 IT 벤처창업을 목적으로 활동하는 데 필요한 대내외 행사&시스템을 기획하는 역할을 한다. 정, 부회장의 동의 하에 독립적으로 업무를 진행할 수 있다.
자격: 본 회의 특수 임원이라 함은 특수 단위기구의 장으로서 별도규정의 특수임원 인준 절차를 필한 자로 한다.
권리: 각 단위기구의 운영에 대한 권한을 갖는다.
의무: 본 회의 규정을 준수해야 한다.
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/404.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function Wrong() {
src={Sopt404.src}
width={isDesktop ? 296 : 196}
height={isDesktop ? 78 : 52}
alt="SOPT"
alt="솝트 공식 로고"
blurDataURL={Sopt404.src}
placeholder="blur"
/>
Expand Down
46 changes: 27 additions & 19 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ function MyApp({ Component, pageProps }: AppProps) {
return (
<>
<Head>
<title>SOPT</title>
<meta
name="description"
content="SOPT는 IT와 벤처 창업에 뜻이 있는 대학생들이 모인 국내 최대 규모의 대학생 연합 IT 벤처 창업 동아리입니다."
/>
<meta name="title" content="SOPT" />
<meta name="keyword" content="IT, 창업, 개발, 대학생, 동아리" />
<meta name="viewport" content="initial-scale=1.0, width=device-width" />

<meta name="apple-mobile-web-app-title" content="SOPT" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />

<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png" />
Expand All @@ -48,35 +61,30 @@ function MyApp({ Component, pageProps }: AppProps) {
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1"
/>
<meta content="yes" name="apple-mobile-web-app-capable" />
<meta name="title" content="SOPT" />
<meta property="og:title" content="SOPT" />
<meta name="twitter:title" content="SOPT" />
<meta
name="description"
content="SOPT는 IT와 벤처창업에 뜻이 있는 대학생들이 모인 국내 최대 규모의 대학생 연합 IT벤처창업 동아리입니다."
/>
<meta
property="og:description"
content="SOPT는 IT와 벤처창업에 뜻이 있는 대학생들이 모인 국내 최대 규모의 대학생 연합 IT벤처창업 동아리입니다."
/>
<meta
name="twitter:description"
content="SOPT는 IT와 벤처창업에 뜻이 있는 대학생들이 모인 국내 최대 규모의 대학생 연합 IT벤처창업 동아리입니다."
/>

{/* Open Graph */}
<meta property="og:type" content="website" />
<meta property="og:locale" content="ko_KR" />
<meta property="og:url" content="https://sopt.org/" />
<meta property="og:title" content="SOPT" />
<meta property="og:site_name" content="SOPT 공식 홈페이지" />
<meta property="og:description" content="대학생 연합 IT 벤처 창업 동아리" />
<meta
property="og:image"
content="https://sopt-makers.s3.ap-northeast-2.amazonaws.com/mainpage/seo/sopt_discord_seo.png"
content="https://s3.ap-northeast-2.amazonaws.com/sopt.org/admin/origin/img_sopt_homepage.png"
/>
<meta property="og:url" content="https://sopt.org/" />
<meta property="og:image:alt" content="SOPT 공식 홈페이지 이미지" />

{/* Twitter */}
<meta name="twitter:title" content="SOPT" />
<meta name="twitter:description" content="대학생 연합 IT 벤처 창업 동아리" />
<meta property="twitter:card" content="website" />
<meta property="twitter:site" content="https://sopt.org/" />

<meta
name="twitter:image"
content="https://sopt-makers.s3.ap-northeast-2.amazonaws.com/mainpage/seo/sopt_twitter_seo.png"
content="https://s3.ap-northeast-2.amazonaws.com/sopt.org/admin/origin/img_sopt_homepage.png"
/>
<meta property="twitter:image:alt" content="SOPT 공식 홈페이지 이미지" />
</Head>
<GoogleTagManagerScript />
<Global styles={global} />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Head, Html, Main, NextScript } from 'next/document';

export default function Document() {
return (
<Html>
<Html lang="ko" dir="ltr">
<Head>
<link
rel="preload"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/api/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default async function handler(request: NextApiRequest, response: NextApi
return response.status(200).json({ success: resultStatus === 200, resultStatus });
}
} catch (error) {
return response.status(500).json({ error: 'Internal server error' });
return response.status(500).json({ error });
}

return response.status(200).json({ success: true });
Expand Down
8 changes: 7 additions & 1 deletion src/views/AboutPage/components/Banner/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ const Banner = (props: BannerProps) => {

return (
<St.ImageWrapper>
<Image src={imageSrc} alt="" fill style={{ objectFit: 'cover' }} priority />
<Image
src={imageSrc}
alt="솝트 공식홈페이지 어바웃페이지 배너 사진"
fill
style={{ objectFit: 'cover' }}
priority
/>
<St.HeadTitle>{title}</St.HeadTitle>
</St.ImageWrapper>
);
Expand Down
3 changes: 2 additions & 1 deletion src/views/AboutPage/components/Cirriculum/Content/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Image from 'next/image';
import { useState } from 'react';
import Flex from '@src/components/common/Flex';
import { Part } from '@src/lib/types/universal';
import { parsePartToKorean } from '@src/lib/utils/parsePartToKorean';
import TabBar from '../../common/TabBar';
import * as St from './style';

Expand All @@ -18,7 +19,7 @@ const CirriculumContent = ({ cirriculums }: CirriculumContentProps) => {
<St.ImageWrapper>
<Image
src={cirriculums[currentPart]}
alt={currentPart}
alt={`${parsePartToKorean(currentPart)}파트 커리큘럼 이미지`}
fill
style={{ objectFit: 'contain' }}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/views/AboutPage/components/Member/Card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const MemberCard = ({ imgSrc, name, description, part }: MeberCardProps) => {
return (
<St.Card>
<St.ImageWrapper>
<St.ProfileImage src={imgSrc || NullImage.src} alt={name} fill />
<St.ProfileImage src={imgSrc || NullImage.src} alt={`${name}의 프로필`} fill />
</St.ImageWrapper>
<St.Name>{name}</St.Name>
<St.Desc>{description || '-'}</St.Desc>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function MobileActivityDescription() {
<Image
className={styles.cardImage}
src={currentTab.imgSrc}
alt="card"
alt={`${currentTab.type} 활동 사진`}
fill
sizes="(max-width: 766px) 309px, 585px"
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import Image from 'next/image';
import Link from 'next/link';
import { ReactComponent as ArrowLeft } from '@src/assets/icons/arrow_left_28x28.svg';
import { ReactComponent as ArrowRight } from '@src/assets/icons/arrow_right_28x28.svg';
import ArrowRightGrey from '@src/assets/icons/arrow_right_grey.svg';
import { useHorizontalScroll } from '@src/hooks/useHorizontalScroll';
import { parsePartToKorean } from '@src/lib/utils/parsePartToKorean';
import cc from 'classcat';
import styles from './activity-review.module.scss';
import useFetch from './hooks/useFetch';
import { parsePartToKorean } from './utils/parsePartToKorean';

export function ActivityReview() {
const reviews = useFetch();
Expand Down Expand Up @@ -41,7 +42,9 @@ export function ActivityReview() {
{parsePartToKorean(review.part)}파트 {review.semester}{'\n'}
<strong className={styles.descName}>{review.reviewer}</strong>
</p>
<img className={`${styles.arrow}`} src={ArrowRightGrey} alt="이동" />
<div className={styles.arrow}>
<Image src={ArrowRightGrey} alt="이동" fill sizes="100%" />
</div>
</div>
</article>
</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
}

.arrow {
position: relative;
@include mobile {
width: 18px;
height: 18px;
Expand Down
8 changes: 7 additions & 1 deletion src/views/MainPage/components/BannerImage/BannerImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ export function BannerImage() {
<ArrowDown className={styles.downArrow} width="24" height="24" />
</div>
<div className={styles.bannerWrapper}>
<Image src={MainPageBanner} className={styles.bannerImage} alt="banner" fill priority />
<Image
src={MainPageBanner}
className={styles.bannerImage}
alt="솝트 공식홈페이지 메인페이지 배너 사진"
fill
priority
/>
<div className={styles.bannerGradient} />
</div>
</section>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Image from 'next/image';
import { useRouter } from 'next/router';
import ArrowRight from '@src/assets/icons/arrow_right_grey.svg';
import { GTM_CLASS } from '@src/lib/constants/gtmClass';
Expand Down Expand Up @@ -50,7 +51,9 @@ export function DetailedInformation() {
>
<div className={`${styles.nameWrapper} ${GTM_CLASS[`informationCard${name}`]}`}>
<h4 className={`${styles.name} ${GTM_CLASS[`informationCard${name}`]}`}>{name}</h4>
<img className={`${styles.arrow}`} src={ArrowRight} alt="이동" />
<div className={`${styles.arrow}`}>
<Image src={ArrowRight} alt={`${name} 더보기 이동 버튼`} fill sizes="100%" />
</div>
</div>
<p className={`${styles.desc} ${GTM_CLASS[`informationCard${name}`]}`}>{desc}</p>
</article>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
}

.arrow {
position: relative;
width: 30px;
height: 30px;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import styled from '@emotion/styled';
import Image from 'next/image';
import Link from 'next/link';
import { useRouter } from 'next/router';
import SoptSymbol from '@src/assets/icons/dosopt_symbol.png';
Expand All @@ -16,7 +17,7 @@ export function RecruitFloatingBanner() {
<Wrapper>
<Banner isMobile={isMobile} onClick={() => isMobile && router.push('/recruit')}>
<Countdown>
<Symbol src={SoptSymbol.src} alt="솝트 심볼" />
<Symbol src={SoptSymbol.src} alt="솝트 심볼" width={52} height={26} />
{isMobile ? (
'33기 YB 지원하기'
) : (
Expand All @@ -43,7 +44,7 @@ const Wrapper = styled.div`
z-index: 9999;
`;

const Symbol = styled.img`
const Symbol = styled(Image)`
width: 52px;
height: 26px;
Expand Down
6 changes: 3 additions & 3 deletions src/views/ProjectDetailPage/ProjectDetailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function ProjectDetailPage() {
<S.Container>
<S.ProjectHeader>
<S.LogoImageWrapper>
<Image src={logoImage} alt="logo" width="72" height="72" />
<Image src={logoImage} alt={`${name} 프로젝트 로고`} width="72" height="72" />
</S.LogoImageWrapper>
<div>
<h1>{name}</h1>
Expand All @@ -62,7 +62,7 @@ function ProjectDetailPage() {
</S.ProjectHeader>
{projectImage && (
<S.ProjectImageWrapper>
<Image src={projectImage} alt="project image" fill />
<Image src={projectImage} alt={`${name} 프로젝트 썸네일`} fill />
</S.ProjectImageWrapper>
)}
<S.ProjectWrapper>
Expand Down Expand Up @@ -113,7 +113,7 @@ function ProjectDetailPage() {
<Link href={url} key={title}>
<S.ProjectLink>
<S.ImageWrapper>
<Image src={src} alt={name} width="56" height="56" />
<Image src={src} alt={`${name} 로고`} width="56" height="56" />
</S.ImageWrapper>
<span>{name}</span>
</S.ProjectLink>
Expand Down
Loading

0 comments on commit a41af85

Please sign in to comment.