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.

Sign up for GitHub

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: [LINKER-135] 캘린더에 데이터가 없을때 에러페이지 #70

Merged
merged 1 commit into from
Feb 23, 2024
Merged

feat: [LINKER-135] 캘린더에 데이터가 없을때 에러페이지 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 services/web/src/app/my/contact/component/ContactDefault/ContactDefault.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function ContactDefault({ defaultContact, bookmarksContact }: Pro
{bookmarksContact.length}
</Txt>
</div>
{bookmarksContact.length > 0 ? (
{bookmarksContact.length > 1 ? (
<button className={favoriteDropDown} onClick={onFavoriteClick}>
{isClickFavorites ? <Icon name="down" size={24} /> : <Icon name="up" size={24} />}
</button>
Expand Down
5 changes: 3 additions & 2 deletions services/web/src/app/my/timeline/component/TimelineItem/TimelineItem.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ export const timelineRowWrapper = style({

export const timelineColorDivider = style({
position: 'absolute',
left: '-1.4rem',
left: '1.4rem',
top: '0.9rem',
width: '0.4rem',
borderRadius: '0.8rem',
height: '100%',
height: '80%',
});
export const timelineItemDivider = style({
marginTop: '1.2rem',
Expand Down
16 changes: 16 additions & 0 deletions services/web/src/app/my/timeline/component/TimelineNull/TimelineNull.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { style } from '@vanilla-extract/css';

export const container = style({
display: 'flex',
width: '100%',
height: '40rem',
justifyContent: 'center',
alignItems: 'center',
});
export const wrapper = style({
display: 'flex',
flexDirection: 'column',
width: '100%',
justifyContent: 'center',
alignItems: 'center',
});
23 changes: 21 additions & 2 deletions services/web/src/app/my/timeline/component/TimelineNull/TimelineNull.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
'use client';

import { Calendar, Spacing } from '@linker/lds';
import { Calendar, Txt } from '@linker/lds';
import { colors } from '@linker/styles';
import Image from 'next/image';
import { useRouter } from 'next/navigation';
import { useEffect, useState } from 'react';

import { wrapper, container } from './TimelineNull.css';

const TimelineNull = () => {
const router = useRouter();

Expand All @@ -27,7 +31,22 @@ const TimelineNull = () => {
}}
withModeChange
/>
<Spacing size={20} />
<article className={container}>
<section className={wrapper}>
<Image
src={'https://static.im-linker.com/images/Subtract.svg'}
width={48}
height={48}
alt={'subtract'}
/>
Comment on lines +36 to +41
Copy link
Member

@useonglee useonglee Feb 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

svg이면 icon으로 들어가야해욥..!
<Icon name="subtract" size={48} />

추가해두기도 했어용

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오왓 다음 Pr에서 얘도 수정해둘게요 감사합니당 :)

<Txt typography="p1" color={colors.gray700} fontWeight="regular">
예정된 일정이 없습니다.
</Txt>
<Txt typography="p1" color={colors.gray700} fontWeight="regular">
일정을 추가해주세요.
</Txt>
</section>
</article>
</>
);
};
Expand Down
Loading