Merge pull request #707 from woowacourse-teams/develop

release: 1.7.0
woowacourse-teams · Oct 19, 2022 · 116efee · 116efee
2 parents 1f60b80 + 50cff45
commit 116efee
Show file tree

Hide file tree

Showing 26 changed files with 449 additions and 149 deletions.
diff --git a/back/build.gradle b/back/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'com.woowacourse'
-version = '0.0.1-SNAPSHOT'
+version = '1.6.0-SNAPSHOT-' + new Date().format("yyyyMMddHHmmss")
 sourceCompatibility = '11'
 
 ext {
@@ -118,20 +118,30 @@ tasks.named('test') {
     finalizedBy 'jacocoTestReport'
 }
 
-processResources.dependsOn('copySecret', 'copyDevSecret', 'copyProdSecret', 'copyTestSecret', 'copySlackWebHook')
+processResources.dependsOn('copySecret', 'copyDev1Secret', 'copyDev2Secret', 'copyProd1Secret', 'copyProd2Secret', 'copyTestSecret', 'copySlackWebHook')
 
 task copySecret(type: Copy) {
     from '../config/application.yml'
     into 'src/main/resources'
 }
 
-task copyDevSecret(type: Copy) {
-    from '../config/application-dev.yml'
+task copyDev1Secret(type: Copy) {
+    from '../config/application-dev1.yml'
     into 'src/main/resources'
 }
 
-task copyProdSecret(type: Copy) {
-    from '../config/application-prod.yml'
+task copyDev2Secret(type: Copy) {
+    from '../config/application-dev2.yml'
+    into 'src/main/resources'
+}
+
+task copyProd1Secret(type: Copy) {
+    from '../config/application-prod1.yml'
+    into 'src/main/resources'
+}
+
+task copyProd2Secret(type: Copy) {
+    from '../config/application-prod2.yml'
     into 'src/main/resources'
 }
 

diff --git a/back/src/main/java/com/woowacourse/teatime/teatime/service/AlarmService.java b/back/src/main/java/com/woowacourse/teatime/teatime/service/AlarmService.java
@@ -67,7 +67,7 @@ private void requestAlarm(SlackAlarmDto alarmDto) {
                     .bodyToMono(SlackAlarmDto.class)
                     .then()
                     .subscribe();
-        } catch (WebClientException e) {
+        } catch (WebClientException ex) {
             throw new SlackAlarmException();
         }
     }

diff --git a/config b/config
diff --git a/front/src/App.tsx b/front/src/App.tsx
@@ -5,6 +5,7 @@ import Header from '@components/Header';
 import Loading from '@components/Loading';
 import SnackbarProvider from '@context/SnackbarProvider';
 import UserProvider from '@context/UserProvider';
+import BoardProvider from '@context/BoardModeProvider';
 import AuthRoute from './AuthRoute';
 import { ROUTES } from './constants';
 
@@ -27,29 +28,31 @@ const App = () => {
   return (
     <UserProvider>
       <SnackbarProvider>
-        <Header />
-        <Suspense fallback={<Loading text="Loading..." />}>
-          <Routes>
-            <Route path={ROUTES.HOME} element={<Home />} />
-            <Route path={ROUTES.CERTIFICATION} element={<Certification />} />
-            <Route path="/*" element={<NotFound />} />
-            <Route element={<AuthRoute role="CREW" />}>
-              <Route path={ROUTES.CREW} element={<CrewMain />} />
-              <Route path={ROUTES.CREW_HISTORY} element={<CrewHistory />} />
-              <Route path={`${ROUTES.RESERVATION}/:id`} element={<Reservation />} />
-              <Route path={`${ROUTES.CREW_SHEET}/:id`} element={<CrewSheet />} />
-            </Route>
-            <Route element={<AuthRoute role="COACH" />}>
-              <Route path={ROUTES.COACH} element={<CoachMain />} />
-              <Route path={ROUTES.SCHEDULE} element={<Schedule />} />
-              <Route path={ROUTES.QUESTION} element={<Question />} />
-              <Route path={ROUTES.COACH_HISTORY} element={<CoachHistory />} />
-              <Route path={ROUTES.COACH_PROFILE} element={<CoachProfile />} />
-              <Route path={`${ROUTES.COACH_SHEET}/:id`} element={<CoachSheet />} />
-              {/* <Route path={`${ROUTES.HISTORY_SHEET}/:id`} element={<HistorySheet />} /> */}
-            </Route>
-          </Routes>
-        </Suspense>
+        <BoardProvider>
+          <Header />
+          <Suspense fallback={<Loading text="Loading..." />}>
+            <Routes>
+              <Route path={ROUTES.HOME} element={<Home />} />
+              <Route path={ROUTES.CERTIFICATION} element={<Certification />} />
+              <Route path="/*" element={<NotFound />} />
+              <Route element={<AuthRoute role="CREW" />}>
+                <Route path={ROUTES.CREW} element={<CrewMain />} />
+                <Route path={ROUTES.CREW_HISTORY} element={<CrewHistory />} />
+                <Route path={`${ROUTES.RESERVATION}/:id`} element={<Reservation />} />
+                <Route path={`${ROUTES.CREW_SHEET}/:id`} element={<CrewSheet />} />
+              </Route>
+              <Route element={<AuthRoute role="COACH" />}>
+                <Route path={ROUTES.COACH} element={<CoachMain />} />
+                <Route path={ROUTES.SCHEDULE} element={<Schedule />} />
+                <Route path={ROUTES.QUESTION} element={<Question />} />
+                <Route path={ROUTES.COACH_HISTORY} element={<CoachHistory />} />
+                <Route path={ROUTES.COACH_PROFILE} element={<CoachProfile />} />
+                <Route path={`${ROUTES.COACH_SHEET}/:id`} element={<CoachSheet />} />
+                {/* <Route path={`${ROUTES.HISTORY_SHEET}/:id`} element={<HistorySheet />} /> */}
+              </Route>
+            </Routes>
+          </Suspense>
+        </BoardProvider>
       </SnackbarProvider>
     </UserProvider>
   );

diff --git a/front/src/api/index.ts b/front/src/api/index.ts
@@ -19,11 +19,12 @@ api.interceptors.request.use(
       return config;
     }
 
-    config.headers = {
-      Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
+    const newConfig = {
+      ...config,
+      headers: { ...config.headers, Authorization: `Bearer ${token}` },
     };
-    return config;
+
+    return newConfig;
   },
 
   (error) => {

diff --git a/front/src/components/BoardSelectList/index.tsx b/front/src/components/BoardSelectList/index.tsx
@@ -1,3 +1,6 @@
+import { useContext } from 'react';
+
+import { BoardChangeContext } from '@context/BoardModeProvider';
 import * as S from './styles';
 
 type Item = {
@@ -9,12 +12,13 @@ interface BoardSelectListProps {
   lists: Item[];
   hidden?: boolean;
   selectedItem: string;
-  onSelect: (e: React.MouseEvent<HTMLElement>) => void;
 }
 
-const BoardSelectList = ({ lists, hidden, selectedItem, onSelect }: BoardSelectListProps) => {
+const BoardSelectList = ({ lists, hidden, selectedItem }: BoardSelectListProps) => {
+  const changeBoard = useContext(BoardChangeContext);
+
   return (
-    <S.Container onClick={onSelect} hidden={hidden}>
+    <S.Container onClick={changeBoard} hidden={hidden}>
       {lists.map(({ id, text }) => (
         <S.ListItem key={id} id={id} isSelected={selectedItem === id}>
           {text}

diff --git a/front/src/components/Calendar/index.tsx b/front/src/components/Calendar/index.tsx
@@ -41,17 +41,23 @@ const Calendar = ({
   return (
     <S.CalendarContainer isMultipleSelecting={isMultipleSelecting} isOpenTimeList={isOpenTimeList}>
       <S.YearMonthContainer>
-        <span>
+        <span role="status">
           {year}년 {month}월
         </span>
         <div>
           <Conditional condition={startDateTime < currentDateTime}>
-            <img src={LeftArrowDisabled} alt="비활성화된 왼쪽 화살표" />
+            <button>
+              <img src={LeftArrowDisabled} alt="이전 월 보기 비활성화" aria-disabled="true" />
+            </button>
           </Conditional>
           <Conditional condition={startDateTime >= currentDateTime}>
-            <img src={LeftArrow} alt="왼쪽 화살표" onClick={() => onUpdateMonth(-1)} />
+            <button onClick={() => onUpdateMonth(-1)}>
+              <img src={LeftArrow} alt="이전 월 보기" />
+            </button>
           </Conditional>
-          <img src={RightArrow} alt="오른쪽 화살표" onClick={() => onUpdateMonth(1)} />
+          <button onClick={() => onUpdateMonth(1)}>
+            <img src={RightArrow} alt="다음 월 보기" />
+          </button>
         </div>
       </S.YearMonthContainer>
       <S.DateGrid>

diff --git a/front/src/components/Card/SkeletonCard.tsx b/front/src/components/Card/SkeletonCard.tsx
@@ -0,0 +1,19 @@
+import * as S from './styles';
+
+const SkeletonCard = () => {
+  return (
+    <S.SkeletonContainer>
+      <S.SkeletonInner>
+        <S.SkeletonImageWrapper>
+          <div />
+        </S.SkeletonImageWrapper>
+        <span></span>
+        <S.SkeletonButtonWrapper>
+          <div />
+        </S.SkeletonButtonWrapper>
+      </S.SkeletonInner>
+    </S.SkeletonContainer>
+  );
+};
+
+export default SkeletonCard;
diff --git a/front/src/components/Card/index.tsx b/front/src/components/Card/index.tsx
@@ -32,7 +32,7 @@ const Card = ({
         <span>{name}</span>
         <p>{description}</p>
         <S.ButtonWrapper>
-          <button>{buttonName}</button>
+          <button aria-label={`${name}에게 예약하기`}>{buttonName}</button>
         </S.ButtonWrapper>
       </S.CardWrapper>
     </S.CardContainer>