diff --git a/components/Columns/Card.tsx b/components/Columns/Card.tsx
index 3b90624f..857eb502 100644
--- a/components/Columns/Card.tsx
+++ b/components/Columns/Card.tsx
@@ -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';
diff --git a/components/Columns/Column.tsx b/components/Columns/Column.tsx
index c59311d8..b83582ea 100644
--- a/components/Columns/Column.tsx
+++ b/components/Columns/Column.tsx
@@ -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';
@@ -39,7 +39,7 @@ function Column({ title, columnId, dashboardId, applyColumnDelete }: ColumnProps
useEffect(() => {
loadColumCardList(true);
- }, [columnId, refresh]);
+ }, [columnId, refresh, loadColumCardList]);
return (
<>
diff --git a/components/DashboardNavbar/DashboardNavbar.tsx b/components/DashboardNavbar/DashboardNavbar.tsx
index 2ecdd590..f328146a 100644
--- a/components/DashboardNavbar/DashboardNavbar.tsx
+++ b/components/DashboardNavbar/DashboardNavbar.tsx
@@ -30,17 +30,6 @@ function DashboardNavbar({ members, totalMembers, isMyDashboard, dashboard }: Da
return (
- {isModalOpen && (
- setIsModalOpen(false)}
- onOkClick={() => {
- inviteFetch();
- }}
- />
- )}
-
{dashboardTitle}
{!isMyDashboard && dashboard && dashboard.createdByMe && (
@@ -69,6 +58,16 @@ function DashboardNavbar({ members, totalMembers, isMyDashboard, dashboard }: Da
+ {isModalOpen && (
+ setIsModalOpen(false)}
+ onOkClick={() => {
+ inviteFetch();
+ }}
+ />
+ )}
);
}
@@ -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%;
@@ -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;
diff --git a/components/DashboardNavbar/Members.tsx b/components/DashboardNavbar/Members.tsx
index 871e1443..6027dbc3 100644
--- a/components/DashboardNavbar/Members.tsx
+++ b/components/DashboardNavbar/Members.tsx
@@ -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';
diff --git a/components/DashboardNavbar/Profile.tsx b/components/DashboardNavbar/Profile.tsx
index 2b23b139..d87dbdf2 100644
--- a/components/DashboardNavbar/Profile.tsx
+++ b/components/DashboardNavbar/Profile.tsx
@@ -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';
diff --git a/components/Landing/Card.tsx b/components/Landing/Card.tsx
index 0aa7f9cc..0a1d7c73 100644
--- a/components/Landing/Card.tsx
+++ b/components/Landing/Card.tsx
@@ -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';
diff --git a/components/Landing/Hero.tsx b/components/Landing/Hero.tsx
index c2c1c458..8bade579 100644
--- a/components/Landing/Hero.tsx
+++ b/components/Landing/Hero.tsx
@@ -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';
diff --git a/components/Landing/Nav.tsx b/components/Landing/Nav.tsx
index a34e09cb..dcf9213a 100644
--- a/components/Landing/Nav.tsx
+++ b/components/Landing/Nav.tsx
@@ -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';
diff --git a/components/Landing/Point.tsx b/components/Landing/Point.tsx
index 6818b11a..7fb360e0 100644
--- a/components/Landing/Point.tsx
+++ b/components/Landing/Point.tsx
@@ -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';
diff --git a/components/ModalCard/Comment.tsx b/components/ModalCard/Comment.tsx
index b045feaa..60dfcf0c 100644
--- a/components/ModalCard/Comment.tsx
+++ b/components/ModalCard/Comment.tsx
@@ -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';
diff --git a/components/ModalCard/Manager.tsx b/components/ModalCard/Manager.tsx
index f66a45aa..08177f40 100644
--- a/components/ModalCard/Manager.tsx
+++ b/components/ModalCard/Manager.tsx
@@ -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';
diff --git a/components/ModalDropDown/DropDownMenu.tsx b/components/ModalDropDown/DropDownMenu.tsx
index 40e2ec98..ac8e203e 100644
--- a/components/ModalDropDown/DropDownMenu.tsx
+++ b/components/ModalDropDown/DropDownMenu.tsx
@@ -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';
diff --git a/components/MyDashboard/MyDashBoardButtonBox.tsx b/components/MyDashboard/MyDashBoardButtonBox.tsx
index a3d8d061..52bb48c0 100644
--- a/components/MyDashboard/MyDashBoardButtonBox.tsx
+++ b/components/MyDashboard/MyDashBoardButtonBox.tsx
@@ -18,7 +18,7 @@ function MyDashBoardButtonBox({ resetToFirst }: MyDashBoardButtonBoxProps) {
if (!pageNum || !totalPages) return null;
return (
-
+
setIsOpen(true)} />
{allItems.map((item) => (
@@ -49,7 +49,7 @@ function MyDashBoardButtonBox({ resetToFirst }: MyDashBoardButtonBoxProps) {
}}
/>
)}
-
+
);
}
diff --git a/components/Sidebar/Dashboard.tsx b/components/Sidebar/Dashboard.tsx
index 486ae4b7..30e5f180 100644
--- a/components/Sidebar/Dashboard.tsx
+++ b/components/Sidebar/Dashboard.tsx
@@ -75,7 +75,7 @@ const StyledDashboardGroupContainer = styled.div`
}
`;
-const StyledTitleWrapper = styled.div`
+const StyledTitleWrapper = styled.p`
color: ${COLORS.GRAY_78};
margin-left: 16px;
overflow-x: hidden;
diff --git a/components/Sidebar/Sidebar.tsx b/components/Sidebar/Sidebar.tsx
index 62dbc313..e0d6ae3c 100644
--- a/components/Sidebar/Sidebar.tsx
+++ b/components/Sidebar/Sidebar.tsx
@@ -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';
@@ -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;
diff --git a/components/Table/InviteDashBoard.tsx b/components/Table/InviteDashBoard.tsx
index 3d8465d2..abfedd4b 100644
--- a/components/Table/InviteDashBoard.tsx
+++ b/components/Table/InviteDashBoard.tsx
@@ -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';
@@ -30,10 +30,10 @@ function InviteDashBoard({ refreshToFirst }: InviteDashBoardProps) {
} = useInviteDashBoard({ refreshToFirst });
return (
-
+
초대받은 대시보드
{dataSource.length !== 0 ? (
-
+
-
+
) : (
<>
-
+
아직 초대받은 대시보드가 없어요
>
)}
-
+
);
}
export default InviteDashBoard;
-const Div = styled.div`
+const Div = styled.section`
height: 430px;
overflow-x: hidden;
@@ -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;
@@ -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)};
@@ -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);
diff --git a/components/Table/InviteDetailsTable.tsx b/components/Table/InviteDetailsTable.tsx
index 736bad48..326a921a 100644
--- a/components/Table/InviteDetailsTable.tsx
+++ b/components/Table/InviteDetailsTable.tsx
@@ -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';
diff --git a/components/Table/MembersTable.tsx b/components/Table/MembersTable.tsx
index 30ee9bba..8aa74596 100644
--- a/components/Table/MembersTable.tsx
+++ b/components/Table/MembersTable.tsx
@@ -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';
diff --git a/constants/Metadata.ts b/constants/Metadata.ts
index a9bda949..528cc6ec 100644
--- a/constants/Metadata.ts
+++ b/constants/Metadata.ts
@@ -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',
};
diff --git a/pages/404/index.tsx b/pages/404/index.tsx
index 768e3335..eaea48a7 100644
--- a/pages/404/index.tsx
+++ b/pages/404/index.tsx
@@ -1,34 +1,28 @@
import Button from '@/components/common/Button/Button';
-import DefaultImg from '@/public/assets/images/jaws.png';
+import DefaultImg from '@/public/assets/images/jaws.avif';
import { fontStyle } from '@/styles/fontStyle';
import { COLORS } from '@/styles/palettes';
import Image from 'next/image';
import { useRouter } from 'next/router';
-import { Helmet } from 'react-helmet';
import { styled } from 'styled-components';
function NotFound() {
const router = useRouter();
const back = router.back;
return (
- <>
-
- 404 - Jawstify
-
-
- 404
-
- 조습니다... 잘못 들어오셨습니다 🦈
-
-
- >
+
+ 404
+
+ 조습니다... 잘못 들어오셨습니다 🦈
+
+
);
}
export default NotFound;
-const StyledContainer = styled.div`
+const StyledContainer = styled.main`
height: 100vh;
display: flex;
flex-direction: column;
@@ -37,16 +31,16 @@ const StyledContainer = styled.div`
background: ${COLORS.VIOLET_55};
`;
+const Styled404Text = styled.h1`
+ ${fontStyle(250, 800)}
+`;
+
const Styled404Image = styled(Image)`
position: absolute;
margin-bottom: 120px;
`;
-const Styled404Text = styled.h1`
- ${fontStyle(250, 800)}
-`;
-
-const StyledText = styled.h1`
+const StyledText = styled.h2`
${fontStyle(40, 600)}
margin-bottom: 30px;
`;
diff --git a/pages/[dashboardid]/edit.tsx b/pages/[dashboardid]/edit.tsx
index 0ad90f7a..b26bdeda 100644
--- a/pages/[dashboardid]/edit.tsx
+++ b/pages/[dashboardid]/edit.tsx
@@ -1,6 +1,5 @@
import { GetServerSideProps } from 'next';
import { useRouter } from 'next/router';
-import { Helmet } from 'react-helmet';
import styled from 'styled-components';
import { useDeleteDashboard } from '@/apis/queries/dashboard';
@@ -50,33 +49,23 @@ function BoardEdit({ dashboardId }: BoardEditProps) {
};
return (
- <>
-
- 대시보드 수정 - Jawstify
-
-
-
-
-
-
- 돌아가기
-
-
-
-
-
-
-
-
-
-
-
- >
+
+
+
+
+
+ 돌아가기
+
+
+
+
+
+
+
+
+
+
+
);
}
diff --git a/pages/_app.tsx b/pages/_app.tsx
index f914d402..015a376a 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,10 +1,12 @@
/* eslint-disable @next/next/inline-script-id */
+import { METADATA } from '@/constants/Metadata';
import * as gtag from '@/lib/gtag';
import GlobalStyles from '@/styles/GlobalStyles';
import { HydrationBoundary, QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import type { AppProps } from 'next/app';
+import Head from 'next/head';
import Script from 'next/script';
import { useState } from 'react';
import { Toaster } from 'react-hot-toast';
@@ -24,6 +26,20 @@ export default function App({ Component, pageProps }: AppProps) {
return (
<>
{/* */}
+
+ Jawstify
+
+
+
+
+
+
+
+
+
+
+
+