Merge branch 'develop' into feat/enable-chart-zoom

42Statistics · Dec 4, 2023 · c744bd3 · c744bd3
2 parents b97d226 + b18a5bf
commit c744bd3
Show file tree

Hide file tree

Showing 47 changed files with 843 additions and 56 deletions.
diff --git a/.github/workflows/s3-ci-dev.yml b/.github/workflows/s3-ci-dev.yml
@@ -40,8 +40,8 @@ jobs:
       - name: Upload to S3
         run: |
           aws s3 sync ./app/dist s3://$S3_BUCKET --region $DEFAULT_BUCKET_REGION --delete --exclude "cdn/*" --exclude "fonts/*"
-          aws s3 cp --cache-control 's-maxage=31536000, max-age=0' index.html s3://$S3_BUCKET --region $DEFAULT_BUCKET_REGION
+          aws s3 cp --cache-control 's-maxage=31536000, max-age=0' ./app/dist/index.html s3://$S3_BUCKET --region $DEFAULT_BUCKET_REGION
 
-      - name: Invalidate CloudFront
-        run: |
-          aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/index.html"
+      # - name: Invalidate CloudFront
+      #   run: |
+      #     aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/index.html"
diff --git a/.github/workflows/s3-ci.yml b/.github/workflows/s3-ci.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Upload to S3
         run: |
           aws s3 sync ./app/dist s3://$S3_BUCKET --region $DEFAULT_BUCKET_REGION --delete --exclude "cdn/*" --exclude "fonts/*"
-          aws s3 cp --cache-control 's-maxage=31536000, max-age=0' index.html s3://$S3_BUCKET --region $DEFAULT_BUCKET_REGION
+          aws s3 cp --cache-control 's-maxage=31536000, max-age=0' ./app/dist/index.html s3://$S3_BUCKET --region $DEFAULT_BUCKET_REGION
 
       - name: Invalidate CloudFront
         run: |

diff --git a/app/src/@shared/__generated__/gql.ts b/app/src/@shared/__generated__/gql.ts
diff --git a/app/src/@shared/__generated__/graphql.ts b/app/src/@shared/__generated__/graphql.ts
diff --git a/app/src/@shared/components/Dashboard/DashboardTemp.tsx b/app/src/@shared/components/Dashboard/DashboardTemp.tsx
@@ -6,6 +6,14 @@ import type { DashboardTempProps } from '@shared/types/Dashboard';
 
 //rowSpan,colSpan이 한 배열에 같이 있는 구조
 export const DashboardTemp = ({ rows, contents }: DashboardTempProps) => {
+  const findContentById = (elementId: number) => {
+    const foundContent = contents.find((content) => content.id === elementId);
+    if (foundContent === undefined) {
+      throw new Error(`Content with ID ${elementId} not found`);
+    }
+    return foundContent;
+  };
+
   return (
     <Layout>
       {rows.map(({ items }, rowIdx) => (
@@ -15,7 +23,7 @@ export const DashboardTemp = ({ rows, contents }: DashboardTempProps) => {
               key={itemIdx}
               rowSpan={rowSpan}
               colSpan={colSpan}
-              content={contents[elementId].content}
+              content={findContentById(elementId).content}
             />
           ))}
         </DashboardRow>
@@ -26,6 +34,7 @@ export const DashboardTemp = ({ rows, contents }: DashboardTempProps) => {
 
 const Layout = styled.div`
   display: flex;
+  flex-direction: column;
   gap: 1.6rem;
   width: 100%;
 `;
diff --git a/app/src/@shared/constants/date.ts b/app/src/@shared/constants/date.ts
@@ -19,3 +19,13 @@ export const CALENDAR_DAYS_FROM_FT_BEGIN_AT = differenceInCalendarDays(
   new Date(),
   FT_BEGIN_AT,
 );
+
+export const MINUTES = {
+  MILLISECOND: 1 / 1000,
+  SECOND: 1 / 60,
+  HOUR: 60,
+  DAY: 60 * 24,
+  WEEK: 60 * 24 * 7,
+  MONTH: 60 * 24 * 30,
+  YEAR: 60 * 24 * 365,
+} as const;