resolve: resolve conflict

README.md

@@ -1,22 +1,24 @@
+<div align="center">
+
 # 🏃‍♂️RunWithMe🏃‍♂️
+나만의 코스로 달려보고 싶으신가요?
+
+혼자 뛰는게 지루하신가요?
+
+**나만의 코스**로 **함께** 달리는 러닝 커뮤니티, <a href="https://runwithme.co.kr/">**RunWithMe**</a>를 시작해보세요!
+
+## 🛠 기술 스택
 
-## RunWithMe ⁉️
-> 나만의 코스로 달려보고 싶은신가요?
-> 
-> 
-> 혼자 뛰는게 지루하신가요?
-> 
-> **나만의 코스**로 **함께** 달리는 러닝 커뮤니티, **RunWithMe**를 시작해보세요!
->
+<img width="700" alt="스크린샷 2022-12-15 오후 5 59 35" src="https://user-images.githubusercontent.com/97938489/207816864-df375aba-56db-4074-9592-97e0b5ea4ea2.png">
 
 ## 🙋‍♂️행복회로 팀원들을 소개합니다
 
 <table>
 <tr>
-<td align="center"><img src="https://github.com/pushedrumex.png" width="160"></td>
-<td align="center"><img src="https://github.com/catensia.png" width="160"></td>
-<td align="center"><img src="https://github.com/June1010.png" width="160"></td>
-<td align="center"><img src="https://github.com/gchoi96.png" width="160"></td>
+<td align="center"><img src="https://user-images.githubusercontent.com/53655119/207808860-fb8be375-c7fc-41ec-9e80-55e25793156c.png" width="160"></td>
+<td align="center"><img src="https://user-images.githubusercontent.com/53655119/207808869-93dbd80a-e9be-49bb-b4b8-89945eb7bf83.png" width="160"></td>
+<td align="center"><img src="https://user-images.githubusercontent.com/53655119/207808873-9de904f4-486a-4865-b2e1-253a9b5485ed.png" width="160"></td>
+<td align="center"><img src="https://user-images.githubusercontent.com/53655119/207808877-eb84c724-6be4-4365-a302-a55b3ec99389.png" width="160"></td>
 </tr>
 <tr>
 <td align="center">J034_김민정</td>
@@ -33,3 +35,13 @@
 
 </tr>
 </table>
+
+## 🚀 프로젝트를 소개합니다
+
+## ⚙️ 주요 기능들을 소개합니다
+
+## 🕹 아키텍처
+
+<img width="630" alt="스크린샷 2022-12-15 오후 4 01 06" src="https://user-images.githubusercontent.com/97938489/207812760-d0088060-f825-427a-80d4-3bbceecc53c2.png">
+
+</div>

client/src/components/Card/RecruitCard/RecruitCard.tsx

@@ -7,9 +7,10 @@ import { timeDifference } from "#utils/cardUtils";
 
 interface RecruitCardProps {
     data: Recruit;
+    userIdVisible?: boolean;
 }
 
-const RecruitCard = ({ data }: RecruitCardProps) => {
+const RecruitCard = ({ data, userIdVisible = true }: RecruitCardProps) => {
     return (
         <Card to={`/recruit/${data.id}`} path={data.course.path}>
             <SummaryHead>
@@ -30,7 +31,7 @@ const RecruitCard = ({ data }: RecruitCardProps) => {
                     <img width="14" height="14" alt="CLOCK_ICON" src={CLOCK_ICON} />
                     <span>{timeDifference(data.startTime)}</span>
                 </div>
-                <UserIdLabel>{data.userId}</UserIdLabel>
+                <UserIdLabel>{userIdVisible && data.userId}</UserIdLabel>
             </SummaryBody>
         </Card>
     );

client/src/components/CardList/CourseList/CorseList.tsx

@@ -21,7 +21,12 @@ const CorseList = ({ distance, query, authorFilter, titleFilter }: CourseListPro
     const { data, fetchNextPage, hasNextPage } = useCoursesQuery({ distance, query, authorFilter, titleFilter });
 
     return (
-        <InfiniteScroll loadMore={() => fetchNextPage()} hasMore={hasNextPage} loader={<CardLoader />}>
+        <InfiniteScroll
+            loadMore={() => fetchNextPage()}
+            hasMore={hasNextPage}
+            loader={<CardLoader />}
+            useWindow={false}
+        >
             <CardWrapper>
                 {data?.pages.map((page, pageIdx) =>
                     page?.map((card, idx) => <CourseCard data={card} key={`${pageIdx}_${idx}`} />),

client/src/components/CardList/RecruitList/RecruitList.tsx

@@ -25,6 +25,7 @@ const RecruitList = (props: RecruitListProps) => {
                     <CardLoader />
                 </div>
             }
+            useWindow={false}
         >
             <CardWrapper>
                 {data?.pages.map((page, pageIdx) =>

client/src/components/Layout/Layout.styles.ts

@@ -29,6 +29,8 @@ export const Container = styled.div`
     > div:last-child {
         background-color: ${COLOR.WHITE};
         position: relative;
+        height: 100vh;
+        overflow-y: scroll;
     }
     @media screen and (min-width: 480px) {
         ${flexRowCenter};
@@ -38,8 +40,6 @@ export const Container = styled.div`
             box-shadow: 2px 0 16px rgba(0, 0, 0, 0.25), -2px 0 16px rgba(0, 0, 0, 0.25);
             width: 390px;
             min-width: 390px;
-            height: 100%;
-            overflow-y: scroll;
             -ms-overflow-style: none;
             scrollbar-width: none;
             ::-webkit-scrollbar {

client/src/hooks/queries/useCoursesQuery.ts

@@ -26,7 +26,11 @@ const useCoursesQuery = ({ distance, query, authorFilter, titleFilter }: CourseL
         ["courses", distance?.min, distance?.max, authorFilter, titleFilter, query],
         ({ pageParam = 1 }) => get("/course", courseQueryParams(pageParam)).then((res) => res.data),
         {
-            getNextPageParam: (lastPage, allPages) => (lastPage ? lastPage?.length > 0 && allPages.length + 1 : 1),
+            getNextPageParam: (lastPage, allPages) => {
+                if (!lastPage) return 1;
+                if (lastPage?.length > 0) return allPages.length + 1;
+                else return undefined;
+            },
             suspense: true,
         },
     );

client/src/hooks/queries/useRecruitsQuery.ts

@@ -18,18 +18,24 @@ const useRecruitsQuery = ({ distance, query, availFilter, authorFilter, titleFil
             param.maxLen = (distance.max * 1000).toString();
             param.minLen = (distance.min * 1000).toString();
         }
-        if (time) {
-            param.time = time.max.toString();
+
+        if (time?.max) {
+            param.hour = time.max.toString();
         }
+
         param.page = page;
         return param;
     };
 
     return useInfiniteQuery(
-        ["recruits", distance?.min, distance?.max, authorFilter, titleFilter, query],
+        ["recruits", distance?.min, distance?.max, authorFilter, titleFilter, query, time],
         ({ pageParam = 1 }) => get("/recruit", recruitQueryParams(pageParam)).then((res) => res.data),
         {
-            getNextPageParam: (lastPage, allPages) => (lastPage ? lastPage?.length > 0 && allPages.length + 1 : 1),
+            getNextPageParam: (lastPage, allPages) => {
+                if (!lastPage) return 1;
+                if (lastPage?.length > 0) return allPages.length + 1;
+                else return undefined;
+            },
             suspense: true,
         },
     );

client/src/pages/Courses/Courses.tsx

@@ -1,4 +1,4 @@
-import React, { useState, FormEventHandler, Suspense } from "react";
+import React, { useState, Suspense, ChangeEvent } from "react";
 import Header from "#components/Header/Header";
 import SearchBar from "#components/SearchBar/SearchBar";
 import FilterBar from "#components/FilterBar/FilterBar";
@@ -11,16 +11,17 @@ import { LOCATION_ICON } from "#assets/icons";
 import PlusButton from "#components/PlusButton/PlusButton";
 import CourseList from "#components/CardList/CourseList/CorseList";
 import CardListLoader from "#components/CardList/CardList.loader";
+import { debounce } from "#utils/timerUtils";
 
 const Courses = () => {
     const [currentDistanceFilter, setCurrentDistanceFilter] = useFilter({ text: "3-5KM", min: 3, max: 5 });
     const [titleFilter, toggleTitleFilter] = useOnOffFilter(false);
     const [authorFilter, toggleAuthorFilter] = useOnOffFilter(false);
     const [searchContent, setSearchContent] = useState("");
 
-    const handleSearchContentChange: FormEventHandler<HTMLInputElement> = (e) => {
-        setSearchContent(e.currentTarget.value);
-    };
+    const handleSearchContentChange = debounce((e: ChangeEvent<HTMLInputElement>) => {
+        setSearchContent(e.target.value);
+    }, 200);
 
     return (
         <>
@@ -45,6 +46,7 @@ const Courses = () => {
                     filterIcon={LOCATION_ICON}
                     filterState={currentDistanceFilter}
                     filterOptions={[
+                        { text: "5KM 이상", min: 5, max: Number.MAX_SAFE_INTEGER },
                         { text: "3-5KM", min: 3, max: 5 },
                         { text: "1-3KM", min: 1, max: 3 },
                         { text: "1KM 이내", min: 0, max: 1 },

client/src/pages/MyPage/MyPageRecruits.tsx

@@ -55,7 +55,9 @@ const MyPageRecruits = ({ MyPageOption }: MyPageProps) => {
         if (!pastRecruitsToggled) filteredRecruit = filterPastRecruits(filteredRecruit);
         if (myRecruitsToggled) filteredRecruit = filterMyRecruits(filteredRecruit);
 
-        return filteredRecruit.map((r: Recruit, idx: number) => <RecruitCard data={r} key={idx} />);
+        return filteredRecruit.map((r: Recruit, idx: number) => (
+            <RecruitCard data={r} key={idx} userIdVisible={false} />
+        ));
     };
 
     return (

client/src/pages/Recruits/Recruits.tsx

@@ -1,4 +1,4 @@
-import React, { Suspense, useState } from "react";
+import React, { ChangeEvent, Suspense, useState } from "react";
 import Header from "#components/Header/Header";
 import SearchBar from "#components/SearchBar/SearchBar";
 import FilterBar from "#components/FilterBar/FilterBar";
@@ -11,6 +11,7 @@ import { LOCATION_ICON, CLOCK_ICON } from "#assets/icons";
 import PlusButton from "#components/PlusButton/PlusButton";
 import RecruitList from "#components/CardList/RecruitList/RecruitList";
 import CardListLoader from "#components/CardList/CardList.loader";
+import { debounce } from "#utils/timerUtils";
 
 const Recruits = () => {
     const [currentDistanceFilter, setCurrentDistanceFilter] = useFilter({ text: "3-5KM", min: 3, max: 5 });
@@ -20,9 +21,9 @@ const Recruits = () => {
     const [availFilter, toggleAvailFilter] = useOnOffFilter(false);
     const [searchContent, setSearchContent] = useState("");
 
-    const handleSearchContentChange = (e: React.FormEvent<HTMLInputElement>) => {
-        setSearchContent(e.currentTarget.value);
-    };
+    const handleSearchContentChange = debounce((e: ChangeEvent<HTMLInputElement>) => {
+        setSearchContent(e.target.value);
+    }, 200);
 
     return (
         <>
@@ -52,6 +53,7 @@ const Recruits = () => {
                     filterIcon={LOCATION_ICON}
                     filterState={currentDistanceFilter}
                     filterOptions={[
+                        { text: "5KM 이상", min: 5, max: Number.MAX_SAFE_INTEGER },
                         { text: "3-5KM", min: 3, max: 5 },
                         { text: "1-3KM", min: 1, max: 3 },
                         { text: "1KM 이내", min: 0, max: 1 },
@@ -63,6 +65,7 @@ const Recruits = () => {
                     filterIcon={CLOCK_ICON}
                     filterState={currentTimeFilter}
                     filterOptions={[
+                        { text: "상관 없음", min: 0, max: 0 },
                         { text: "5시간 이내", min: 0, max: 5 },
                         { text: "3시간 이내", min: 0, max: 3 },
                         { text: "1시간 이내", min: 0, max: 1 },

noti-server/src/app.service.ts

@@ -27,7 +27,6 @@ export class AppService {
 
   // 30분 전 시작 알림
   createRecruitMessage(body: any) {
-    console.log(body);
     const { recruitId, author, title, hDong, startTime, pathLength } = body;
     const result = {};
 

server/src/common/repositories/course.repository.ts

@@ -56,6 +56,7 @@ export class CourseRepository extends Repository<Course> {
             ])
             .offset((page - 1) * pageSize)
             .limit(pageSize)
+            .orderBy("course.id", "DESC")
             .getMany();
     }
     async findOneById(id: number): Promise<Course> {

server/src/common/repositories/recruit.repository.ts

@@ -39,6 +39,7 @@ export class RecruitRepository extends Repository<Recruit> {
                 "h_dong.name",
             ])
             .where("recruit.id = :recruitId", { recruitId })
+            .orderBy("recruit.id", "DESC")
             .getRawOne();
     }
 
@@ -94,6 +95,7 @@ export class RecruitRepository extends Repository<Recruit> {
             .groupBy("recruit.id")
             .offset((page - 1) * pageSize)
             .limit(pageSize)
+            .orderBy("recruit.id", "DESC")
             .getRawMany();
     }