Skip to content
Open
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
2 changes: 1 addition & 1 deletion components/Columns/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import useCardId from '@/hooks/ModalCard/useCardId';
import useCardOpen from '@/hooks/ModalCard/useCardOpen';
import useDashBoardId from '@/hooks/ModalCard/useDashBoardId';
import calendar from '@/public/assets/icons/calendar.svg';
import DefaultImg from '@/public/assets/images/jaws.png';
import DefaultImg from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onPc, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down
4 changes: 2 additions & 2 deletions components/Columns/Column.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import CountChip from '@/components/Chip/CountChip';
import Card from '@/components/Columns/Card';
import Modal from '@/components/Modal/Modal';
import AddButton from '@/components/common/Button/AddButton';
import useColumns from '@/hooks/Dashboard/useColumn';
import useRefresh from '@/hooks/Common/useRefresh';
import useColumns from '@/hooks/Dashboard/useColumn';
import BlueEllipse from '@/public/assets/icons/BlueEllipse.svg';
import setting from '@/public/assets/icons/setting.svg';
import { fontStyle } from '@/styles/fontStyle';
Expand Down Expand Up @@ -39,7 +39,7 @@ function Column({ title, columnId, dashboardId, applyColumnDelete }: ColumnProps

useEffect(() => {
loadColumCardList(true);
}, [columnId, refresh]);
}, [columnId, refresh, loadColumCardList]);

return (
<>
Expand Down
25 changes: 12 additions & 13 deletions components/DashboardNavbar/DashboardNavbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,6 @@ function DashboardNavbar({ members, totalMembers, isMyDashboard, dashboard }: Da

return (
<StyledContainer $isMyDashboard={isMyDashboard}>
{isModalOpen && (
<Modal
title="초대하기"
getValue={setModalValue}
onCancelClick={() => setIsModalOpen(false)}
onOkClick={() => {
inviteFetch();
}}
/>
)}

<StyledTitleContainer>
<h3>{dashboardTitle}</h3>
{!isMyDashboard && dashboard && dashboard.createdByMe && (
Expand Down Expand Up @@ -69,6 +58,16 @@ function DashboardNavbar({ members, totalMembers, isMyDashboard, dashboard }: Da
<DarkModeToggleButton />
<Profile />
</StyledWrapper>
{isModalOpen && (
<Modal
title="초대하기"
getValue={setModalValue}
onCancelClick={() => setIsModalOpen(false)}
onOkClick={() => {
inviteFetch();
}}
/>
)}
</StyledContainer>
);
}
Expand Down Expand Up @@ -99,7 +98,7 @@ const StyledTitleContainer = styled.div`
}
`;

const StyledContainer = styled.div<{ $isMyDashboard: boolean }>`
const StyledContainer = styled.nav<{ $isMyDashboard: boolean }>`
position: fixed;
top: 0;
width: 100%;
Expand Down Expand Up @@ -127,7 +126,7 @@ const StyledContainer = styled.div<{ $isMyDashboard: boolean }>`
}
`;

const StyledWrapper = styled.div`
const StyledWrapper = styled.main`
position: relative;
display: flex;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion components/DashboardNavbar/Members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Image from 'next/image';
import styled from 'styled-components';

import useMembers from '@/hooks/DashboardNavbar/useMembers';
import DefaultProfile from '@/public/assets/images/jaws.png';
import DefaultProfile from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onPc, onTablet } from '@/styles/mediaQuery';
import { GetMembersInDashboardItem } from '@/types/api';
Expand Down
4 changes: 2 additions & 2 deletions components/DashboardNavbar/Profile.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Image from 'next/image';
import styled from 'styled-components';

import useProfile from '@/hooks/DashboardNavbar/useProfile';
import DashboardDropdown from '@/components/DashboardNavbar/DashboardDropdown';
import DefaultImg from '@/public/assets/images/jaws.png';
import useProfile from '@/hooks/DashboardNavbar/useProfile';
import DefaultImg from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onPc, onTablet } from '@/styles/mediaQuery';

Expand Down
6 changes: 3 additions & 3 deletions components/Landing/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import cardImg1 from '@/public/assets/images/landing4.png';
import cardImg2 from '@/public/assets/images/landing5.png';
import cardImg3 from '@/public/assets/images/landing6.png';
import cardImg1 from '@/public/assets/images/landing4.avif';
import cardImg2 from '@/public/assets/images/landing5.avif';
import cardImg3 from '@/public/assets/images/landing6.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onPc, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down
2 changes: 1 addition & 1 deletion components/Landing/Hero.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import LoginButton from '@/components/common/Button/LoginButton';
import HeroImg from '@/public/assets/images/landing1.png';
import HeroImg from '@/public/assets/images/landing1.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onPc, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down
4 changes: 2 additions & 2 deletions components/Landing/Nav.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import useTheme from '@/hooks/Common/useTheme';
import moonIcon from '@/public/assets/icons/moon.svg';
import sunIcon from '@/public/assets/icons/sun.svg';
import logoText from '@/public/assets/images/title.png';
import logoImage from '@/public/assets/images/transJaws.png';
import logoText from '@/public/assets/images/title.avif';
import logoImage from '@/public/assets/images/transJaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onPc, onTablet } from '@/styles/mediaQuery';

Expand Down
4 changes: 2 additions & 2 deletions components/Landing/Point.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pointImg1 from '@/public/assets/images/landing2.png';
import pointImg2 from '@/public/assets/images/landing3.png';
import pointImg1 from '@/public/assets/images/landing2.avif';
import pointImg2 from '@/public/assets/images/landing3.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onPc, onTablet } from '@/styles/mediaQuery';

Expand Down
2 changes: 1 addition & 1 deletion components/ModalCard/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import BasicInput from '@/components/Input/ModalInputContainer/BasicInput';
import useUser from '@/hooks/global/useUser';
import useComment from '@/hooks/useComment';

import DefaultImg from '@/public/assets/images/jaws.png';
import DefaultImg from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down
2 changes: 1 addition & 1 deletion components/ModalCard/Manager.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import useCardId from '@/hooks/ModalCard/useCardId';
import DefaultImg from '@/public/assets/images/jaws.png';
import DefaultImg from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile } from '@/styles/mediaQuery';
import { GetCardDetailsItem } from '@/types/api';
Expand Down
2 changes: 1 addition & 1 deletion components/ModalDropDown/DropDownMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import StatusChip from '@/components/Chip/StatusChip';
import useDropDownMenu from '@/hooks/DropDown/useDropDownMenu';
import Check from '@/public/assets/icons/GrayCheck.svg';
import DefaultImg from '@/public/assets/images/jaws.png';
import DefaultImg from '@/public/assets/images/jaws.avif';

import Image from 'next/image';
import { Dispatch, SetStateAction } from 'react';
Expand Down
4 changes: 2 additions & 2 deletions components/MyDashboard/MyDashBoardButtonBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function MyDashBoardButtonBox({ resetToFirst }: MyDashBoardButtonBoxProps) {

if (!pageNum || !totalPages) return null;
return (
<div>
<article>
<ButtonBoxWrapper>
<DashBoardAddButton onClick={() => setIsOpen(true)} />
{allItems.map((item) => (
Expand Down Expand Up @@ -49,7 +49,7 @@ function MyDashBoardButtonBox({ resetToFirst }: MyDashBoardButtonBoxProps) {
}}
/>
)}
</div>
</article>
);
}

Expand Down
2 changes: 1 addition & 1 deletion components/Sidebar/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const StyledDashboardGroupContainer = styled.div`
}
`;

const StyledTitleWrapper = styled.div`
const StyledTitleWrapper = styled.p`
Copy link
Contributor

Choose a reason for hiding this comment

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

div를 p로 바꾸는것도 도움이 되나요?

Copy link
Member Author

Choose a reason for hiding this comment

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

좀 더 구분했다고 해야될까요?
저는 주로 p태그를 사용하는 이유가 글로만 이루어진 문단이라면 사용하고 있습니다!

color: ${COLORS.GRAY_78};
margin-left: 16px;
overflow-x: hidden;
Expand Down
6 changes: 3 additions & 3 deletions components/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import Modal from '@/components/Modal/Modal';
import Dashboard from '@/components/Sidebar/Dashboard';
import { INIT_CREATE_DASHBOARD } from '@/constants/InitialModalValues';
import AddBox from '@/public/assets/icons/invite.svg';
import LogoTitle from '@/public/assets/images/title.png';
import Logo from '@/public/assets/images/transJaws.png';
import LogoTitle from '@/public/assets/images/title.avif';
import Logo from '@/public/assets/images/transJaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onPc, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down Expand Up @@ -76,7 +76,7 @@ function Sidebar({ boardId, refreshToggle, refresh }: SidebarProps) {

export default Sidebar;

const StyledContainer = styled.div`
const StyledContainer = styled.aside`
position: fixed;
z-index: 10;
display: flex;
Expand Down
42 changes: 20 additions & 22 deletions components/Table/InviteDashBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import TwinButton from '@/components/common/Button/TwinButton';
import useDeviceType from '@/hooks/Common/useDeviceType';
import useInviteDashBoard from '@/hooks/Dashboard/useInviteDashBoard';
import search from '@/public/assets/icons/Search.svg';
import NoContent from '@/public/assets/images/NoContent.png';
import NoContent from '@/public/assets/images/NoContent.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down Expand Up @@ -30,10 +30,10 @@ function InviteDashBoard({ refreshToFirst }: InviteDashBoardProps) {
} = useInviteDashBoard({ refreshToFirst });

return (
<StyledDiv $data={dataSource}>
<StyledArticle $data={dataSource}>
<StyledP>초대받은 대시보드</StyledP>
{dataSource.length !== 0 ? (
<div>
<section>
<form>
<StyledInputDiv>
<label htmlFor="search">
Expand Down Expand Up @@ -100,18 +100,16 @@ function InviteDashBoard({ refreshToFirst }: InviteDashBoardProps) {
<StyleListWrapper>
<StyledListInWrapper>{item.dashboard.title}</StyledListInWrapper>
<StyledListInWrapper>{item.inviter.nickname}</StyledListInWrapper>
<StyledListInWrapper>
<TwinButton
text1="수락"
text2="거절"
isViolet={true}
size="small"
className="temp2"
leftViolet={true}
onLeftClick={() => handleAccept({ acceptid: item.id, accept: true })}
onRightClick={() => handleAccept({ acceptid: item.id, accept: false })}
/>
</StyledListInWrapper>
<TwinButton
text1="수락"
text2="거절"
isViolet={true}
size="small"
className="temp2"
leftViolet={true}
onLeftClick={() => handleAccept({ acceptid: item.id, accept: true })}
onRightClick={() => handleAccept({ acceptid: item.id, accept: false })}
/>
</StyleListWrapper>
)}
<StyledHr />
Expand All @@ -123,22 +121,22 @@ function InviteDashBoard({ refreshToFirst }: InviteDashBoardProps) {
)}
</InfiniteScroll>
</Div>
</div>
</section>
) : (
<>
<NoContentContainer>
<NoContentImage src={NoContent} alt="없는컨텐츠" />
<NoContentImage priority width={100} height={100} src={NoContent} alt="없는컨텐츠" />
<NoContentDiv>아직 초대받은 대시보드가 없어요</NoContentDiv>
</NoContentContainer>
</>
)}
</StyledDiv>
</StyledArticle>
);
}

export default InviteDashBoard;

const Div = styled.div`
const Div = styled.section`
height: 430px;
overflow-x: hidden;

Expand All @@ -157,7 +155,7 @@ const Div = styled.div`
}
`;

const StyledDiv = styled.div<{ $data: any }>`
const StyledArticle = styled.article<{ $data: any }>`
width: 1023px;
height: 630px;
border-radius: 8px;
Expand Down Expand Up @@ -272,7 +270,7 @@ const StyledWrapper = styled.div`
width: 23%;
}
`;
const StyledInWrapper = styled.div`
const StyledInWrapper = styled.p`
width: 100%;
color: ${COLORS.GRAY_9F};
${fontStyle(16, 400)};
Expand All @@ -294,7 +292,7 @@ const StyleListWrapper = styled.div`
width: 70%;
}
`;
const StyledListInWrapper = styled.div`
const StyledListInWrapper = styled.p`
float: left;
width: 100%;
color: var(--content-main);
Expand Down
2 changes: 1 addition & 1 deletion components/Table/InviteDetailsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Button from '@/components/common/Button/Button';
import PaginationButton from '@/components/common/Button/PaginationButton';
import usePagination from '@/hooks/Common/usePagination';
import useInviteDetailsTable from '@/hooks/Edit/useInviteDetailsTable';
import NoItem from '@/public/assets/images/noItem.png';
import NoItem from '@/public/assets/images/NoContent.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down
2 changes: 1 addition & 1 deletion components/Table/MembersTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useDeleteMemberInDashboard } from '@/apis/queries/members';
import Button from '@/components/common/Button/Button';
import PaginationButton from '@/components/common/Button/PaginationButton';
import usePagination from '@/hooks/Common/usePagination';
import DefaultImage from '@/public/assets/images/jaws.png';
import DefaultImage from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { onMobile, onTablet } from '@/styles/mediaQuery';
import { COLORS } from '@/styles/palettes';
Expand Down
14 changes: 8 additions & 6 deletions constants/Metadata.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import mainLogo from '@/public/assets/images/jaws.png';
import mainLogo from '@/public/assets/images/jaws.avif';

export const METADATA = {
title: 'Jawstify',
description: '일정관리 조습니다🦈',
url: 'https://taskify4.vercel.app/',
image: mainLogo.src,
locale: 'ko_KR',
TITLE: 'Jawstify',
DESCRIPTION: '일정관리 조습니다🦈',
URL: 'https://taskify4.vercel.app/',
IMAGE: mainLogo.src,
LOCALE: 'ko_KR',
TYPE: 'website',
DOMAIN: 'taskify4.vercel.app',
};
Loading