{'이미 계정이 있으신가요? '}{'로그인'}
diff --git a/front-service/src/components/user/dto/request/sign-up.request.dto.ts b/front-service/src/components/user/dto/request/sign-up.request.dto.ts
index 1c832d9..19bddad 100644
--- a/front-service/src/components/user/dto/request/sign-up.request.dto.ts
+++ b/front-service/src/components/user/dto/request/sign-up.request.dto.ts
@@ -2,7 +2,6 @@ export default interface SignUpRequestDto {
email: string;
uuid: string | null;
memberName: string;
- profileImage?: string | undefined | null;
memberAddress: string;
memberAddressDetail?: string;
memberPhone: string;
diff --git a/front-service/src/components/user/loginedUser/apis/response/get-sign-in-user.response.dto.ts b/front-service/src/components/user/loginedUser/apis/response/get-sign-in-user.response.dto.ts
new file mode 100644
index 0000000..038e87e
--- /dev/null
+++ b/front-service/src/components/user/loginedUser/apis/response/get-sign-in-user.response.dto.ts
@@ -0,0 +1,5 @@
+import User from "../../../types/user.interface";
+
+export default interface GetSignInUserResponseDto extends User {
+
+}
\ No newline at end of file
diff --git a/front-service/src/components/user/loginedUser/apis/response/index.ts b/front-service/src/components/user/loginedUser/apis/response/index.ts
new file mode 100644
index 0000000..684e4f7
--- /dev/null
+++ b/front-service/src/components/user/loginedUser/apis/response/index.ts
@@ -0,0 +1,5 @@
+import GetSignInUserResponseDto from "./get-sign-in-user.response.dto";
+
+export type {
+ GetSignInUserResponseDto
+}
\ No newline at end of file
diff --git a/front-service/src/components/user/loginedUser/index.tsx b/front-service/src/components/user/loginedUser/index.tsx
index 249ec4b..fc6abea 100644
--- a/front-service/src/components/user/loginedUser/index.tsx
+++ b/front-service/src/components/user/loginedUser/index.tsx
@@ -1,10 +1,11 @@
-import './style.css'
+import './style.css';
import {useNavigate, useParams} from "react-router-dom";
import React, {ChangeEvent, useEffect, useRef, useState} from "react";
import {useCookies} from "react-cookie";
-import useUserStore from "../store/user.store";
import MembernameRequestDto from "../dto/request/memberNameRequestDto";
-
+import userLoginUserStore from "../store/user.store";
+import {GetSignInUserResponseDto} from "./apis/response";
+import User from "../types/user.interface";
// component: 유저 페이지 //
@@ -13,7 +14,7 @@ export default function User() {
// state: 조회하는 유저 이메일 path variable 상태 //
const { searchEmail } = useParams();
// state: 로그인 유저 정보 상태 //
- const { user, setUser } = useUserStore();
+ const { loginUser, setLoginUser } = userLoginUserStore();
// state: 본인 여부 상태 //
const [isMyPage, setMyPage] = useState
(false);
@@ -25,8 +26,6 @@ export default function User() {
// state: 프로필 이미지 input ref 상태 //
const fileInputRef = useRef(null);
- // state: cookie 상태 //
- const [cookies, setCookie] = useCookies();
// state: 이메일 상태 //
const [email, setEmail] = useState('');
// state: 프로필 이미지 상태 //
@@ -39,6 +38,14 @@ export default function User() {
const [showChangememberName, setShowChangememberName] = useState(false);
+ // function: get sign in user 처리 함수 //
+ const getSignInUserResponse = (responseBody: GetSignInUserResponseDto | null) => {
+ if (!responseBody) return;
+ const loginUser: User = {...(responseBody as GetSignInUserResponseDto)}
+ setLoginUser(loginUser);
+ }
+
+
// event handler: 프로필 이미지 클릭 이벤트 처리 //
const onProfileImageClickHandler = () => {
if (!isMyPage) return;
@@ -58,9 +65,6 @@ export default function User() {
return;
}
- const accessToken = cookies.accessToken;
- if (!accessToken) return;
-
const requestBody: MembernameRequestDto = { memberName };
//// fetch
diff --git a/front-service/src/components/user/loginedUser/style.css b/front-service/src/components/user/loginedUser/style.css
new file mode 100644
index 0000000..7bb2650
--- /dev/null
+++ b/front-service/src/components/user/loginedUser/style.css
@@ -0,0 +1,192 @@
+#user-info-wrapper {
+ padding: 40px 0;
+
+ display: flex;
+ justify-content: center;
+}
+
+.user-info-container {
+ width: 1200px;
+
+ display: flex;
+ align-items: center;
+ gap: 25px;
+}
+
+.user-info-profile-image-box-mypage {
+ width: 120px;
+ height: 120px;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.user-info-profile-image-box-mypage:hover {
+ opacity: 0.85;
+ cursor: pointer;
+}
+
+.user-info-profile-image-box {
+ width: 120px;
+ height: 120px;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.user-info-profile-default-image {
+ border-radius: 50% 50%;
+ width: 100%;
+ height: 100%;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ background-color: rgba(217, 217, 217, 1);
+}
+
+.user-info-profile-icon-box {
+ width: 40px;
+ height: 40px;
+}
+
+.user-info-profile-image {
+ border-radius: 50% 50%;
+ width: 100%;
+ height: 100%;
+
+ background-position: 50% 50%;
+ background-size: 100% 100%;
+}
+
+.user-info-meta-box {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.user-info-nickname-box {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+}
+
+.user-info-nickname {
+ color: rgba(0, 0, 0, 0.7);
+
+ font-size: 24px;
+ font-weight: 600;
+ line-height: 140%;
+}
+
+.user-info-nickname-input {
+ border: none;
+ outline: none;
+ background: none;
+ padding: 0;
+
+ display: inline-block;
+
+ color: rgba(0, 0, 0, 1);
+
+ font-size: 24px;
+ font-weight: 600;
+ line-height: 140%;
+}
+
+.user-info-email {
+ color: rgba(0, 0, 0, 0.4);
+
+ font-size: 16px;
+ font-weight: 600;
+ line-height: 140%;
+}
+
+#user-board-wrapper {
+ padding: 40px 0;
+
+ display: flex;
+ justify-content: center;
+
+ background-color: rgba(0, 0, 0, 0.05);
+}
+
+.user-board-container {
+ width: 1200px;
+
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+}
+
+.user-board-title {
+ color: rgba(0, 0, 0, 1);
+
+ font-size: 24px;
+ font-weight: 500;
+ line-height: 140%;
+}
+
+.user-board-contents-box {
+ display: grid;
+ grid-template-columns: 8fr 4fr;
+ gap: 24px;
+}
+
+.user-board-contents-result-box {
+ display: flex;
+ flex-direction: column;
+ gap: 16px;
+}
+
+.user-board-contents-nothing {
+ height: 76px;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ color: rgba(0, 0, 0, 0.4);
+ font-size: 24px;
+ font-weight: 500;
+ line-height: 140%;
+}
+
+.user-board-button-box {
+ height: 76px;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ background-color: rgba(255, 255, 255, 1);
+}
+
+.user-board-button-box:hover {
+ cursor: pointer;
+ background-color: rgba(0, 0, 0, 0.02);
+}
+
+.user-board-button-contents {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+}
+
+.user-board-button-text {
+ color: rgba(0, 0, 0, 1);
+
+ font-size: 18px;
+ font-weight: 500;
+ line-height: 140%;
+}
+
+.user-board-pagination-box {
+ margin-top: 60px;
+
+ display: flex;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/front-service/src/components/user/store/user.store.ts b/front-service/src/components/user/store/user.store.ts
index 154aab8..de91a62 100644
--- a/front-service/src/components/user/store/user.store.ts
+++ b/front-service/src/components/user/store/user.store.ts
@@ -1,14 +1,17 @@
import LoginUser from "../types/login-user.interface";
import {create} from "zustand";
+import User from "../types/user.interface";
-interface UserStore {
- user: LoginUser | null;
- setUser: (user: LoginUser | null) => void;
-}
+interface LoginUserStore {
+ loginUser: User | null;
+ setLoginUser: (loginUser: User) => void;
+ resetLoginUser: () => void;
+};
-const useUserStore = create(set => ({
- user: null,
- setUser: (user: LoginUser | null) => {set((state) => ({ ...state, user }))},
+const userLoginUserStore = create(set => ({
+ loginUser: null,
+ setLoginUser: loginUser => set(state => ({...state, loginUser})),
+ resetLoginUser: () => set(state => ({...state, loginUser: null}))
}));
-export default useUserStore;
\ No newline at end of file
+export default userLoginUserStore;
\ No newline at end of file
diff --git a/front-service/src/components/user/userRoute/UserMain.tsx b/front-service/src/components/user/userRoute/UserMain.tsx
deleted file mode 100644
index a09d81a..0000000
--- a/front-service/src/components/user/userRoute/UserMain.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import Board from "../../board/Board";
-import React from "react";
-import Authentication from "../authentication";
-
-const UserMain = () => {
- return (
-
- )
-}
-export default UserMain;
\ No newline at end of file
diff --git a/front-service/src/components/user/userRoute/UserRouteController.tsx b/front-service/src/components/user/userRoute/UserRouteController.tsx
deleted file mode 100644
index 6342f02..0000000
--- a/front-service/src/components/user/userRoute/UserRouteController.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Route, Routes } from "react-router-dom"
-import React from "react"
-import Authentication from "../authentication";
-
-const UserRouteController = () => {
- return(
-
-
- } />
-
- )
-}
-export default UserRouteController;
\ No newline at end of file
diff --git a/front-service/webpack.config.js b/front-service/webpack.config.js
index d190bc0..4eb8a0a 100644
--- a/front-service/webpack.config.js
+++ b/front-service/webpack.config.js
@@ -1,4 +1,8 @@
const path = require('path');
+const {DefinePlugin} = require('webpack');
+const dotenv = require('dotenv');
+
+dotenv.config();
module.exports = {
mode: 'development',
@@ -26,6 +30,9 @@ module.exports = {
},
],
},
+ plugins: [new DefinePlugin({
+ "process.env": JSON.stringify(process.env),
+ })],
devServer: {
port: 3000,
open: true,
diff --git a/gateway-service/.idea/workspace.xml b/gateway-service/.idea/workspace.xml
index 4647b7c..cd8e5f8 100644
--- a/gateway-service/.idea/workspace.xml
+++ b/gateway-service/.idea/workspace.xml
@@ -4,7 +4,13 @@
-
+
+
+
+
+
+
+
@@ -53,28 +59,28 @@
- {
+ "keyToString": {
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "feature/#104",
+ "last_opened_file_path": "C:/farmted-Repo/gateway-service",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "project.structure.last.edited": "Global Libraries",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.2",
+ "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -129,6 +135,8 @@
+
+
diff --git a/member-service/src/main/java/com/farmted/memberservice/controller/MemberController.java b/member-service/src/main/java/com/farmted/memberservice/controller/MemberController.java
index 24a5922..5d35965 100644
--- a/member-service/src/main/java/com/farmted/memberservice/controller/MemberController.java
+++ b/member-service/src/main/java/com/farmted/memberservice/controller/MemberController.java
@@ -42,7 +42,7 @@ public String healthCheck() {
@Operation(summary = "멤버의 상세 정보 등록", description = "회원가입이 완료된 멤버의 상세정보를 작성, 완료 시 Role을 User로 변경")
@PostMapping("/members")
public ResponseEntity createMember(@Valid @RequestPart("CREATE") RequestCreateMemberDto dto,
- @RequestPart("IMAGE")MultipartFile image,
+ @RequestPart(value = "IMAGE",required = false)MultipartFile image,
@RequestHeader("UUID") String memberUUID) {
dto.setMemberUuid(memberUUID);
memberService.createMember(dto, image);
Google로 계속
Kakao Talk로 계속