Merge branch 'develop'

Author: emscb

.env.development

@@ -1 +1,2 @@
-REACT_APP_PYCONKR_API=https://api-dev.pycon.kr
+REACT_APP_PYCONKR_API=https://api-dev.pycon.kr
+REACT_APP_PYCONKR_SHOP_API=https://shop-api.dev.pycon.kr

.env.production

@@ -1 +1,2 @@
 REACT_APP_PYCONKR_API=https://api.pycon.kr
+REACT_APP_PYCONKR_SHOP_API=https://shop-api.pycon.kr

.github/workflows/dev-cd.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Build
         run: |
-          yarn build:dev
+          yarn build
 
       - name: Deploy
         run: |

package.json

@@ -36,11 +36,9 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "env-cmd -f ./.env.local react-scripts start",
-    "start:dev": "env-cmd -f ./.env.development react-scripts start",
+    "start": "env-cmd -f ./.env.development react-scripts start",
     "start:prod": "env-cmd -f ./.env.production react-scripts start",
-    "build": "env-cmd -f ./.env.local react-scripts build --profile",
-    "build:dev": "env-cmd -f ./.env.development react-scripts build --profile",
+    "build": "env-cmd -f ./.env.development react-scripts build --profile",
     "build:prod": "env-cmd -f ./.env.production react-scripts build"
   },
   "eslintConfig": {

scripts/set_dev.sh

@@ -1,29 +1,46 @@
-import { getErrorMessage } from "api"
-import instance from "lib/axios"
-import { APISponsor, APISponsorBenefit, APISponsorLevel, APISponsorLevelWithSponsor } from "models/api/sponsor"
-import { Sponsor, SponsorBenefit, SponsorLevel, SponsorLevelWithSponsor } from "models/sponsor"
-
+import { getErrorMessage } from "api";
+import instance from "lib/axios";
+import {
+  APIPatron,
+  APISponsor,
+  APISponsorBenefit,
+  APISponsorLevel,
+  APISponsorLevelWithSponsor,
+} from "models/api/sponsor";
+import {
+  Patron,
+  Sponsor,
+  SponsorBenefit,
+  SponsorLevel,
+  SponsorLevelWithSponsor,
+} from "models/sponsor";
 
 export function detailSponsor(id: string): Promise<Sponsor> {
   return new Promise((resolve, reject) => {
-    instance.get<APISponsor>(`/2024/sponsors/list/${id}/`).then(response => {
-      resolve(Sponsor.fromAPI(response.data));
-    }).catch(error => {
-      console.error(error);
-      reject(getErrorMessage(error));
-    })
+    instance
+      .get<APISponsor>(`/2024/sponsors/list/${id}/`)
+      .then((response) => {
+        resolve(Sponsor.fromAPI(response.data));
+      })
+      .catch((error) => {
+        console.error(error);
+        reject(getErrorMessage(error));
+      });
     return;
-  })
+  });
 }
 
 export function listSponsorLevels(): Promise<SponsorLevel[]> {
   return new Promise((resolve, reject) => {
-    instance.get<APISponsorLevel[]>("/2024/sponsors/levels").then((response) => {
-      resolve(SponsorLevel.fromAPIs(response.data));
-    }).catch((error) => {
-      console.error(error);
-      reject(getErrorMessage(error));
-    })
+    instance
+      .get<APISponsorLevel[]>("/2024/sponsors/levels")
+      .then((response) => {
+        resolve(SponsorLevel.fromAPIs(response.data));
+      })
+      .catch((error) => {
+        console.error(error);
+        reject(getErrorMessage(error));
+      });
     return;
   });
 }
@@ -46,7 +63,6 @@ export function listSponsorLevelWithSponsor(): Promise<SponsorLevelWithSponsor[]
     instance
       .get<APISponsorLevelWithSponsor[]>("/2024/sponsors/levels/with-sponsor/")
       .then((response) => {
-        console.log("debug", response);
         resolve(SponsorLevelWithSponsor.fromAPIs(response.data));
       })
       .catch((error) => {
@@ -58,11 +74,28 @@ export function listSponsorLevelWithSponsor(): Promise<SponsorLevelWithSponsor[]
 
 export function listSponsorBenefits(): Promise<SponsorBenefit[]> {
   return new Promise((resolve, reject) => {
-    instance.get<APISponsorBenefit[]>("/2024/sponsors/benefits/").then(response => {
-      resolve(SponsorBenefit.fromAPIs(response.data));
-    }).catch(error => {
-      console.error(error);
-      reject(getErrorMessage(error));
-    })
-  })
+    instance
+      .get<APISponsorBenefit[]>("/2024/sponsors/benefits/")
+      .then((response) => {
+        resolve(SponsorBenefit.fromAPIs(response.data));
+      })
+      .catch((error) => {
+        console.error(error);
+        reject(getErrorMessage(error));
+      });
+  });
+}
+
+export function listPatrons(): Promise<Patron[]> {
+  return new Promise((resolve, reject) => {
+    instance
+      .get<APIPatron[]>(`${process.env.REACT_APP_PYCONKR_SHOP_API}/v1/ext/patron/`)
+      .then((response) => {
+        resolve(Patron.fromAPIs(response.data));
+      })
+      .catch((error) => {
+        console.error(error);
+        reject(getErrorMessage(error));
+      });
+  });
 }

scripts/set_prod.sh

@@ -28,6 +28,7 @@ const LogoImage = styled.img`
   background: white;
   color: black;
   min-width: 15vw;
+  max-height: 100%;
 `;
 
 const SponsorCard = styled.div`
@@ -48,6 +49,10 @@ const SponsorCard = styled.div`
     display: grid;
     grid-gap: 1.5rem;
     flex: auto;
+
+    & > a {
+      max-height: 20rem;
+    }
   }
 
   @media only screen and (max-width: 810px) {

src/api/sponsor.ts

@@ -1,22 +1,22 @@
-import { useDispatch } from "react-redux"
+import { useDispatch } from "react-redux";
 
-import { openGlobalDialog, setLanguage } from "store/Core"
-import { DIALOG_CONST_PROGRAM_NOT_HELD_ON_2024 } from "store/Core/dialog"
+import { openGlobalDialog, setLanguage } from "store/Core";
+import { DIALOG_CONST_PROGRAM_NOT_HELD_ON_2024 } from "store/Core/dialog";
 
 export type MenuElementOnClickArgType = {
-  setOpenMenu: React.Dispatch<React.SetStateAction<boolean>>
-  navigate?: (path: string) => void
-  dispatch: ReturnType<typeof useDispatch>
-}
+  setOpenMenu: React.Dispatch<React.SetStateAction<boolean>>;
+  navigate?: (path: string) => void;
+  dispatch: ReturnType<typeof useDispatch>;
+};
 
 export type MenuElementType = {
-  name: string
-  style?: React.CSSProperties
-  path?: string
-  onClick?: (_: MenuElementOnClickArgType) => void
-}
+  name: string;
+  style?: React.CSSProperties;
+  path?: string;
+  onClick?: (_: MenuElementOnClickArgType) => void;
+};
 
-export type MenuType = { [key: string]: MenuElementType & { sub?: MenuElementType[] } }
+export type MenuType = { [key: string]: MenuElementType & { sub?: MenuElementType[] } };
 
 const Menus: MenuType = {
   about: {
@@ -29,8 +29,11 @@ const Menus: MenuType = {
       {
         name: "파이콘 한국 행동 강령",
         onClick: ({ setOpenMenu }) => {
-          setOpenMenu(false)
-          window.open("https://pythonkr.github.io/pycon-code-of-conduct/ko/coc/a_intent_and_purpose.html", "_blank")
+          setOpenMenu(false);
+          window.open(
+            "https://pythonkr.github.io/pycon-code-of-conduct/ko/coc/a_intent_and_purpose.html",
+            "_blank"
+          );
         },
       },
       {
@@ -63,33 +66,33 @@ const Menus: MenuType = {
   program: {
     name: "프로그램",
     onClick: ({ setOpenMenu, dispatch }) => {
-      setOpenMenu(false)
-      dispatch(openGlobalDialog(DIALOG_CONST_PROGRAM_NOT_HELD_ON_2024))
-    }
+      setOpenMenu(false);
+      dispatch(openGlobalDialog(DIALOG_CONST_PROGRAM_NOT_HELD_ON_2024));
+    },
   },
   ticket: {
     name: "티켓 구매",
     onClick: ({ setOpenMenu }) => {
-      setOpenMenu(false)
-      window.open("https://shop.pycon.kr/ticket", "_blank")
-    }
+      setOpenMenu(false);
+      window.open("https://shop.pycon.kr/ticket", "_blank");
+    },
   },
   session: {
     name: "세션",
     sub: [
       {
         name: "세션 목록",
         onClick: ({ setOpenMenu, navigate }) => {
-          navigate?.("/session")
-          setOpenMenu(false)
-        }
+          navigate?.("/session");
+          setOpenMenu(false);
+        },
       },
       {
         name: "세션 시간표",
         onClick: ({ setOpenMenu, navigate }) => {
-          navigate?.("/session/timetable")
-          setOpenMenu(false)
-        }
+          navigate?.("/session/timetable");
+          setOpenMenu(false);
+        },
       },
     ],
   },
@@ -98,12 +101,12 @@ const Menus: MenuType = {
     sub: [
       {
         name: "후원사 안내",
-        path: "/sponsoring/sponsor/prospectus"
+        path: "/sponsoring/sponsor/prospectus",
+      },
+      {
+        name: "개인 후원자",
+        path: "/sponsoring/patron",
       },
-      // {
-      //   name: "개인 후원자",
-      //   path: "/sponsoring/patron",
-      // },
       // {
       //   name: "후원사 혜택 안내",
       //   path: "/sponsoring/sponsor/benefit",
@@ -128,19 +131,19 @@ const Menus: MenuType = {
       {
         name: "한국어",
         onClick: ({ setOpenMenu, dispatch }) => {
-          setOpenMenu(false)
-          dispatch(setLanguage("KOR"))
-        }
+          setOpenMenu(false);
+          dispatch(setLanguage("KOR"));
+        },
       },
       {
         name: "English",
         onClick: ({ setOpenMenu, dispatch }) => {
-          setOpenMenu(false)
-          dispatch(setLanguage("ENG"))
-        }
+          setOpenMenu(false);
+          dispatch(setLanguage("ENG"));
+        },
       },
-    ]
-  }
-} as const
+    ],
+  },
+} as const;
 
-export default Menus
+export default Menus;