Merge branch 'dev' of github.com:innovationacademy-kr/42cabi into be/…

…dev/feat_extension/#1386 # Conflicts: # config
innovationacademy-kr · Oct 13, 2023 · a4fd7ff · a4fd7ff
2 parents 66d962c + e18999b
commit a4fd7ff
Show file tree

Hide file tree

Showing 15 changed files with 265 additions and 88 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -19,6 +19,7 @@ sourceCompatibility = '11'
 
 ext {
     snippetsDir = file('build/generated-snippets')
+    snippetsDir.mkdirs()
     outputDocs = file('src/main/resources/static/docs')
 }
 

diff --git a/backend/build_be.sh b/backend/build_be.sh
@@ -36,7 +36,7 @@ fi
 echo -en $CYAN
 if [ "$arg" == "build" ] || [ "$arg" == "re" ] || [ "$arg" == "all" ]; then
     echo "Build with Gradle"
-    ./gradlew clean build
+    ./gradlew build -x test
 fi
 
 echo -en $CYAN

diff --git a/backend/src/main/java/org/ftclub/cabinet/config/DomainProperties.java b/backend/src/main/java/org/ftclub/cabinet/config/DomainProperties.java
@@ -20,6 +20,9 @@ public class DomainProperties {
 	@Value("${spring.oauth2.domain-name.main}")
 	private String main;
 
+	@Value("${spring.server.be-host}")
+	private String beHost;
+
 	@Value("${spring.server.fe-host}")
 	private String feHost;
 

diff --git a/backend/src/main/java/org/ftclub/cabinet/firebase/fcm/service/FCMService.java b/backend/src/main/java/org/ftclub/cabinet/firebase/fcm/service/FCMService.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.ftclub.cabinet.config.DomainProperties;
 import org.ftclub.cabinet.redis.service.RedisService;
 import org.ftclub.cabinet.utils.overdue.manager.OverdueType;
 import org.springframework.stereotype.Service;
@@ -14,6 +15,8 @@
 @Slf4j
 public class FCMService {
 	private final RedisService redisService;
+	private final DomainProperties domainProperties;
+	private static final String ICON_FILE_PATH = "/src/assets/images/logo.svg";
 
 
 	public void sendPushMessage(String name, OverdueType overdueType, Long daysLeftFromExpireDate) {
@@ -46,7 +49,9 @@ private void sendOverdueMessage(String token, String name, Long daysLeftFromExpi
 				token, name, daysLeftFromExpireDate);
 		Message message = Message.builder()
 				.putData("title", "<CABI> 연체 알림")
-				.putData("content", name + "님, 대여한 사물함이 " + Math.abs(daysLeftFromExpireDate) + "일 연체되었습니다.")
+				.putData("body", name + "님, 대여한 사물함이 " + Math.abs(daysLeftFromExpireDate) + "일 연체되었습니다.")
+				.putData("icon", domainProperties.getFeHost() + ICON_FILE_PATH)
+				.putData("click_action", domainProperties.getFeHost())
 				.setToken(token)
 				.build();
 
@@ -63,7 +68,9 @@ private void sendSoonOverdueMessage(String token, String name, Long daysLeftFrom
 		}
 		Message message = Message.builder()
 				.putData("title", "<CABI> 연체 예정 알림")
-				.putData("content", "대여한 사물함이 " + daysLeftFromExpireDate + "일 후 연체됩니다.")
+				.putData("body", "대여한 사물함이 " + daysLeftFromExpireDate + "일 후 연체됩니다.")
+				.putData("icon", domainProperties.getFeHost() + ICON_FILE_PATH)
+				.putData("click_action", domainProperties.getFeHost())
 				.setToken(token)
 				.build();
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "cp ../config/frontend/.env .env && vite",
     "build": "tsc && vite build",
     "preview": "vite preview",
     "test": "vitest --reporter verbose",

diff --git a/frontend/public/firebase-messaging-sw.js b/frontend/public/firebase-messaging-sw.js
@@ -11,10 +11,10 @@ self.addEventListener("push", function (e) {
   console.log("push: ", e.data.json());
   if (!e.data.json()) return;
 
-  const resultData = e.data.json().notification;
+  const resultData = e.data.json().data;
   const notificationTitle = resultData.title;
   const notificationOptions = {
-    body: resultData.body,
+    body: resultData.content,
     icon: resultData.image,
     tag: resultData.tag,
     ...resultData,

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -7,8 +7,10 @@ import LoginPage from "@/pages/LoginPage";
 import MainPage from "@/pages/MainPage";
 import AdminMainPage from "@/pages/admin/AdminMainPage";
 import LoadingAnimation from "@/components/Common/LoadingAnimation";
+import ProfilePage from "./pages/ProfilePage";
 import "./firebase-messaging-sw"
 
+
 const NotFoundPage = lazy(() => import("@/pages/NotFoundPage"));
 const LoginFailurePage = lazy(() => import("@/pages/LoginFailurePage"));
 const AdminLayout = lazy(() => import("@/pages/admin/AdminLayout"));
@@ -29,7 +31,8 @@ function App(): React.ReactElement {
             <Route path="login" element={<LoginPage />} />
             <Route path="home" element={<HomePage />} />
             <Route path="main" element={<MainPage />} />
-            <Route path="log" element={<LogPage />} />
+            <Route path="profile/log" element={<LogPage />} />
+            <Route path="profile" element={<ProfilePage />} />
           </Route>
           {/* admin용 라우터 */}
           <Route path="/admin/" element={<AdminLayout />}>

diff --git a/frontend/src/assets/images/link.svg b/frontend/src/assets/images/link.svg
diff --git a/frontend/src/assets/images/profile-circle.svg b/frontend/src/assets/images/profile-circle.svg
diff --git a/frontend/src/components/LeftNav/LeftMainNav/LeftMainNav.container.tsx b/frontend/src/components/LeftNav/LeftMainNav/LeftMainNav.container.tsx
@@ -109,6 +109,11 @@ const LeftMainNavContainer = ({ isAdmin }: { isAdmin?: boolean }) => {
     closeAll();
   };
 
+  const onClickProfileButton = () => {
+    navigator("profile");
+    closeAll();
+  };
+
   const onClickLogoutButton = (): void => {
     const adminToken = isAdmin ? "admin_" : "";
     if (import.meta.env.VITE_IS_LOCAL === "true") {
@@ -138,6 +143,7 @@ const LeftMainNavContainer = ({ isAdmin }: { isAdmin?: boolean }) => {
       onClickSearchButton={onClickSearchButton}
       onClickLogoutButton={onClickLogoutButton}
       onClickClubButton={onClickClubButton}
+      onClickProfileButton={onClickProfileButton}
       isAdmin={isAdmin}
     />
   );

diff --git a/frontend/src/components/LeftNav/LeftMainNav/LeftMainNav.tsx b/frontend/src/components/LeftNav/LeftMainNav/LeftMainNav.tsx
@@ -10,6 +10,7 @@ interface ILeftMainNav {
   onClickLentLogButton: React.MouseEventHandler;
   onClickSearchButton: React.MouseEventHandler;
   onClickClubButton: React.MouseEventHandler;
+  onClickProfileButton: React.MouseEventHandler;
   isAdmin?: boolean;
 }
 
@@ -23,6 +24,7 @@ const LeftMainNav = ({
   onClickLentLogButton,
   onClickSearchButton,
   onClickClubButton,
+  onClickProfileButton,
   isAdmin,
 }: ILeftMainNav) => {
   return (
@@ -58,75 +60,66 @@ const LeftMainNav = ({
       <BottomSectionStyled>
         <BottomBtnsStyled>
           {isAdmin && (
-            <BottomBtnStyled
-              className={
-                pathname.includes("search")
-                  ? "active cabiButton"
-                  : " cabiButton"
-              }
-              src={"/src/assets/images/search.svg"}
-              onClick={onClickSearchButton}
-            >
-              <div></div>
-              Search
-            </BottomBtnStyled>
-          )}
-          {!isAdmin && (
-            <BottomBtnStyled
-              className={
-                pathname.includes("log") ? "active cabiButton" : " cabiButton"
-              }
-              src={"/src/assets/images/log.svg"}
-              onClick={onClickLentLogButton}
-            >
-              <div></div>
-              Log
-            </BottomBtnStyled>
-          )}
-          <BottomBtnStyled
-            src={"/src/assets/images/slack.svg"}
-            className="cabiButton"
-          >
-            <a
-              href="https://42born2code.slack.com/archives/C02V6GE8LD7"
-              target="_blank"
-              title="슬랙 캐비닛 채널 새창으로 열기"
-            >
-              <div></div>
-              Contact
-            </a>
-          </BottomBtnStyled>
-          <BottomBtnStyled
-            src={"/src/assets/images/clubIconGray.svg"}
-            className="cabiButton"
-          >
-            {isAdmin ? (
-              <>
-                <a onClick={onClickClubButton}>
+            <>
+              <BottomBtnStyled
+                className={
+                  pathname.includes("search")
+                    ? "active cabiButton"
+                    : " cabiButton"
+                }
+                src={"/src/assets/images/search.svg"}
+                onClick={onClickSearchButton}
+              >
+                <div></div>
+                Search
+              </BottomBtnStyled>
+              <BottomBtnStyled
+                src={"/src/assets/images/slack.svg"}
+                className="cabiButton"
+              >
+                <a
+                  href="https://42born2code.slack.com/archives/C02V6GE8LD7"
+                  target="_blank"
+                  title="슬랙 캐비닛 채널 새창으로 열기"
+                >
                   <div></div>
-                  Club
+                  Contact
                 </a>
-              </>
-            ) : (
-              <a
-                href="https://docs.google.com/forms/d/e/1FAIpQLSfp-d7qq8gTvmQe5i6Gtv_mluNSICwuv5pMqeTBqt9NJXXP7w/closedform"
-                target="_blank"
-                title="동아리 사물함 사용 신청서 새창으로 열기"
+              </BottomBtnStyled>
+              <BottomBtnStyled
+                src={"/src/assets/images/clubIconGray.svg"}
+                className="cabiButton"
+                onClick={onClickClubButton}
               >
                 <div></div>
                 Club
-              </a>
-            )}
-          </BottomBtnStyled>
-
-          <BottomBtnStyled
-            className="cabiButton"
-            onClick={onClickLogoutButton}
-            src={"/src/assets/images/close-square.svg"}
-          >
-            <div></div>
-            Logout
-          </BottomBtnStyled>
+              </BottomBtnStyled>
+              <BottomBtnStyled
+                className="cabiButton"
+                onClick={onClickLogoutButton}
+                src={"/src/assets/images/close-square.svg"}
+              >
+                <div></div>
+                Logout
+              </BottomBtnStyled>
+            </>
+          )}
+          {!isAdmin && (
+            <>
+              <BottomBtnStyled
+                className={
+                  pathname.includes("profile")
+                    ? "active cabiButton"
+                    : " cabiButton"
+                }
+                src={"/src/assets/images/profile-circle.svg"}
+                onClick={onClickProfileButton}
+              >
+                <div></div>
+                Profile
+              </BottomBtnStyled>
+            </>
+          )}
         </BottomBtnsStyled>
       </BottomSectionStyled>
     </LeftNavStyled>

diff --git a/frontend/src/components/LeftNav/LeftNav.tsx b/frontend/src/components/LeftNav/LeftNav.tsx
@@ -2,10 +2,10 @@ import styled from "styled-components";
 import LeftMainNavContainer from "@/components/LeftNav/LeftMainNav/LeftMainNav.container";
 import LeftSectionNavContainer from "@/components/LeftNav/LeftSectionNav/LeftSectionNav.container";
 
-const LeftNav: React.FC<{ isVisible: boolean; isAdmin?: boolean }> = ({
-  isAdmin,
-  isVisible,
-}) => {
+const LeftNav: React.FC<{
+  isVisible: boolean;
+  isAdmin?: boolean;
+}> = ({ isAdmin, isVisible }) => {
   return (
     <LeftNavWrapStyled id="leftNavWrap">
       <LeftMainNavContainer isAdmin={isAdmin} />

diff --git a/frontend/src/components/LeftNav/LeftSectionNav/LeftSectionNav.container.tsx b/frontend/src/components/LeftNav/LeftSectionNav/LeftSectionNav.container.tsx
@@ -1,3 +1,4 @@
+import { useLocation, useNavigate } from "react-router-dom";
 import { useRecoilState, useRecoilValue } from "recoil";
 import { currentSectionNameState } from "@/recoil/atoms";
 import { currentFloorSectionState } from "@/recoil/selectors";
@@ -9,20 +10,54 @@ const LeftSectionNavContainer = ({ isVisible }: { isVisible: boolean }) => {
   const [currentFloorSection, setCurrentFloorSection] = useRecoilState<string>(
     currentSectionNameState
   );
-
+  const navigator = useNavigate();
+  const { pathname } = useLocation();
   const { closeLeftNav } = useMenu();
+  const isProfilePage: boolean = location.pathname.includes("profile");
 
   const onClickSection = (section: string) => {
     closeLeftNav();
     setCurrentFloorSection(section);
   };
 
+  const onClickProfile = () => {
+    closeLeftNav();
+    navigator("profile");
+  };
+
+  const onClickLentLogButton = () => {
+    closeLeftNav();
+    navigator("profile/log");
+  };
+
+  const onClickSlack = () => {
+    window.open(
+      "https://42born2code.slack.com/archives/C02V6GE8LD7",
+      "_blank",
+      "noopener noreferrer"
+    );
+  };
+
+  const onClickClubForm = () => {
+    window.open(
+      "https://docs.google.com/forms/d/e/1FAIpQLSfp-d7qq8gTvmQe5i6Gtv_mluNSICwuv5pMqeTBqt9NJXXP7w/closedform",
+      "_blank",
+      "noopener noreferrer"
+    );
+  };
+
   return (
     <LeftSectionNav
+      pathname={pathname}
       isVisible={isVisible}
-      onClickSection={onClickSection}
+      isProfile={isProfilePage}
       currentFloorSection={currentFloorSection}
       floorSection={floorSection}
+      onClickSection={onClickSection}
+      onClickProfile={onClickProfile}
+      onClickLentLogButton={onClickLentLogButton}
+      onClickSlack={onClickSlack}
+      onClickClubForm={onClickClubForm}
     />
   );
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ sourceCompatibility = '11' @@
     ext {
         snippetsDir = file('build/generated-snippets')
+        snippetsDir.mkdirs()
         outputDocs = file('src/main/resources/static/docs')
     }
@@ Expand Down @@