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

[ Feat ] QA mobile 멘트수정, dialogAlert 관련 #47

Merged
merged 10 commits into from
Nov 4, 2024
12 changes: 4 additions & 8 deletions apps/mobile/src/app/(main)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const MainPage = () => {
<h1 className={`${heading2Style} ${textCenter}`}>
우리학교, 우리지역의
<br />
개발 실력을 겨루어보자(가제)
개발자 만나기
</h1>

<div className={buttonDivStyle}>
Expand All @@ -48,19 +48,15 @@ const MainPage = () => {
<h1 className={heading1Style}>유저 랭킹</h1>

<h2 className={heading2Style}>
level별
tier별
<br />
개발자들의 랭킹을
유저들의 랭킹을
<br />
확인해보세요
</h2>

<p className={paragraphStyle}>
rankit에서
<br />
분석한 깃허브 점수를
<br />
보여드려요(가제)
rankit에서 깃허브를 분석한 점수를 보여드려요.
</p>

<RankBoardWithTier />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const userNameStyle = style({
});

export const userCommentStyle = style({
...globalTheme.fonts.mobileDetailReg14,
...globalTheme.fonts.mobileDetailMed10,
color: globalTheme.colors.blue_66,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ const AboutDeveloper = ({
userName,
userComment,
userTier, // 새로운 prop 추가
userGithub,
userImage,
}: {
userPosition: string;
userName: string;
userComment: string;
userTier: number; // 1부터 6까지의 숫자
userGithub: string;
userImage: StaticImageData;
}) => {
// 티어에 따른 컴포넌트 선택
Expand All @@ -49,9 +47,6 @@ const AboutDeveloper = ({
<div className={divMainContentStyle}>
<div className={divSubContentStyle1}>
<p className={userPositionStyle}>{userPosition}</p>
<a href={userGithub} className="">
github 방문
</a>
</div>

<div className={divSubContentStyle2}>
Expand Down
4 changes: 0 additions & 4 deletions apps/mobile/src/app/about/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,13 @@ const AboutPage = () => {
userTier={1}
userName="김효준"
userComment="자유롭게 살고 싶어요."
userGithub="https://github.com/khyojun"
userImage={hyojun}
/>
<AboutDeveloper
userPosition="BackEnd"
userTier={2}
userName="이승준"
userComment="맥북 쓰고 싶어요."
userGithub="https://github.com/leesj000603"
userImage={seungjun}
/>
</div>
Expand All @@ -168,15 +166,13 @@ const AboutPage = () => {
userTier={3}
userName="서대원"
userComment="힙합 is my life."
userGithub="https://github.com/suwonthugger"
userImage={daewon}
/>
<AboutDeveloper
userPosition="FrontEnd"
userTier={4}
userName="박우석"
userComment="아직도 맥북을 안"
userGithub="https://github.com/jamooooong"
userImage={wooseok}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ export const bottomDivStyle = style({
});

export const skipButtonStyle = style({
...globalTheme.fonts.mobileDetailReg14,
position: 'absolute',
top: '1.1rem',
top: '0.8rem',
right: 0,
color: globalTheme.colors.blue_33,
});

export const InputMenuPlaceholderStyle = style({
Expand Down
19 changes: 18 additions & 1 deletion apps/mobile/src/app/auth/_components/authRegion/authRegion.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useState } from 'react';
import CustomAlertDialog from '@/shared/components/alertDialog/AlertDialog';
import Button from '@/shared/components/button/button';
import Input from '@/shared/components/input/input';
import { useGetRegionNames, usePostAuthJoin } from '@/shared/apis/auth/queries';
Expand Down Expand Up @@ -93,7 +94,23 @@ const AuthRegion = ({ handleNextStep, 대학교 }: AuthRegionProps) => {
<div className={bottomDivStyle}>
<Button onClick={handle회원가입}>다음</Button>

<button className={skipButtonStyle}>건너뛰기</button>
<div className={skipButtonStyle}>
<CustomAlertDialog
att="yesOrNo"
variant="textBtn"
color="blue"
title="알림!"
description={[
'소속 지역 등록을 건너뜁니다.',
<br key="br" />,
'"지역 없음"으로 표시됩니다.',
]}
cancelText="취소"
confirmText="확인"
triggerText="건너뛰기"
onConfirm={() => handleNextStep('completion')}
/>
</div>
</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ export const bottomDivStyle = style({
});

export const skipButtonStyle = style({
...globalTheme.fonts.mobileDetailReg14,
position: 'absolute',
top: '9.5rem',
top: '9.1rem',
right: 0,
color: globalTheme.colors.blue_33,
});

export const InputMenuPlaceholderStyle = style({
Expand Down
19 changes: 18 additions & 1 deletion apps/mobile/src/app/auth/_components/authSchool/authSchool.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { useState } from 'react';
import CustomAlertDialog from '@/shared/components/alertDialog/AlertDialog';
import Button from '@/shared/components/button/button';
import Input from '@/shared/components/input/input';
import {
Expand Down Expand Up @@ -164,7 +165,23 @@ const AuthSchool = ({ handleNextStep, handle대학교변경 }: AuthSchoolProps)

<Button onClick={handle인증번호검증}>다음</Button>

<button className={skipButtonStyle}>건너뛰기</button>
<div className={skipButtonStyle}>
<CustomAlertDialog
att="yesOrNo"
variant="textBtn"
color="blue"
title="알림!"
description={[
'소속 대학교 등록을 건너뜁니다.',
<br key="br" />,
'"학교 없음"으로 표시됩니다.',
]}
cancelText="취소"
confirmText="확인"
triggerText="건너뛰기"
onConfirm={() => handleNextStep('region')}
/>
</div>
</div>
</div>
);
Expand Down
6 changes: 5 additions & 1 deletion apps/mobile/src/app/board/boardPage.css.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { globalTheme } from '@/shared/styles/globalTheme.css';
import { style } from '@vanilla-extract/css';
import { globalTheme } from '@/shared/styles/globalTheme.css';

export const heading2Style = style({
...globalTheme.fonts.mobileTitleBold28,
Expand All @@ -25,6 +25,10 @@ export const container = style([
width: '100%',
},
]);
export const heading1Style = style({
...globalTheme.fonts.mobileTitleSemiBold20,
color: globalTheme.colors.blue_main,
});

export const divStyle = style({
display: 'flex',
Expand Down
14 changes: 3 additions & 11 deletions apps/mobile/src/app/board/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,16 @@ import {
heading2Style,
inputStyle,
paragraphStyle,
heading1Style,
} from './boardPage.css';

const SchoolPage = () => {
return (
<div className={container}>
<div className={divStyle}>
<h2 className={heading2Style}>
고지를
<br />
선점하기 위해
<br />
싸워라.
</h2>

<h1 className={heading1Style}>보드</h1>
<p className={paragraphStyle}>
rankit의 모든 유저들이
<br />
자유롭게 소통하는 공간입니다.
rankit의 모든 유저들이 자유롭게 소통하는 공간입니다.
<br />
부적절한 멘트는 지양해주세요.
</p>
Expand Down
6 changes: 1 addition & 5 deletions apps/mobile/src/app/region/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ const SchoolPage = () => {
</h2>

<p className={paragraphStyle}>
지역명을 눌러서
<br />
지역내 유저들의
<br />
순위를 볼 수 있어요.
지역명을 눌러서 지역내 유저들의 순위를 볼 수 있어요.
</p>

<Input
Expand Down
6 changes: 1 addition & 5 deletions apps/mobile/src/app/school/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ const SchoolPage = () => {
</h2>

<p className={paragraphStyle}>
학교명을 눌러서
<br />
교내 유저들의
<br />
순위를 볼 수 있어요.
학교명을 눌러서 교내 유저들의 순위를 볼 수 있어요.
</p>

<Input
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/src/app/user/userSetting/main-setting/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const MainSetting = ({ userSchool, userRegion }: MainSettingProps) => {
소속학교 == {userSchool || '학교 없음'}
</p>
<Link href="/school-setting">
<Button>변경</Button>
<Button size="sm">변경</Button>
</Link>
</div>
<p className={paragraphStyle2}>
Expand All @@ -63,7 +63,7 @@ const MainSetting = ({ userSchool, userRegion }: MainSettingProps) => {
소속지역 == {userRegion || '지역 없음'}
</p>
<Link href="/region-setting">
<Button>변경</Button>
<Button size="sm">변경</Button>
</Link>
</div>
<p className={paragraphStyle2}>소속지역를 변경할 수 있습니다.</p>
Expand Down
Loading