fixed period selector based on #1

jahidem · Dec 26, 2022 · b173886 · b173886
1 parent f545d07
commit b173886
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 38 deletions.
diff --git a/core/homeWindow.ts b/core/homeWindow.ts
@@ -33,10 +33,10 @@ export default class HomeWindow {
       },
     });
     if (HomeWindow.thisWindow != null) {
-      HomeWindow.thisWindow.loadURL(
-        'file://' + __dirname + '/../index.html#/home'
-      );
-      // HomeWindow.thisWindow.loadURL("http://localhost:3000/#/home");
+      // HomeWindow.thisWindow.loadURL(
+      //   'file://' + __dirname + '/../index.html#/home'
+      // );
+      HomeWindow.thisWindow.loadURL("http://localhost:3000/#/home");
 
       HomeWindow.thisWindow.on("closed", HomeWindow.onClose);
     }
@@ -86,8 +86,8 @@ export default class HomeWindow {
     });
 
     if (HomeWindow.logWindow != null) {
-      HomeWindow.logWindow.loadURL('file://' + __dirname + '/../index.html#/log');
-      // HomeWindow.logWindow.loadURL("http://localhost:3000/#/log");
+      // HomeWindow.logWindow.loadURL('file://' + __dirname + '/../index.html#/log');
+      HomeWindow.logWindow.loadURL("http://localhost:3000/#/log");
     }
   }
 
@@ -137,8 +137,8 @@ export default class HomeWindow {
       ];
       const menu = Menu.buildFromTemplate(template);
       Menu.setApplicationMenu(menu);
-      HomeWindow.potmWindow.loadURL('file://' + __dirname + '/../index.html#/potm');
-      // HomeWindow.potmWindow.loadURL("http://localhost:3000/#/potm");
+      // HomeWindow.potmWindow.loadURL('file://' + __dirname + '/../index.html#/potm');
+      HomeWindow.potmWindow.loadURL("http://localhost:3000/#/potm");
       // HomeWindow.potmWindow.on("closed", HomeWindow.closePotmWindow);
     }
   }

diff --git a/core/prisma/sqlite.db b/core/prisma/sqlite.db
diff --git a/src/screen/components/Setting.tsx b/src/screen/components/Setting.tsx
@@ -8,17 +8,17 @@ import {
   Checkbox,
   CheckboxGroup,
   Stack,
-} from '@chakra-ui/react';
-import { ChevronDownIcon } from '@chakra-ui/icons';
-import { useEffect, useState } from 'react';
-import { useAppSelector, useAppDispatch } from '../../redux/hook';
-import { fetchAllContest } from '../../redux/slice/cfapi-slice';
-import { Loading } from '../../common/types';
+} from "@chakra-ui/react";
+import { ChevronDownIcon } from "@chakra-ui/icons";
+import { useEffect, useState } from "react";
+import { useAppSelector, useAppDispatch } from "../../redux/hook";
+import { fetchAllContest } from "../../redux/slice/cfapi-slice";
+import { Loading } from "../../common/types";
 import {
   setEpochStart,
   setEpochEnd,
   updateAllowDiv,
-} from '../../redux/slice/contest-slice';
+} from "../../redux/slice/contest-slice";
 
 interface ChooserState {
   month: number;
@@ -39,8 +39,8 @@ const Setting = () => {
   const [start, setStart] = useState<ChooserState>(initials);
   const [end, setEnd] = useState<ChooserState>({ ...initials, month: 12 });
   const [checkedDiv, setCheckedDiv] = useState<(string | number)[]>([
-    'Div. 2',
-    'Div. 3',
+    "Div. 2",
+    "Div. 3",
   ]);
   const [updateList, setUpdateList] = useState(0);
 
@@ -51,28 +51,37 @@ const Setting = () => {
     update();
   }, [updateList]);
 
-  const getEpo = (date: ChooserState) => {
-    if (date.month && date.year) {
-      let dateString = '';
-      dateString += date.year + '-';
-      if (date.month < 10) dateString += '0' + date.month;
-      else dateString += date.month;
-      dateString += '-01';
-      date.epoch = new Date(dateString).getTime();
-      return date;
-    }
-    return date;
+  const getEpo = (Nowdate: ChooserState, type: string): number => {
+    const date = {
+      ...Nowdate,
+      month:
+        type != "ENDING"
+          ? Nowdate.month
+          : Nowdate.month != 12
+          ? Nowdate.month + 1
+          : 1,
+      year:
+        type != "ENDING" || Nowdate.month != 12
+          ? Nowdate.year
+          : Nowdate.year + 1,
+    };
+
+    let dateString = "";
+    dateString += date.year + "-";
+    if (date.month < 10) dateString += "0" + date.month;
+    else dateString += date.month;
+    dateString += "-01";
+    date.epoch = new Date(dateString).getTime();
+    return date.epoch;
   };
   useEffect(() => {
-    const date = getEpo(start);
-    setStart(date);
-    dispatch(setEpochStart(date.epoch));
+    const epoch = getEpo(start, "STARTING");
+    dispatch(setEpochStart(epoch));
   }, [start]);
 
   useEffect(() => {
-    const date = getEpo(end);
-    setEnd(date);
-    dispatch(setEpochEnd(date.epoch));
+    const epoch = getEpo(end, "ENDING");
+    dispatch(setEpochEnd(epoch));
   }, [end]);
 
   useEffect(() => {
@@ -97,7 +106,7 @@ const Setting = () => {
             alignItems="center"
           >
             <Text fontSize="1.4rem" fontWeight="semibold">
-              From:{' '}
+              From:
             </Text>
             <Select
               width="6rem"
@@ -157,7 +166,7 @@ const Setting = () => {
             alignItems="center"
           >
             <Text fontSize="1.4rem" fontWeight="semibold">
-              Till:{' '}
+              To:
             </Text>
             <Select
               width="6rem"
@@ -223,13 +232,13 @@ const Setting = () => {
 
           <Flex mt="0.8rem" ml="1rem">
             <Text fontSize="1.3rem" mr="1.4rem" fontWeight="semibold">
-              Division:{' '}
+              Division:{" "}
             </Text>
             <CheckboxGroup
               defaultValue={checkedDiv}
               onChange={(value) => setCheckedDiv(value)}
             >
-              <Stack spacing={[3]} direction={['row']}>
+              <Stack spacing={[3]} direction={["row"]}>
                 <Checkbox colorScheme="teal" size="lg" value="Div. 1">
                   Div. 1
                 </Checkbox>