Feat: Format the code with prettier

CelleryLin · Oct 12, 2024 · 65f864e · 65f864e
1 parent 9d4596c
commit 65f864e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 20 deletions.
diff --git a/app/src/components/SelectorSetting/AllCourse.jsx b/app/src/components/SelectorSetting/AllCourse.jsx
@@ -153,7 +153,8 @@ class AllCourse extends Component {
   applyTextFilter = (course, filterName, filter) => {
     // console.log(filter);
     const courseValue = course[courseDataNameMap[filterName]]?.toLowerCase();
-    const filterLogic = filter.filterLogic === undefined ? 'include' : filter.filterLogic; // equal, include, exclude
+    const filterLogic =
+      filter.filterLogic === undefined ? 'include' : filter.filterLogic; // equal, include, exclude
     // 使用逗號或空格分割每個組
     const filterGroups = filter.value.toLowerCase().split(/[，,]/);
 
@@ -184,7 +185,8 @@ class AllCourse extends Component {
    */
   applyTimeFilter = (course, filterName, filter) => {
     // 檢查是否包含或排除
-    const filterLogic = filter.filterLogic === undefined ? 'include' : filter.filterLogic;
+    const filterLogic =
+      filter.filterLogic === undefined ? 'include' : filter.filterLogic;
 
     if (filterName === '星期') {
       if (filterLogic !== 'equal') {
@@ -193,15 +195,13 @@ class AllCourse extends Component {
           return filter[day] && course[day];
         });
         return filterLogic === 'include' ? daysMatched : !daysMatched;
-      }
-      else {
+      } else {
         // 檢查是否有所有天匹配
         const daysMatched = courseDayName.every((day) => {
           return (filter[day] === true) === (course[day] !== '');
         });
         return daysMatched;
       }
-
     }
 
     if (filterName === '節次') {
@@ -218,11 +218,15 @@ class AllCourse extends Component {
           }
         });
         return filterLogic === 'include' ? periodsMatched : !periodsMatched;
-      }
-      else {
+      } else {
         // 檢查是否有所有節次匹配
         let periodsMatched = true;
-        let filterPeriods = Object.keys(filter).filter((key) => key !== 'active' && key !== 'filterLogic' && filter[key]).sort().join('');
+        let filterPeriods = Object.keys(filter)
+          .filter(
+            (key) => key !== 'active' && key !== 'filterLogic' && filter[key],
+          )
+          .sort()
+          .join('');
         // console.log(filterPeriods);
         courseDayName.forEach((day) => {
           if (course[day]) {

diff --git a/app/src/components/SelectorSetting/AllCourse/ListInformation/AdvancedFilter/FilterRow.jsx b/app/src/components/SelectorSetting/AllCourse/ListInformation/AdvancedFilter/FilterRow.jsx
@@ -133,7 +133,8 @@ class FilterRow extends Component {
     // 創建一個新的選中狀態對象，將所有選項設為選中
     const selected = {
       active: this.props.advancedFilters[filterName]?.active ?? false,
-      filterLogic: this.props.advancedFilters[filterName]?.filterLogic ?? 'include',
+      filterLogic:
+        this.props.advancedFilters[filterName]?.filterLogic ?? 'include',
     };
     this.props.filterOptions[filterName].options.forEach((option) => {
       selected[option] = true;
@@ -159,7 +160,8 @@ class FilterRow extends Component {
       ...this.props.advancedFilters,
       [filterName]: {
         active: this.props.advancedFilters[filterName]?.active ?? false,
-        filterLogic: this.props.advancedFilters[filterName]?.filterLogic ?? 'include',
+        filterLogic:
+          this.props.advancedFilters[filterName]?.filterLogic ?? 'include',
       },
     };
 
@@ -261,7 +263,9 @@ class FilterRow extends Component {
                 {
                   Object.keys(selected).filter(
                     (key) =>
-                      key !== 'active' && key !== 'filterLogic' && selected[key],
+                      key !== 'active' &&
+                      key !== 'filterLogic' &&
+                      selected[key],
                   ).length
                 }{' '}
                 項

diff --git a/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx b/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx
@@ -65,7 +65,7 @@ function ListInformation({
 
   const handleCloseOrderElement = () => setShow(false);
   const handleToggleOrderElement = () => setShow(!show);
-  
+
   // const handleShowSelectedCourses = () => {
   //   setDisplayConflictCourses(prevState => !prevState);
   // };

diff --git a/app/src/components/TermofUse.jsx b/app/src/components/TermofUse.jsx
@@ -63,9 +63,7 @@ class TermofUse extends Component {
             </TextWithIcon>
           </Modal.Title>
         </Modal.Header>
-        <Modal.Body>
-          testestestestsestsetsetsetset
-        </Modal.Body>
+        <Modal.Body>testestestestsestsetsetsetset</Modal.Body>
         <Modal.Footer>
           <Button variant='secondary' onClick={this.handleClose}>
             關閉

diff --git a/app/src/config.jsx b/app/src/config.jsx
@@ -53,7 +53,18 @@ export const announcementData = {
       <a href='https://github.com/whats2000/NSYSUCourseAPI'>中山課程開放API</a>
     </>,
   ],
-  termsofuse: [<>當您使用本網站時，即表示您同意<a href='https://github.com/CelleryLin/selector_helper/blob/main/term_of_use.md' target='_blank' rel='noreferrer noopener'>使用條款</a></>],
+  termsofuse: [
+    <>
+      當您使用本網站時，即表示您同意
+      <a
+        href='https://github.com/CelleryLin/selector_helper/blob/main/term_of_use.md'
+        target='_blank'
+        rel='noreferrer noopener'
+      >
+        使用條款
+      </a>
+    </>,
+  ],
   githubUrl: 'https://github.com/CelleryLin/selector_helper/',
   contactEmail: '[email protected]',
   copyright: [
@@ -64,12 +75,27 @@ export const announcementData = {
 
 export const entryNotificationConfig = {
   version: announcementData.version,
-  description:
+  description: (
     <>
       我們已更新使用條款，當您使用本網站時，即表示您同意
-      <a href='https://github.com/CelleryLin/selector_helper/blob/main/term_of_use.md' target='_blank' rel='noreferrer noopener'>使用條款</a>
-    </>,
-  updates: [<a href='https://github.com/CelleryLin/selector_helper/blob/main/term_of_use.md' target='_blank' rel='noreferrer noopener'>使用條款</a>],
+      <a
+        href='https://github.com/CelleryLin/selector_helper/blob/main/term_of_use.md'
+        target='_blank'
+        rel='noreferrer noopener'
+      >
+        使用條款
+      </a>
+    </>
+  ),
+  updates: [
+    <a
+      href='https://github.com/CelleryLin/selector_helper/blob/main/term_of_use.md'
+      target='_blank'
+      rel='noreferrer noopener'
+    >
+      使用條款
+    </a>,
+  ],
   feedbackFormUrl: announcementData.feedbackFormUrl,
 };