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

[Design] 클라이언트 페이지 디자인 및 수정 사항 반영 #71

Merged
merged 14 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 13 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
2 changes: 1 addition & 1 deletion apps/admin/app/error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ const errorPageContentStyle = css({
});

const buttonStyle = {
width: 328,
maxWidth: 328,
};
2 changes: 1 addition & 1 deletion apps/admin/app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ const notFoundPageContentStyle = css({
});

const buttonStyle = {
width: 328,
maxWidth: 328,
};
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,18 @@ const StudyItem = ({ study, appliedStudyId }: StudyItemProps) => {
const isNotApplicable = !isApplicable && !isCancelable;
return (
<Table>
<Flex direction="column" gap="xxs" justifyContent="center">
<Flex direction="column" gap="xxs" justifyContent="center" width={334}>
<Flex className={contentStyle} gap="xs">
<Text typo="h3">{title}</Text>
<Tag color={sessionColors[studyType] ?? "green"} variant="solid1">
{studyType}
</Tag>
</Flex>
<Text color="sub" typo="body2">
{`${introduction} -`}
<Link href={notionLink ?? ""} target="_blank">
{notionLink}
</Link>
</Text>
<Link href={notionLink ?? ""} target="_blank">
<Text className={introductionLinkTextStyle} color="sub" typo="body2">
{`(${introduction})`}
</Text>
</Link>
</Flex>
<Text className={textCellStyle}>{mentorName}</Text>
<Text className={textCellStyle}>{studyTime}</Text>
Expand Down Expand Up @@ -102,6 +101,12 @@ const contentStyle = css({
minWidth: "313px",
});

const introductionLinkTextStyle = css({
whiteSpace: "nowrap",
overflow: "hidden",
textOverflow: "ellipsis",
});

const sessionColors: Record<StudyType, ComponentProps<typeof Tag>["color"]> = {
"과제 스터디": "green",
"온라인 세션": "blue",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ const AuthErrorAfterRecruitmentPage = () => {
모집 기간에 합류 후 이용해주세요.
</p>
<div className={buttonContainerStyle}>
<Button aria-label="홈으로 이동" asProp={Link} href={routePath.landing}>
<Button
aria-label="홈으로 이동"
asProp={Link}
href={routePath.landing}
style={buttonStyle}
>
홈으로 이동
</Button>
</div>
Expand Down Expand Up @@ -79,3 +84,7 @@ const buttonContainerStyle = css({
gap: "12px",
width: "100%",
});

const buttonStyle = {
maxWidth: "328px",
};
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,19 @@ const AuthErrorDuringRecruitmentPage = () => {
아래 버튼을 눌러 가입할 수 있어요!
</p>
<div className={buttonContainerStyle}>
<Button aria-label="홈으로 이동" asProp={Link} href={routePath.landing}>
<Button
aria-label="홈으로 이동"
asProp={Link}
href={routePath.landing}
style={buttonStyle}
>
홈으로 이동
</Button>
<Button
aria-label="GDSC Hongik 가입하기"
asProp={Link}
href={routePath.onboarding}
style={buttonStyle}
variant="outline"
>
GDSC Hongik 가입하기
Expand Down Expand Up @@ -87,3 +93,7 @@ const buttonContainerStyle = css({
gap: "12px",
width: "100%",
});

const buttonStyle = {
maxWidth: "328px",
};
7 changes: 6 additions & 1 deletion apps/client/app/(beforeLogin)/auth/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const AuthPage = async () => {
asProp={Link}
href={routePath["github-oauth"]}
icon={githubLogoIcon}
style={{ backgroundColor: `${color.github}` }}
style={githubLoginButtonStyle}
>
GitHub 로그인
</Button>
Expand Down Expand Up @@ -108,3 +108,8 @@ const authImageStyle = css({
height: "100%",
width: "100%",
});

const githubLoginButtonStyle = {
backgroundColor: `${color.github}`,
maxWidth: "328px",
};
5 changes: 5 additions & 0 deletions apps/client/app/(beforeLogin)/landing/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const LandingPage = () => {
asProp={Link}
href={routePath.auth}
size="lg"
style={loginButtonStyle}
>
로그인
</Button>
Expand Down Expand Up @@ -85,3 +86,7 @@ const descriptionStyle = css({
marginBottom: "48px",
zIndex: 1,
});

const loginButtonStyle = {
maxWidth: "232px",
};
2 changes: 1 addition & 1 deletion apps/client/app/error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ const errorPageContentStyle = css({
});

const buttonStyle = {
width: 328,
maxWidth: 328,
};
2 changes: 1 addition & 1 deletion apps/client/app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ const notFoundPageContentStyle = css({
});

const buttonStyle = {
width: 328,
maxWidth: 328,
};
2 changes: 1 addition & 1 deletion apps/client/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const Navbar = async () => {
alt={menu.alt}
href={menu.href}
imageUrl={menu.imageUrl}
items={menu.items}
// items={menu.items}
key={menu.name}
name={menu.name}
/>
Expand Down
18 changes: 9 additions & 9 deletions apps/client/constants/navMenu.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import folderImageUrl from "../public/images/folder.svg";
// import folderImageUrl from "../public/images/folder.svg";
import homeImageUrl from "../public/images/home.svg";
import personImageUrl from "../public/images/person.svg";
import scheduleImageUrl from "../public/images/schedule.svg";
Expand All @@ -9,14 +9,14 @@ export const navMenu = [
imageUrl: homeImageUrl,
alt: "home-icon",
name: "나의 스터디",
items: [
{
href: "/my-assignment",
imageUrl: folderImageUrl,
alt: "folder-icon",
name: "나의 과제",
},
],
// items: [
// {
// href: "my-assignment",
// imageUrl: folderImageUrl,
// alt: "folder-icon",
// name: "나의 과제",
// },
// ],
},
{
href: "/study-apply",
Expand Down
3 changes: 2 additions & 1 deletion packages/ui/src/components/NavItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ const NavItem = ({ href, imageUrl, alt, name, items }: NavItemProps) => {
role="menuitem"
tabIndex={0}
className={navItemStyle({
type: !segment[1] && segment[0] === href ? "active" : "inactive",
type:
!segment[1] && `/${segment[0]}` === href ? "active" : "inactive",
})}
onClick={handleClickNavItem}
>
Expand Down
Loading