commit_1 (#258)

NTUEE-PLUS · Apr 25, 2024 · 0c782fe · 0c782fe
1 parent 94bd3af
commit 0c782fe
Show file tree

Hide file tree

Showing 27 changed files with 106 additions and 129 deletions.
diff --git a/client/src/_navAuth.js b/client/src/_navAuth.js
@@ -13,28 +13,28 @@ const _navAuth = [
     as: NavLink,
     anchor: 'MANAGE AUTH',
     to: '/auth/manage',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'MATCHING',
     to: '/auth/matching',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'REGISTER',
     to: '/auth/register',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'COLUMN',
     to: '/auth/column',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
 ]
 

diff --git a/client/src/_navIn.js b/client/src/_navIn.js
@@ -12,49 +12,49 @@ const _navIn = [
     as: NavLink,
     anchor: 'DASHBOARD',
     to: '/dashboard',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'CAREER',
     to: '/career',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'COLUMNS',
     to: '/column_summary',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'MATCHING',
     to: '/matching',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'SHARING SESSION',
     to: '/abroad_session/search',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'MATERIAL',
     to: '/material',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   /* {
     _component: 'CNavItem',
     as: NavLink,
     anchor: 'STUDY',
     to: '/study',
-    icon: <CIcon name="cil-notes" customClassName="nav-icon" />,
+    icon: <CIcon customClassName="nav-icon" />,
   }, */
 ]
 

diff --git a/client/src/_navOut.js b/client/src/_navOut.js
@@ -13,56 +13,56 @@ const _navOut = [
     as: NavHashLink,
     anchor: 'HEADER',
     to: '/home/#header',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'SERVICES',
     to: '/home/#services',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'ABOUT',
     to: '/home/#about',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'INTERVIEWS',
     to: '/home/#interviews',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'HISTORY',
     to: '/home/#history',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'TEAM',
     to: '/home/#team',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'CONTACT',
     to: '/home/#contact',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
   {
     _component: 'CNavItem',
     as: NavHashLink,
     anchor: 'SPONSORS',
     to: '/home/#sponsors',
-    icon: <CIcon icon="sidebar_icon" name="sidebar_icon" customClassName="nav-icon" />,
+    icon: <CIcon icon="sidebar_icon" customClassName="nav-icon" />,
   },
 ]
 

diff --git a/client/src/components/AppHeader.js b/client/src/components/AppHeader.js
@@ -63,7 +63,7 @@ const AppHeader = () => {
           className="ms-md-3 d-md-none"
           onClick={() => (sidebarShow ? dispatch(sidebarHide()) : dispatch(sidebarOpen()))}
         >
-          <CIcon icon="cil-menu" name="cil-menu" size="lg" />
+          <CIcon icon="cil-menu" size="lg" />
         </CHeaderToggler>
         <CHeaderToggler
           className="ms-md-3 d-none d-md-block"
@@ -72,7 +72,7 @@ const AppHeader = () => {
             unfoldable ? dispatch(squeezeSidebar()) : dispatch(stretchSidebar())
           }}
         >
-          <CIcon icon="cil-menu" name="cil-menu" size="lg" />
+          <CIcon icon="cil-menu" size="lg" />
         </CHeaderToggler>
         {/* <CHeaderBrand className="d-flex justify-content-center mx-auto d-md-none" to="/">
           <CImage src={logo_row} fluid width="50%" />
@@ -91,7 +91,7 @@ const AppHeader = () => {
                   onKeyPress={handleEnter}
                 ></CFormControl>
                 <CButton onClick={handleSearch}>
-                  <CIcon icon="cil-search" name="cil-search" />
+                  <CIcon icon="cil-search" />
                 </CButton>
               </CInputGroup>
             </CNavItem>

diff --git a/client/src/components/header/AppHeaderDropdown.js b/client/src/components/header/AppHeaderDropdown.js
@@ -44,22 +44,22 @@ const AppHeaderDropdown = () => {
       <CDropdownMenu className="pt-0" placement="bottom-end">
         <CDropdownHeader className="bg-light fw-semibold py-2">Your Space</CDropdownHeader>
         <CDropdownItem component={Link} to={`/profile/${studentID}`}>
-          <CIcon icon="cil-user" name="cil-user" className="me-2" />
+          <CIcon icon="cil-user" className="me-2" />
           Profile
         </CDropdownItem>
 
         <CDropdownItem component={Link} to="/own_recruitment">
-          <CIcon icon="cil-user" name="cil-user" className="me-2" />
+          <CIcon icon="cil-user" className="me-2" />
           Your Recruitment
         </CDropdownItem>
 
         <CDropdownItem component={Link} to={`/own_recommendation`}>
-          <CIcon icon="cil-user" name="cil-user" className="me-2" />
+          <CIcon icon="cil-user" className="me-2" />
           Your Recommendation
         </CDropdownItem>
 
         <CDropdownItem component={Link} to={`/change_password`}>
-          <CIcon icon="cil-lock-locked" name="cil-lock-locked" className="me-2" />
+          <CIcon icon="cil-lock-locked" className="me-2" />
           Change Password
         </CDropdownItem>
 
@@ -72,7 +72,7 @@ const AppHeaderDropdown = () => {
         </CDropdownItem> */}
         <CDropdownDivider />
         <CDropdownItem onClick={handleLogOut}>
-          <CIcon icon="cil-lock-locked" name="cil-lock-locked" className="me-2" />
+          <CIcon icon="cil-lock-locked" className="me-2" />
           Logout
         </CDropdownItem>
       </CDropdownMenu>

diff --git a/client/src/views/auth/announce/Announce.js b/client/src/views/auth/announce/Announce.js
@@ -91,7 +91,7 @@ const Announce = () => {
                 <h1>{add === 'add' ? 'Ready to post' : 'Want to edit'} an announcement?</h1>
                 <CInputGroup className="mb-3">
                   <CInputGroupText>
-                    <CIcon icon="cil-layers" name="cil-layers" />
+                    <CIcon icon="cil-layers" />
                   </CInputGroupText>
                   <CFormControl
                     placeholder="Title*"

diff --git a/client/src/views/auth/manage/ManageAuth.js b/client/src/views/auth/manage/ManageAuth.js
@@ -77,7 +77,7 @@ function ManageAuth() {
           onKeyPress={handleEnter}
         />
         <CButton onClick={handleSearch}>
-          <CIcon icon="cil-search" name="cil-search" />
+          <CIcon icon="cil-search" />
         </CButton>
       </CInputGroup>
       <br />

diff --git a/client/src/views/auth/matching/Mail.js b/client/src/views/auth/matching/Mail.js
@@ -35,7 +35,7 @@ const Mail = ({ hasSent, setHasSent, setHasMatched }) => {
             className="align-self-baseline btn btn-ghost-info"
             onClick={() => setHasMatched(false)}
           >
-            <CIcon name="cil-home" size="lg" />
+            <CIcon size="lg" />
           </button>
           <img src={mail_sent} alt="success" className="img-fluid w-25" />
           <h2 className="my-4">信件已全數寄出，謝謝您的幫忙！</h2>
@@ -46,7 +46,7 @@ const Mail = ({ hasSent, setHasSent, setHasMatched }) => {
             className="align-self-baseline btn btn-ghost-info"
             onClick={() => setHasMatched(false)}
           >
-            <CIcon name="cil-home" size="lg" />
+            <CIcon size="lg" />
           </button>
           <h2 className="my-4">配對已完成！趕快發信告訴大家吧！</h2>
           <img src={success_icon} alt="success" className="img-fluid w-25" />

diff --git a/client/src/views/auth/register/Applicant.js b/client/src/views/auth/register/Applicant.js
@@ -3,11 +3,11 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import CIcon from '@coreui/icons-react'
 import { CButton } from '@coreui/react'
-const Applicant = ({ person,setIsModal,setModalPerson }) => {
-    const show=()=>{
-        setModalPerson(person)
-        setIsModal(true)
-    }
+const Applicant = ({ person, setIsModal, setModalPerson }) => {
+  const show = () => {
+    setModalPerson(person)
+    setIsModal(true)
+  }
   return (
     <div className="d-flex align-items-center m-4 justify-content-around p-2 applicant">
       <div className="col-2">姓名：{person.username}</div>
@@ -20,8 +20,8 @@ const Applicant = ({ person,setIsModal,setModalPerson }) => {
         <nobr>信箱：{person.email}</nobr>
       </div>
       <div className="col-1">
-        <CButton color="primary" onClick={()=>show()} >
-          <CIcon icon="cil-search" name="cil-search" />
+        <CButton color="primary" onClick={() => show()}>
+          <CIcon icon="cil-search" />
         </CButton>
       </div>
     </div>
@@ -30,6 +30,6 @@ const Applicant = ({ person,setIsModal,setModalPerson }) => {
 Applicant.propTypes = {
   person: PropTypes.object,
   setIsModal: PropTypes.func,
-  setModalPerson:PropTypes.func,
+  setModalPerson: PropTypes.func,
 }
 export default Applicant
diff --git a/client/src/views/in/abroadSession/components/SearchBar.js b/client/src/views/in/abroadSession/components/SearchBar.js
@@ -14,7 +14,7 @@ const SearchBar = ({ rootRoute, keywords, setKeywords }) => {
   return (
     <CInputGroup>
       <CButton onClick={handleBackToHome} color="light">
-        <CIcon icon="cil-home" name="cil-home" />
+        <CIcon icon="cil-home" />
       </CButton>
       <CFormControl
         type="search"
@@ -24,7 +24,7 @@ const SearchBar = ({ rootRoute, keywords, setKeywords }) => {
         value={keywords ? keywords : ''}
       ></CFormControl>
       <CButton color="light" onClick={handleSearch}>
-        <CIcon icon="cil-search" name="cil-search" />
+        <CIcon icon="cil-search" />
       </CButton>
     </CInputGroup>
   )

diff --git a/client/src/views/in/career/CareerBlock.js b/client/src/views/in/career/CareerBlock.js
@@ -122,17 +122,12 @@ const CareerBlock = ({ post, isAuth }) => {
                 <>
                   {own && (
                     <Link to={`/edit_recruitment/${post._id}`}>
-                      <CIcon
-                        icon="cil-pencil"
-                        name="cil-pencil"
-                        style={{ scale: '1.7', marginLeft: '1rem' }}
-                      ></CIcon>
+                      <CIcon icon="cil-pencil" style={{ scale: '1.7', marginLeft: '1rem' }}></CIcon>
                     </Link>
                   )}
                   <CAvatar className="hover-pointer">
                     <CIcon
                       icon="cil-trash"
-                      name="cil-trash"
                       style={{ scale: '1.7' }}
                       onClick={() => deleteCareer(post._id)}
                     ></CIcon>
@@ -220,17 +215,12 @@ const CareerBlock = ({ post, isAuth }) => {
                 <>
                   {own && (
                     <Link to={`/edit_recommendation/${post._id}`}>
-                      <CIcon
-                        icon="cil-pencil"
-                        name="cil-pencil"
-                        style={{ scale: '1.7', marginLeft: '1rem' }}
-                      ></CIcon>
+                      <CIcon icon="cil-pencil" style={{ scale: '1.7', marginLeft: '1rem' }}></CIcon>
                     </Link>
                   )}
                   <CAvatar className="hover-pointer">
                     <CIcon
                       icon="cil-trash"
-                      name="cil-trash"
                       style={{ scale: '1.7', marginLeft: '1rem' }}
                       onClick={() => deleteCareer(post._id)}
                     ></CIcon>

diff --git a/client/src/views/in/changePsw/ChangePsw.js b/client/src/views/in/changePsw/ChangePsw.js
@@ -61,7 +61,7 @@ const ChangePsw = () => {
                   <p> </p>
                   <CInputGroup className="mb-3">
                     <CInputGroupText>
-                      <CIcon icon="cil-lock-locked" name="cil-education" />
+                      <CIcon icon="cil-lock-locked" />
                     </CInputGroupText>
                     <CFormControl
                       placeholder="Old Password"
@@ -71,7 +71,7 @@ const ChangePsw = () => {
                   </CInputGroup>
                   <CInputGroup className="mb-3">
                     <CInputGroupText>
-                      <CIcon icon="cil-lock-locked" name="cil-education" />
+                      <CIcon icon="cil-lock-locked" />
                     </CInputGroupText>
                     <CFormControl
                       placeholder="New Password"

diff --git a/client/src/views/in/columnSummary/ColumnSummary.js b/client/src/views/in/columnSummary/ColumnSummary.js
@@ -225,11 +225,7 @@ const ColumnSummary = () => {
                       Delete
                     </CButton>
                     <Link to={`/auth/edit_column/${art.id}`}>
-                      <CIcon
-                        icon="cil-pencil"
-                        name="cil-pencil"
-                        style={{ scale: '1.7', marginLeft: '1rem' }}
-                      ></CIcon>
+                      <CIcon icon="cil-pencil" style={{ scale: '1.7', marginLeft: '1rem' }}></CIcon>
                     </Link>
                   </div>
                 )}
@@ -262,7 +258,7 @@ const ColumnSummary = () => {
               }}
               color="light"
             >
-              <CIcon icon="cil-home" name="cil-home" />
+              <CIcon icon="cil-home" />
             </CButton>
             <CFormControl
               type="search"
@@ -271,7 +267,7 @@ const ColumnSummary = () => {
               value={keywords ? keywords : ''}
             ></CFormControl>
             <CButton color="light" type="submit">
-              <CIcon icon="cil-search" name="cil-search" />
+              <CIcon icon="cil-search" />
             </CButton>
           </CInputGroup>
         </form>