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

Jump to bottom

배포 LINK #52

Merged
merged 1 commit into from
Jun 12, 2024
Merged

배포 LINK #52

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 src/hook/useLogin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const useLogin = () => {

const onSuccess = async (data: UserLoginType) => {
const { accessToken } = data.data;
const cookieOptions = { path: '/', maxAge: 600000 * 15 };
const cookieOptions = { path: '/', maxAge: 300 };
// const token = await getTokenHandler();
// fcmpost({ fcmToken: token });
setCookie('token', accessToken, cookieOptions);
Expand Down
5 changes: 2 additions & 3 deletions src/pages/mypage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const MyPage = () => {
const [successModal, setSuccessModal] = useState(false);
const logout = useLoggedOut();
const handleLogout = () => {
console.log('Logged out');
setModalVisible(false);
setSuccessModal(true);

Expand All @@ -28,7 +27,7 @@ const MyPage = () => {
const handleCancel = () => {
setModalVisible(false);
};
console.log(member.imageUrl);

return (
<div className=" max-w-[393px] mx-auto relative">
<Footer />
Expand Down Expand Up @@ -60,7 +59,7 @@ const MyPage = () => {
</div>
<Link href="/mypage/changeprofile">
<div>
<div className="w-[361px] h-[42px] p-2 rounded-sm border border-zinc-400 flex justify-center items-center gap-2 mt-[32px]">
<div className=" sm:w-[340px] w-[361px] h-[42px] p-2 rounded-sm border border-zinc-400 flex justify-center items-center gap-2 mt-[32px]">
<div className="text-black/opacity-20 text-base font-normal font-['Pretendard'] leading-normal">
프로필 수정
</div>
Expand Down
18 changes: 9 additions & 9 deletions src/pages/mypage/notice/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const NoticePage = () => {
onClick={() => toggleNotice('notice')}>
<div className="flex justify-between items-center">
<div className="text-black/opacity-20 text-sm font-semibold leading-[21px] tracking-tight">
[안내] 5/13 (월) 02~03 커뮤니티 서비스 점검
[안내] 5/20 (월) 02~03 커뮤니티 서비스 점검
</div>
<img
className="w-[23px] h-[34px] mr-[6px] cursor-pointer "
Expand All @@ -36,7 +36,7 @@ const NoticePage = () => {
/>
</div>
<div className="text-zinc-400 text-xs font-normal tracking-tight">
2024. 00. 00
2024. 05. 18
</div>
</div>
{openNotice === 'notice' && (
Expand All @@ -46,7 +46,7 @@ const NoticePage = () => {
Offispace 커뮤니티 서비스팀입니다.
<br />
<br />
5월 13일 (월요일) 새벽 2시부터 3시까지 (총 1시간 예상)
5월 20일 (월요일) 새벽 2시부터 3시까지 (총 1시간 예상)
<br />
전체 커뮤니티 서비스 점검이 진행됩니다.
<br />
Expand All @@ -71,7 +71,7 @@ const NoticePage = () => {
onClick={() => toggleNotice('update1')}>
<div className="flex justify-between items-center">
<div className="text-black/opacity-20 text-sm font-semibold leading-[21px] tracking-tight">
[업데이트 내역] 1.0.2 업데이트
[업데이트 내역] 1.0.3 업데이트
</div>
<img
className="w-[23px] h-[34px] mr-[6px] cursor-pointer"
Expand All @@ -84,7 +84,7 @@ const NoticePage = () => {
/>
</div>
<div className="text-zinc-400 text-xs font-normal tracking-tight">
2024. 00. 00
2024. 05. 15
</div>
</div>
{openNotice === 'update1' && (
Expand All @@ -93,7 +93,7 @@ const NoticePage = () => {
<br />
Offispace 서비스팀입니다.
<br />
4월 2일 이루어진 1.0.2 업데이트 사항을 알려드립니다.
5월 2일 이루어진 1.0.3 업데이트 사항을 알려드립니다.
<br />
<br />
1. 알림 센터
Expand All @@ -115,7 +115,7 @@ const NoticePage = () => {
onClick={() => toggleNotice('update2')}>
<div className="flex justify-between items-center">
<div className="text-black/opacity-20 text-sm font-semibold leading-[21px] tracking-tight">
[업데이트 내역] 1.0.3 업데이트
[업데이트 내역] 1.0.2 업데이트
</div>
<img
className="w-[23px] h-[34px] mr-[6px] cursor-pointer"
Expand All @@ -128,7 +128,7 @@ const NoticePage = () => {
/>
</div>
<div className="text-zinc-400 text-xs font-normal tracking-tight">
2024. 00. 00
2024. 04. 12
</div>
</div>
{openNotice === 'update2' && (
Expand All @@ -138,7 +138,7 @@ const NoticePage = () => {
Offispace 서비스팀입니다.
<br />
<br />
5월 12일 앱 사용성 개선 및 버그 수정을 위해 1.0.3 업데이트가 있었습니다.
4월 12일 앱 사용성 개선 및 버그 수정을 위해 1.0.2 업데이트가 있었습니다.
<br />
<br />
감사합니다.
Expand Down
4 changes: 2 additions & 2 deletions tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const config: Config = {
],
theme: {
screens: {
xs: { min: ' 350px', max: '400px' },
sm: { min: '401p', max: '551px' },
xs: { min: ' 350px', max: '380px' },
sm: { min: '381p', max: '551px' },
md: { min: '552px' }
// ...
},
Expand Down
Loading