Merge pull request #67 from yourssu/develop

[FEATURE] Sanity 반영 및 푸터 정보 추가

.eslintrc

@@ -13,11 +13,8 @@
     "es6": true,
     "node": true
   },
-  "plugins": ["react", "jsx-a11y", "prettier", "@typescript-eslint"],
+  "plugins": ["react", "jsx-a11y", "prettier", "@typescript-eslint", "import"],
   "extends": [
-    "airbnb",
-    "airbnb-typescript",
-    "airbnb/hooks",
     "plugin:react/recommended",
     "plugin:react/jsx-runtime",
     "plugin:react-hooks/recommended",
@@ -36,21 +33,18 @@
           "index"
         ],
         "pathGroups": [
-          {
-            "pattern": "react",
-            "group": "external",
-            "position": "before"
-          },
           {
             "pattern": "@/**",
             "group": "internal",
             "position": "after"
           }
         ],
         "pathGroupsExcludedImportTypes": ["react", "react-dom"],
+        "newlines-between": "always",
         "alphabetize": { "order": "asc" }
       }
     ],
+    "react/require-default-props": "off",
     "@typescript-eslint/no-use-before-define": 0,
     "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
     "react/jsx-props-no-spreading": "off",

.github/workflows/deploy.yml

@@ -3,10 +3,15 @@ name: build-and-deploy
 on:
   push:
     branches: [master]
+  repository_dispatch:
+    types: [sanity-content-update]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency:
+      group: gatsby-build
+      cancel-in-progress: true
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3

gatsby-browser.js

@@ -1 +1,2 @@
-import "./src/styles/global.css"
+import './src/styles/fonts.css';
+import './src/styles/global.css';

gatsby-config.ts

@@ -91,15 +91,6 @@ const config: GatsbyConfig = {
         path: `${__dirname}/src/assets/logo`,
       },
     },
-    {
-      resolve: 'gatsby-source-filesystem',
-      options: {
-        // The unique name for each instance
-        name: 'social',
-        // Path to the directory
-        path: `${__dirname}/src/assets/social/`,
-      },
-    },
     {
       resolve: 'gatsby-source-filesystem',
       options: {
@@ -121,35 +112,15 @@ const config: GatsbyConfig = {
     {
       resolve: 'gatsby-source-filesystem',
       options: {
-        // The unique name for each instance
-        name: 'teams',
-        // Path to the directory
-        path: `${__dirname}/src/assets/icons/teams`,
-      },
-    },
-    {
-      resolve: 'gatsby-source-filesystem',
-      options: {
-        // The unique name for each instance
-        name: 'department_icons',
-        // Path to the directory
-        path: `${__dirname}/src/assets/icons/department_icons`,
-      },
-    },
-    {
-      resolve: 'gatsby-source-filesystem',
-      options: {
-        // The unique name for each instance
-        name: 'hovers',
-        // Path to the directory
-        path: `${__dirname}/src/assets/icons/hovers`,
+        name: 'icons',
+        path: `${__dirname}/src/assets/icons`,
       },
     },
     {
       resolve: 'gatsby-source-filesystem',
       options: {
-        name: 'icons',
-        path: `${__dirname}/src/assets/icons/`,
+        name: 'socials',
+        path: `${__dirname}/src/assets/socials`,
       },
     },
     {

gatsby-node.ts

@@ -1,5 +1,6 @@
-import { graphql, type GatsbyNode } from 'gatsby';
+import { type GatsbyNode } from 'gatsby';
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import recruitingSchedule from './src/utils/recruitingSchedule';
 
 interface QueryResult {
   allSanityDepartment: {
@@ -8,15 +9,48 @@ interface QueryResult {
         basicInformation: {
           name: string;
         };
+        applyProcedure: {
+          scheduleWithoutAssignment: boolean;
+          scheduleWithAssignment: boolean;
+          individualSchedule: boolean;
+          formSchedule: {
+            start: Date;
+            end: Date;
+          };
+          procedure: {
+            step: string;
+            schedule: string;
+          }[];
+        };
       };
     }[];
   };
-  allSanityRecruitingSchedule: {
+  scheduleWithAssignment: {
     edges: {
       node: {
-        applyProcedure: {
+        title: string;
+        formSchedule: {
+          start: Date;
+          end: Date;
+        };
+        procedure: {
+          step: string;
           schedule: string;
+        }[];
+      };
+    }[];
+  };
+  scheduleWithoutAssignment: {
+    edges: {
+      node: {
+        title: string;
+        formSchedule: {
+          start: Date;
+          end: Date;
+        };
+        procedure: {
           step: string;
+          schedule: string;
         }[];
       };
     }[];
@@ -41,87 +75,196 @@ export const createPages: GatsbyNode['createPages'] = async ({
 }) => {
   const { createPage } = actions;
 
-  const queryAllSanityData = await graphql<QueryResult>(`
+  const result = await graphql<QueryResult>(`
     {
-      allSanityDepartment(sort: { num: ASC }) {
+      allSanityDepartment(sort: { basicInformation: { key: ASC } }) {
         edges {
           node {
             basicInformation {
               name
             }
+            applyProcedure {
+              scheduleWithoutAssignment
+              scheduleWithAssignment
+              individualSchedule
+              formSchedule {
+                start
+                end
+              }
+              procedure {
+                step
+                schedule
+              }
+            }
           }
         }
       }
-      allSanityRecruitingSchedule {
+      scheduleWithAssignment: allSanityRecruitingSchedule(
+        filter: { title: { regex: "/과제 O$/" } }
+      ) {
         edges {
           node {
-            applyProcedure {
+            title
+            formSchedule {
+              start
+              end
+            }
+            procedure {
+              step
               schedule
+            }
+          }
+        }
+      }
+      scheduleWithoutAssignment: allSanityRecruitingSchedule(
+        filter: { title: { regex: "/과제 X$/" } }
+      ) {
+        edges {
+          node {
+            title
+            formSchedule {
+              start
+              end
+            }
+            procedure {
               step
+              schedule
             }
           }
         }
       }
     }
   `);
 
-  if (queryAllSanityData.errors) {
+  if (result.errors) {
     reporter.panicOnBuild(`Error while running query`);
     return;
   }
 
+  const queryAllSanityData = result.data;
+
   const DescriptionTemplateComponent = path.resolve(
     __dirname,
     'src/templates/DescriptionTemplate.tsx',
   );
 
-  const nameList = queryAllSanityData.data?.allSanityDepartment.edges.map(
+  const nameList = queryAllSanityData?.allSanityDepartment.edges.map(
     (edge) => edge.node.basicInformation.name,
   );
 
-  const scheduleContainsAssignment =
-    queryAllSanityData.data?.allSanityRecruitingSchedule.edges[0].node
-      .applyProcedure;
+  const checkRecruitType = (recruitTypeData: {
+    scheduleWithoutAssignment: boolean;
+    scheduleWithAssignment: boolean;
+    individualSchedule: boolean;
+    formSchedule: {
+      start: Date;
+      end: Date;
+    };
+    procedure: {
+      step: string;
+      schedule: string;
+    }[];
+  }): {
+    formSchedule: { start: Date | null; end: Date | null } | null;
+    procedure: { step: string; schedule: string }[] | null;
+  } => {
+    const {
+      scheduleWithoutAssignment,
+      scheduleWithAssignment,
+      individualSchedule,
+      formSchedule,
+      procedure,
+    } = recruitTypeData;
+
+    const recruitingType = {
+      individualSchedule,
+      scheduleWithAssignment,
+      scheduleWithoutAssignment,
+    };
+
+    const scheduleWithAssignmentData =
+      queryAllSanityData?.scheduleWithAssignment?.edges[0]?.node.formSchedule ||
+      null;
+    const scheduleWithoutAssignmentData =
+      queryAllSanityData?.scheduleWithoutAssignment?.edges[0]?.node
+        .formSchedule || null;
+    const scheduleIndividualData = formSchedule || null;
 
-  const scheduleWithoutAssignment =
-    queryAllSanityData.data?.allSanityRecruitingSchedule.edges[
-      queryAllSanityData.data.allSanityRecruitingSchedule.edges.length - 1
-    ].node.applyProcedure;
+    const recruitingScheduleData = recruitingSchedule({
+      recruitingType,
+      scheduleWithAssignmentData,
+      scheduleWithoutAssignmentData,
+      scheduleIndividualData,
+    });
+
+    if (!recruitingScheduleData) {
+      return {
+        formSchedule: null,
+        procedure: null,
+      };
+    }
+
+    if (recruitingScheduleData.type === 'individual') {
+      return {
+        formSchedule: recruitingScheduleData.formSchedule,
+        procedure: procedure,
+      };
+    }
+
+    if (recruitingScheduleData.type === 'withAssignment') {
+      return {
+        formSchedule: recruitingScheduleData.formSchedule,
+        procedure:
+          queryAllSanityData?.scheduleWithAssignment?.edges[0]?.node
+            .procedure || [],
+      };
+    }
+
+    if (recruitingScheduleData.type === 'withoutAssignment') {
+      return {
+        formSchedule: recruitingScheduleData.formSchedule,
+        procedure:
+          queryAllSanityData?.scheduleWithoutAssignment?.edges[0]?.node
+            .procedure || [],
+      };
+    }
+
+    return {
+      formSchedule: null,
+      procedure: null,
+    };
+  };
 
   const generateDescriptionPage = ({
-    node: {
-      basicInformation: { name },
-    },
+    name,
+    recruiting,
   }: {
-    node: {
-      basicInformation: {
-        name: string;
-      };
+    name: string;
+    recruiting: {
+      formSchedule: { start: Date | null; end: Date | null } | null;
+      procedure: { step: string; schedule: string }[] | null;
     };
   }) => {
     const pathName = name.toLowerCase().replaceAll(' ', '_');
-    const teamNamesContainsAssignmentInSchedule = [
-      'backend_developer',
-      'product_designer',
-    ];
 
     const pageOptions = {
       path: `recruiting/${pathName}`,
       component: DescriptionTemplateComponent,
       context: {
         name,
         nameList,
-        schedule: teamNamesContainsAssignmentInSchedule.includes(pathName)
-          ? scheduleContainsAssignment
-          : scheduleWithoutAssignment,
+        formSchedule: recruiting.formSchedule,
+        procedure: recruiting.procedure,
       },
     };
 
     createPage(pageOptions);
   };
 
-  queryAllSanityData.data &&
-    queryAllSanityData.data.allSanityDepartment.edges.forEach(
-      generateDescriptionPage,
-    );
+  queryAllSanityData?.allSanityDepartment.edges.forEach((data) => {
+    generateDescriptionPage({
+      name: data.node.basicInformation.name,
+      recruiting: checkRecruitType(data.node.applyProcedure),
+    });
+  });
 };