Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
5424009
temp
KRHotSauce Jan 20, 2025
60b9243
temp
KRHotSauce Jan 21, 2025
c4e88a6
temp
KRHotSauce Jan 22, 2025
0d8e3dc
Merge branch 'dev' into dev_community
KRHotSauce Jan 22, 2025
f00d108
feat: post버튼 추가, 디자인 수정
pa98213-bot Jan 22, 2025
4d943c9
Merge pull request #32 from pyeongan-213/dev_test
pyan213 Jan 22, 2025
818c321
feat : community 좋아요 및 카테고리 등 추가
KRHotSauce Jan 22, 2025
269a6fd
fix : compile error
KRHotSauce Jan 22, 2025
4411040
feat:설정 페이지 구현 #10
Donga1125 Jan 22, 2025
f687501
fix: 충돌 해결 #10
Donga1125 Jan 22, 2025
90984b6
feat: 환경설정 페이지 구현 #10
Donga1125 Jan 22, 2025
5d83006
feat : 수정 페이지 작업중
KRHotSauce Jan 22, 2025
6805df9
fix : complie error
KRHotSauce Jan 22, 2025
3bb5f33
Merge pull request #34 from MukPic/dev_community
KRHotSauce Jan 22, 2025
4da7c0b
temp
KRHotSauce Jan 23, 2025
6e1aefe
fix : imageupload시 응답 타입 수정
KRHotSauce Jan 23, 2025
6330d02
Merge pull request #35 from MukPic/dev_login
KRHotSauce Jan 23, 2025
86ea051
feat: 회원 프로필 수정 페이지 제작 #10
Donga1125 Jan 23, 2025
2319ea6
design : root-wrapper
KRHotSauce Jan 23, 2025
33a6ff0
change: 음식 카테고리 이름, 내용 / 이미지 클릭 시 해당 음식 검색
pa98213-bot Jan 23, 2025
3facd60
Merge pull request #36 from pyeongan-213/dev
pyan213 Jan 23, 2025
6f5743a
feat: 환경설정 - 회원 프로필/유저네임 수정페이지, 회원 알러지 정보 수정페이지, 회원 기타 정보 수정페이지, 비밀번호…
Donga1125 Jan 23, 2025
c665355
feat: 환경설정 페이지 구현 #10
Donga1125 Jan 23, 2025
ed8c0c0
design : add bot nav
KRHotSauce Jan 24, 2025
037ee01
Merge pull request #39 from MukPic/dev_community
KRHotSauce Jan 24, 2025
fefde90
design : modify globals.cs
KRHotSauce Jan 24, 2025
0786176
change : modify page
KRHotSauce Jan 24, 2025
97b82b5
Merge pull request #40 from MukPic/dev_community
KRHotSauce Jan 24, 2025
76260fd
change: design
pa98213-bot Jan 24, 2025
06e2a9c
Merge branch 'dev' into dev
pyan213 Jan 24, 2025
41a4ae6
Merge pull request #41 from pyeongan-213/dev
pyan213 Jan 24, 2025
70ee21e
fix: 빌드 오류 수정
Donga1125 Jan 24, 2025
50fbc15
Merge pull request #42 from Donga1125/dev
Donga1125 Jan 24, 2025
fd844ba
fix : comile error
KRHotSauce Jan 24, 2025
9a66347
Merge branch 'dev' into dev_community
KRHotSauce Jan 24, 2025
f755706
Merge pull request #43 from MukPic/dev_community
KRHotSauce Jan 24, 2025
d0475d4
change: design
pa98213-bot Jan 24, 2025
952d6b8
Merge pull request #44 from pyeongan-213/dev
pyan213 Jan 24, 2025
ef6453f
temp
KRHotSauce Jan 24, 2025
3b1f518
temp
KRHotSauce Jan 24, 2025
f99a555
fix: 내가 작성한 게시글과 좋아요한 글이 4개 미만일 때 이미지 크기 문제 수정 #9
Donga1125 Jan 24, 2025
3f7dcf2
design : 상세 페이지 디자인 변경
KRHotSauce Jan 25, 2025
a40da2e
Merge branch 'dev_community' of https://github.com/MukPic/MukPic_Fron…
KRHotSauce Jan 25, 2025
969ba7b
Merge pull request #45 from MukPic/dev_community
KRHotSauce Jan 25, 2025
6079935
Merge branch 'dev' into dev_login
KRHotSauce Jan 25, 2025
5bc8548
design : 약관 추가 및 알러지 배치 수정
KRHotSauce Jan 25, 2025
d09a4a2
feat: 로그아웃 페이지 구현 #9
Donga1125 Jan 25, 2025
4149f1d
fix: 내가 작성한 게시글과 좋아요한 글이 4개 미만일 때 이미지 크기 문제 수정 #9
Donga1125 Jan 25, 2025
ccc0018
change: 버튼 디자인 수정
pa98213-bot Jan 25, 2025
61b019e
Merge pull request #47 from pyeongan-213/dev
pyan213 Jan 25, 2025
c491099
fix: 마이페이지 수정 요구사항 반영 #9
Donga1125 Jan 25, 2025
5783ddc
change: 메인 모바일 디자인 수정
pa98213-bot Jan 25, 2025
a9d12c5
change: 돋보기 아이콘 추가
pa98213-bot Jan 25, 2025
a40aee0
Merge pull request #49 from pyeongan-213/dev
pyan213 Jan 25, 2025
8e212cc
feat : step1 수정
KRHotSauce Jan 26, 2025
8afcc5a
feat : step1 수정
KRHotSauce Jan 26, 2025
9f7364d
temp
KRHotSauce Jan 26, 2025
7fe1c38
design : 아이디 비밀번호 유효성 검사 방식 수정
KRHotSauce Jan 26, 2025
9d530a8
컴파일 오류 수정
KRHotSauce Jan 26, 2025
5861e0d
Merge pull request #50 from MukPic/dev_login
KRHotSauce Jan 26, 2025
d42fd24
design : community
KRHotSauce Jan 26, 2025
2269328
Merge pull request #51 from MukPic/dev_community
KRHotSauce Jan 26, 2025
3761e21
Merge pull request #48 from Donga1125/dev_myPage01
Donga1125 Jan 26, 2025
b3791a6
temp
KRHotSauce Jan 26, 2025
96bde91
feat : 정렬 기능 추가
KRHotSauce Jan 26, 2025
c2c704e
Merge branch 'dev' into dev_login
KRHotSauce Jan 26, 2025
3628483
fix: botNav
pa98213-bot Jan 26, 2025
d91c2cc
fix: botNav
pa98213-bot Jan 26, 2025
dbe7844
Merge pull request #52 from pyeongan-213/dev
pyan213 Jan 26, 2025
75f5f34
feat : 쿠키 추가(주석)
KRHotSauce Jan 26, 2025
614fa0d
temp
KRHotSauce Jan 26, 2025
8367f24
Merge pull request #53 from MukPic/dev_login
KRHotSauce Jan 26, 2025
86960d3
Merge pull request #54 from MukPic/dev_community
KRHotSauce Jan 26, 2025
a2788c4
fix : middleware
KRHotSauce Jan 27, 2025
155a5f4
feat: middelware 설정 완료
KRHotSauce Jan 27, 2025
a328bea
change : svgButton 수정
KRHotSauce Jan 27, 2025
91b2ac8
fix: setting 내 x 버튼 제거#9
Donga1125 Jan 27, 2025
0aed9df
feat : ai 검색 시 post 연결
KRHotSauce Jan 28, 2025
73d01ba
Merge pull request #55 from MukPic/dev_community
KRHotSauce Jan 28, 2025
6efc14e
Merge pull request #56 from MukPic/dev_login
KRHotSauce Jan 28, 2025
f85f222
fix : clipPath
KRHotSauce Jan 31, 2025
daa34dc
fix: 충돌 수정
Donga1125 Jan 31, 2025
e1c6d13
fix: 마이페이지- 내가 작성한 게시글 레이아웃을 커뮤니티 레이아웃으로 적용 #9
Donga1125 Jan 31, 2025
f0cc3ef
Merge pull request #57 from Donga1125/dev_myPage01
Donga1125 Jan 31, 2025
cd66f39
temp
KRHotSauce Feb 2, 2025
1c4747f
Merge branch 'dev' into dev_login
KRHotSauce Feb 2, 2025
08bdad3
fix: 설정 페이지 레이아웃 수정 / 회원 탈퇴 페이지 제작#9
Donga1125 Feb 2, 2025
10947a5
Merge pull request #58 from Donga1125/dev_myPage01
Donga1125 Feb 3, 2025
17f715c
Merge pull request #59 from MukPic/dev_login
KRHotSauce Feb 3, 2025
682d5a5
fix : sortBy
KRHotSauce Feb 3, 2025
6c30c1a
fix: 비밀번호 찾기 버튼 제거#
Donga1125 Feb 3, 2025
31cdeb4
fix: 비밀번호 찾기 버튼 제거
Donga1125 Feb 3, 2025
d3d4976
feat : userKey 추가
KRHotSauce Feb 3, 2025
f577796
change : cookie 소멸 기간 변경
KRHotSauce Feb 3, 2025
e0f3b2a
Merge pull request #62 from MukPic/dev_community
KRHotSauce Feb 3, 2025
3be1684
Merge pull request #63 from MukPic/dev_login
KRHotSauce Feb 3, 2025
4299a6b
fix : 로그인 버튼
KRHotSauce Feb 3, 2025
00932b9
fix : image 경고 해결
KRHotSauce Feb 5, 2025
cc5b130
Merge pull request #64 from MukPic/dev_login
KRHotSauce Feb 5, 2025
361e04d
fix : googleLogin
KRHotSauce Feb 5, 2025
b89baea
Merge pull request #65 from MukPic/dev_login
KRHotSauce Feb 5, 2025
5522c90
change: 메인에서 post 버튼 연결페이지 변경
pa98213-bot Feb 5, 2025
9ff74c7
Merge pull request #66 from pyeongan-213/dev
pyan213 Feb 5, 2025
5fe48ed
feat : add userKeyRomove
KRHotSauce Feb 5, 2025
65dc4aa
Merge pull request #67 from MukPic/dev_login
KRHotSauce Feb 5, 2025
9f29721
change: 로그아웃 한글 텍스트
pa98213-bot Feb 5, 2025
cb4ec82
Merge pull request #68 from pyeongan-213/dev
pyan213 Feb 5, 2025
63f1435
fix: 구글 로그인
pa98213-bot Feb 6, 2025
04f64aa
Merge pull request #70 from pyeongan-213/dev
pyan213 Feb 6, 2025
28ba1b2
OAuth 콜백 URL은 미들웨어에서 제외
Donga1125 Feb 6, 2025
d56208e
Merge pull request #71 from Donga1125/dev
Donga1125 Feb 6, 2025
b0b7a3d
OAuth 콜백 URL은 미들웨어에서 제외
Donga1125 Feb 6, 2025
018365d
Merge pull request #72 from Donga1125/dev
Donga1125 Feb 6, 2025
9f5f03d
미들웨어 주석처리
Donga1125 Feb 6, 2025
ef14b8d
Merge pull request #73 from Donga1125/dev
Donga1125 Feb 6, 2025
e880b3e
fix: ios 구글 로그인
pa98213-bot Feb 6, 2025
11b0cf6
Merge pull request #74 from pyeongan-213/dev
pyan213 Feb 6, 2025
e1e85a9
Update page.tsx
KRHotSauce Feb 6, 2025
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
6 changes: 3 additions & 3 deletions app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ export default function LoginPage() {
if(localStorage.getItem('googleLoginToken')) {
localStorage.removeItem('googleLoginToken');
}

window.location.href = googleAuthUrl;
};

return (

<div className="auth-container flex flex-1 gap-2">


<div className="flex flex-col items-center justify-center min-h-screen bg-gray-100">
<div className="flex flex-col items-center justify-center min-h-screen"
style={{backgroundColor:'white'}}>
{/* 로고 */}
<div className="flex-1 flex justify-center items-center">
<span className="text-3xl font-bold login-logo">MUKPIC</span>
Expand Down
13 changes: 10 additions & 3 deletions app/(auth)/login/withGoogle/success/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useEffect } from "react";
import { useSearchParams, useRouter } from "next/navigation";
import axios from "axios";
import { Suspense } from "react";
import { addUserKey, createAuthCookie } from "@/app/components/auth/authFunctions";

function GoogleLoginContent() {
const searchParams = useSearchParams();
Expand Down Expand Up @@ -32,19 +33,25 @@ function GoogleLoginContent() {
if (accessToken) {
// 로컬 스토리지에 토큰 저장
localStorage.setItem("Authorization", accessToken);
console.log("Access token stored successfully:", accessToken);

// 미들웨어를 위한 쿠키 설정
createAuthCookie(accessToken);

//userKey 저장
const userKey = response.data.userKey;
addUserKey(userKey);

// 메인 페이지로 리디렉션
router.push("/");
} else {
console.error("Authorization token is missing in the response headers.");
alert("로그인 토큰을 가져오지 못했습니다. 다시 시도해주세요.");
alert("login error please try again");
router.push("/login");
}
}
} catch (error) {
console.error("Error fetching tokens:", error);
alert("로그인 중 오류가 발생했습니다. 다시 시도해주세요.");
alert("login error please try again");
router.push("/login");
}
};
Expand Down
5 changes: 4 additions & 1 deletion app/(auth)/signup/google/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
import { useEffect, Suspense } from "react";
import { useSearchParams, useRouter } from "next/navigation";
import axios from "axios";
import { useSignupStore } from "@/app/types/signupStore";

function SignUpContent() {
const searchParams = useSearchParams();
const router = useRouter();
const setEmail = useSignupStore((state) => state.setemail);

useEffect(() => {
const email = searchParams.get("email");
Expand All @@ -25,6 +27,7 @@ function SignUpContent() {
);

if (response.status === 200) {
setEmail(email);
const accessToken = response.headers["authorization"];

if (accessToken) {
Expand All @@ -47,7 +50,7 @@ function SignUpContent() {
};

fetchTokens();
}, [searchParams, router]);
}, [searchParams, router, setEmail]);

return (
<div className="flex justify-center items-center logo-box">
Expand Down
7 changes: 4 additions & 3 deletions app/(auth)/signup/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use client';
import "@/app/globals.css";
import '@/app/(css)/auth.css';
import { ReactNode, useEffect } from "react";
import { SvgButtonForNav } from "@/app/components/button";
import TopNav from "@/app/components/TopNav";
Expand Down Expand Up @@ -27,7 +28,7 @@ export default function SignupLayout({ children }: LayoutProps) {
leftButton={<SvgButtonForNav
onClick={() => { router.back(); }}>
<svg width="24" height="24" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_112_3051)">
<g clipPath="url(#clip0_112_3051)">
<path d="M19.6934 3.36002C19.1217 2.78836 18.2 2.78836 17.6284 3.36002L7.81671 13.1717C7.36171 13.6267 7.36171 14.3617 7.81671 14.8167L17.6284 24.6284C18.2 25.2 19.1217 25.2 19.6934 24.6284C20.265 24.0567 20.265 23.135 19.6934 22.5634L11.13 14L19.705 5.42502C20.265 4.85336 20.265 3.93169 19.6934 3.36002Z" fill="black" />
</g>
<defs>
Expand All @@ -41,7 +42,7 @@ export default function SignupLayout({ children }: LayoutProps) {
onClick={() => { router.push('/login');}}
>
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_112_3048)">
<g clipPath="url(#clip0_112_3048)">
<path d="M18.3 5.70997C17.91 5.31997 17.28 5.31997 16.89 5.70997L12 10.59L7.10997 5.69997C6.71997 5.30997 6.08997 5.30997 5.69997 5.69997C5.30997 6.08997 5.30997 6.71997 5.69997 7.10997L10.59 12L5.69997 16.89C5.30997 17.28 5.30997 17.91 5.69997 18.3C6.08997 18.69 6.71997 18.69 7.10997 18.3L12 13.41L16.89 18.3C17.28 18.69 17.91 18.69 18.3 18.3C18.69 17.91 18.69 17.28 18.3 16.89L13.41 12L18.3 7.10997C18.68 6.72997 18.68 6.08997 18.3 5.70997Z" fill="black" />
</g>
<defs>
Expand All @@ -52,7 +53,7 @@ export default function SignupLayout({ children }: LayoutProps) {
</svg>
</SvgButtonForNav>}
/>
<div className="auth-container bg-white rounded-lg shadow-md">
<div className="auth-container bg-white">
{children}
</div>
</div>
Expand Down
51 changes: 40 additions & 11 deletions app/(css)/auth.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ input {
line-height: 1.375rem; /* 137.5% */
letter-spacing: -0.01875rem;
background: #f1f3f6;
width:100%;
}

input:-webkit-autofill {
Expand Down Expand Up @@ -75,7 +76,7 @@ input:focus::placeholder {
height: 3.375rem;
flex-shrink: 0;
border-radius: 6.25rem;
padding: 1.25rem;
padding: 0.75rem 1.25rem;
background: #f1f3f6;
color: #0b0b0b;
font-feature-settings: "liga" off, "clig" off;
Expand Down Expand Up @@ -143,7 +144,7 @@ input.auth-placeholder::placeholder {
.dropdown-item {
display: flex;
align-items: center; /* 세로 방향 가운데 정렬 */
justify-content: flex-start; /* 가로 방향 왼쪽 정렬 */
justify-content: space-between; /* 가로 방향 왼쪽 정렬 */
padding-left: 1.53rem;
width: 100%;
height: 3.125rem;
Expand Down Expand Up @@ -184,7 +185,7 @@ input.auth-placeholder::placeholder {
}
.dropdown-badge-green {
background: #cff7ca;
padding-right: 0.5rem;
padding-right: 1rem;
}
.dropdown-badge-red {
background: #ffc4b3;
Expand Down Expand Up @@ -280,12 +281,11 @@ input.auth-placeholder::placeholder {
}

.validate-error-text {
padding-left:1.25rem;
padding-left: 1.25rem;
color: #fa0c38;
font-size: 0.75rem;
font-weight: 500;
line-height: 0.875rem; /* 116.667% */
letter-spacing: -0.01875rem;
font-size: 0.875rem;
font-style: normal;
font-weight: 400;
text-align: left;
}

Expand All @@ -294,6 +294,7 @@ input.auth-placeholder::placeholder {
font-size: 0.875rem;
font-style: normal;
font-weight: 400;
text-align: right;
}

input[type="checkbox"] {
Expand Down Expand Up @@ -333,7 +334,7 @@ input[type="checkbox"]:active {
}

.dropdown-checkbox {
margin-right: 1.5rem !important;
padding-right:1rem;
}

.camera-circle {
Expand All @@ -342,13 +343,41 @@ input[type="checkbox"]:active {
flex-shrink: 0;
position: absolute;
right: 0rem;
bottom:0.25rem;
bottom: 0.25rem;
overflow: visible;
}
.camera-icon {
width: 1rem;
height: 1rem;
flex-shrink: 0;
overflow: visible;
transform: translate(-50%, -50%); ;
transform: translate(-50%, -50%);
}

.label-text {
font-size: 1rem;
font-style: normal;
font-weight: 500;
line-height: 1.375rem; /* 137.5% */
letter-spacing: -0.01875rem;
}

.terms-h2 {
font-size: 1.25rem;
font-weight: 700;
font-style: initial;
}
.terms-wrapper {
color: black;
text-align: left;
padding-top: 1rem;
padding-bottom: 1rem;
}
.privacy-policy {
max-height: 0;
overflow-y: auto;
transition: height 0.5s ease-in-out;
}
.privacy-policy.open {
max-height: 25rem;
}
Loading