From 4c24ab7da9ada79a5b35af44f16f1ae6425dfc83 Mon Sep 17 00:00:00 2001
From: Johnson Mao <86179381+JohnsonMao@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:27:16 +0800
Subject: [PATCH 1/5] refactor: no-use-before-define
---
pages/_app.jsx | 217 ++++++++++++++++++++++++-------------------------
1 file changed, 108 insertions(+), 109 deletions(-)
diff --git a/pages/_app.jsx b/pages/_app.jsx
index 4213763..cd50c25 100644
--- a/pages/_app.jsx
+++ b/pages/_app.jsx
@@ -34,89 +34,6 @@ const swrConfig = {
errorRetryCount: 0,
};
-const App = ({ Component, pageProps }) => {
- const router = useRouter();
- useEffect(() => {
- initGA('UA-181407006-3');
- // `routeChangeComplete` won't run for the first page load unless the query string is
- // hydrated later on, so here we log a page view if this is the first render and
- // there's no query string
- if (!router.asPath.includes('?')) {
- logPageView();
- }
- }, []);
-
- useEffect(() => {
- // Listen for page changes after a navigation or when the query changes
- router.events.on('routeChangeComplete', logPageView);
- return () => {
- router.events.off('routeChangeComplete', logPageView);
- };
- }, [router.events]);
-
- // const [mode, setMode] = useState("light");
- // Update the theme only if the mode changes
- // const theme = useMemo(() => themeFactory(mode), [mode]);
- return (
- <>
- {/* */}
-
-
- {/* */}
-
- {/* */}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-};
-
const ThemeComponentWrap = ({ pageProps, Component }) => {
const dispatch = useDispatch();
const searchParams = useSearchParams();
@@ -183,30 +100,28 @@ const ThemeComponentWrap = ({ pageProps, Component }) => {
width="300"
height="289"
/>
-
- {
- isComplete ?
-
+ {
+ isComplete ? (
+ <>
+
帳號已驗證成功，快來體驗平台的特色功能！
-
- :
-
+
+
+
+
+
+ ) : (
+ <>
+
我們會公開你的個人檔案，填寫完整的資料，才能讓其他夥伴們更了解你喔！
-
- }
-
-
- {
- isComplete ?
-
- :
- <>
+
+
-
- }
-
+
{tag}
@@ -356,7 +356,7 @@ export default function ConfirmForm({
學習方法與策略
- {marathonState?.strategies?.tags.map((tag, _i) => {
+ {marathonState?.strategies?.tags.map((tag) => {
return (
{tag}
@@ -388,7 +388,7 @@ export default function ConfirmForm({
學習成果及呈現方式
- {marathonState?.outcomes?.tags?.map((tag, _i) => {
+ {marathonState?.outcomes?.tags?.map((tag) => {
return (
{tag}
@@ -471,7 +471,7 @@ export default function ConfirmForm({
夥伴的 Email
{
- marathonState.pricing.email.map((email, _i) => {
+ marathonState.pricing.email.map((email) => {
return (
{
- const names = value.filter((milestone, _i) => {
+ const names = value.filter((milestone) => {
return (milestone.name.trim().length > 0);
});
return names.length === newMarathon.milestones?.length;
@@ -156,10 +156,9 @@ export default function MarathonForm({
}
if (validate(input)) {
- setErrors((prevErrors) => {
- const { [name]: _, ...remainingErrors } = prevErrors;
- return remainingErrors;
- });
+ setErrors((prevErrors) =>
+ Object.fromEntries(Object.entries(prevErrors).filter(([key]) => key !== name))
+ );
} else {
setErrors({
...errors,
diff --git a/components/Marathon/SignUp/MilestoneGroup.jsx b/components/Marathon/SignUp/MilestoneGroup.jsx
index cb16cb0..fdb52d0 100644
--- a/components/Marathon/SignUp/MilestoneGroup.jsx
+++ b/components/Marathon/SignUp/MilestoneGroup.jsx
@@ -3,7 +3,6 @@ import { useState, useEffect } from "react";
import styled from '@emotion/styled';
import {
Box,
- Grid,
TextField,
MenuItem,
Typography,
@@ -48,7 +47,7 @@ export default function MilestoneGroup({
}) {
const eventWeekRange = 22;
const [startDate, setStartDate] = useState('2025-02-09');
- const [endDate, setEndDate] = useState(dayjs(startDate).add('22', 'week'));
+ const [/** endDate */, setEndDate] = useState(dayjs(startDate).add('22', 'week'));
const [frequency, setFrequency] = useState('biweekly');
function arabicToChinese(num) {
@@ -113,26 +112,26 @@ export default function MilestoneGroup({
}
});
};
- const handleStartDate = (eventStartDate) => {
- setStartDate(eventStartDate);
- const eventEndDate = dayjs(eventStartDate).add(eventWeekRange, 'week');
- setEndDate(eventEndDate);
- const changedMilestones = calculateMilestones(eventStartDate, frequency, milestones);
- onChange({
- type: 'UPDATE_FIELD',
- payload: {
- key: 'milestones',
- value: changedMilestones
- }
- });
- };
- const handleEndDate = (fakeDate) => {
+ // const handleStartDate = (eventStartDate) => {
+ // setStartDate(eventStartDate);
+ // const eventEndDate = dayjs(eventStartDate).add(eventWeekRange, 'week');
+ // setEndDate(eventEndDate);
+ // const changedMilestones = calculateMilestones(eventStartDate, frequency, milestones);
+ // onChange({
+ // type: 'UPDATE_FIELD',
+ // payload: {
+ // key: 'milestones',
+ // value: changedMilestones
+ // }
+ // });
+ // };
+ const handleEndDate = (/** fakeDate */) => {
const eventEndDate = dayjs(startDate).add(eventWeekRange, 'week');
setEndDate(eventEndDate);
};
const updateMilestone = (newMilestone) => {
- const changedMilestones = milestones.map((item, _i) => {
+ const changedMilestones = milestones.map((item) => {
return (item._tempId === newMilestone._tempId ? newMilestone : item);
});
// check if milestone name exist
diff --git a/components/Marathon/SignUp/MilestonePanel.jsx b/components/Marathon/SignUp/MilestonePanel.jsx
index b70e2d0..0ea5af9 100644
--- a/components/Marathon/SignUp/MilestonePanel.jsx
+++ b/components/Marathon/SignUp/MilestonePanel.jsx
@@ -1,7 +1,6 @@
import { v4 as uuidv4 } from 'uuid';
import { useState } from 'react';
import styled from "@emotion/styled";
-import dayjs from "dayjs";
import {
Grid,
@@ -122,7 +121,7 @@ export default function MilestonePanel({
};
const handleDeleteSubMilestone = (deletedItem) => {
- const newSubMilestones = (milestone.subMilestones).filter((item, _i) => {
+ const newSubMilestones = (milestone.subMilestones).filter((item) => {
return (item._tempId !== deletedItem._tempId);
});
onChange({
@@ -132,7 +131,7 @@ export default function MilestonePanel({
};
const handleEditSubMilestone = (newItem) => {
- const newSubMilestones = (milestone.subMilestones).map((item, _i) => {
+ const newSubMilestones = (milestone.subMilestones).map((item) => {
return (newItem._tempId === item._tempId) ? newItem : item;
});
onChange({
diff --git a/components/Marathon/SignUp/MultiSelectDropdown.jsx b/components/Marathon/SignUp/MultiSelectDropdown.jsx
index 7ac3695..1e78945 100644
--- a/components/Marathon/SignUp/MultiSelectDropdown.jsx
+++ b/components/Marathon/SignUp/MultiSelectDropdown.jsx
@@ -69,7 +69,7 @@ export default function MultiSelectDropdown({
}}
>
{
- listItems.map((item, index) => {
+ listItems.map((item) => {
return (
ISOToWeekday(ISODate))
diff --git a/components/Marathon/SignUp/UserProfileForm.jsx b/components/Marathon/SignUp/UserProfileForm.jsx
index 28b01ce..7c26e16 100644
--- a/components/Marathon/SignUp/UserProfileForm.jsx
+++ b/components/Marathon/SignUp/UserProfileForm.jsx
@@ -4,7 +4,6 @@ import dayjs from 'dayjs';
import toast from 'react-hot-toast';
import { useSearchParams } from 'next/navigation';
import useMediaQuery from '@mui/material/useMediaQuery';
-import { useRouter } from 'next/router';
import { useDispatch, useSelector } from 'react-redux';
import {
fetchMarathonProfileByUserEvent
@@ -29,8 +28,6 @@ import {
} from '@mui/material';
import { MobileDatePicker } from '@mui/x-date-pickers/MobileDatePicker';
-import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
-import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import Fields from '@/components/Group/Form/Fields';
import useEditProfile from './useEditProfile';
import ErrorMessage from './ErrorMessage';
@@ -38,8 +35,6 @@ import ErrorMessage from './ErrorMessage';
import TheAvator from './TheAvator';
import FormInput from './EditFormInput';
import {
- FormWrapper,
- ContentWrapper,
StyledGroup,
StyledSelectWrapper,
StyledSelectBox,
@@ -50,7 +45,6 @@ import {
StyledSection,
StyledButtonGroup,
StyledButton,
- MarathonSignUpWrapper,
} from './Edit.styled';
export default function UserProfileForm({
@@ -61,7 +55,6 @@ export default function UserProfileForm({
const reduxDispatch = useDispatch();
const mobileScreen = useMediaQuery('(max-width: 767px)');
const [isSetting, setIsSetting] = useState(false);
- const router = useRouter();
const searchParams = useSearchParams();
const check = searchParams.get('check');
const [hasClickNextStep, setHasClickNextStep] = useState(false);
diff --git a/components/Marathon/SignUp/useEditProfile.jsx b/components/Marathon/SignUp/useEditProfile.jsx
index 4255ab0..aa5c6dd 100644
--- a/components/Marathon/SignUp/useEditProfile.jsx
+++ b/components/Marathon/SignUp/useEditProfile.jsx
@@ -3,7 +3,6 @@ import { useReducer, useRef, useState } from 'react';
import { useDispatch } from 'react-redux';
import { updateUser, createUser } from '@/redux/actions/user';
import { z } from 'zod';
-import { useAuthDispatch } from '@/contexts/Auth';
const initialState = {
name: '',
@@ -115,7 +114,6 @@ const userReducer = (state, payload) => {
const useEditProfile = () => {
const reduxDispatch = useDispatch();
const [userState, stateDispatch] = useReducer(userReducer, initialState);
- const authDispatch = useAuthDispatch();
const [errors, setErrors] = useState({});
const refs = useRef({});
diff --git a/components/Marathon/Spotlight/index.jsx b/components/Marathon/Spotlight/index.jsx
index b288e4b..18790d4 100644
--- a/components/Marathon/Spotlight/index.jsx
+++ b/components/Marathon/Spotlight/index.jsx
@@ -3,7 +3,6 @@ import {
Box,
Typography
} from "@mui/material";
-import BoomImage from "@/public/assets/booming.png";
const StyledGroup = styled(Box)`
width: 100%;
diff --git a/components/Partner/Banner/index.jsx b/components/Partner/Banner/index.jsx
index 48b32fe..32b1f74 100644
--- a/components/Partner/Banner/index.jsx
+++ b/components/Partner/Banner/index.jsx
@@ -1,4 +1,3 @@
-import { useSelector } from 'react-redux';
import styled from '@emotion/styled';
import { useRouter } from 'next/router';
import { Box } from '@mui/material';
diff --git a/components/Partner/PartnerList/PartnerCard/PartnerSkelton.jsx b/components/Partner/PartnerList/PartnerCard/PartnerSkelton.jsx
index 404e050..14b0a93 100644
--- a/components/Partner/PartnerList/PartnerCard/PartnerSkelton.jsx
+++ b/components/Partner/PartnerList/PartnerCard/PartnerSkelton.jsx
@@ -21,7 +21,7 @@ const PartnerSkelton = () => {
- {new Array(3).fill(0).map((_, idx) => (
+ {new Array(3).fill(0).map(() => (
{
const [getSearchParams, pushState] = useSearchParamsManager();
- const [_, setTag] = useState();
+ const [, setTag] = useState();
const currentTags = getSearchParams('tag').toString();
const handleChange = (val) => {
diff --git a/components/Partner/index.jsx b/components/Partner/index.jsx
index 17e0206..7e683c7 100644
--- a/components/Partner/index.jsx
+++ b/components/Partner/index.jsx
@@ -66,7 +66,7 @@ function Partner() {
const { page: current = 1, totalPages } = pagination;
// queryStr
- const [getSearchParams, _, generateParamsItems] = useSearchParamsManager();
+ const [getSearchParams, , generateParamsItems] = useSearchParamsManager();
const searchParamsItems = useMemo(
() =>
generateParamsItems(['area', 'role', 'edu', 'tag', 'q'], keySelections),
diff --git a/components/Profile/Accountsetting/index.jsx b/components/Profile/Accountsetting/index.jsx
index a3a8f42..fbb998f 100644
--- a/components/Profile/Accountsetting/index.jsx
+++ b/components/Profile/Accountsetting/index.jsx
@@ -9,7 +9,6 @@ import {
} from '@mui/material';
import { useRouter } from 'next/router';
import styled from '@emotion/styled';
-import { useDispatch } from 'react-redux';
import { useAuth, useAuthDispatch } from '@/contexts/Auth';
const StyledTypographyStyle = styled(Typography)`
diff --git a/components/Profile/MyMarathon/LoadingCard.jsx b/components/Profile/MyMarathon/LoadingCard.jsx
index fc0e223..5c32006 100644
--- a/components/Profile/MyMarathon/LoadingCard.jsx
+++ b/components/Profile/MyMarathon/LoadingCard.jsx
@@ -1,6 +1,5 @@
import Skeleton from '@mui/material/Skeleton';
import IconButton from '@mui/material/IconButton';
-import LocationOnOutlinedIcon from '@mui/icons-material/LocationOnOutlined';
import MoreVertOutlinedIcon from '@mui/icons-material/MoreVertOutlined';
import {
StyledContainer,
diff --git a/components/Profile/MyMarathon/index.jsx b/components/Profile/MyMarathon/index.jsx
index 4121055..ece54b9 100644
--- a/components/Profile/MyMarathon/index.jsx
+++ b/components/Profile/MyMarathon/index.jsx
@@ -50,7 +50,7 @@ const MyMarathon = ({ title, sx }) => {
)}
{marathons.length > 0 && (
- marathons.map((marathon, _i) => {
+ marathons.map((marathon) => {
return (
css`
-// background-color: ${COLOR_TABLE[color ?? "default"]};
-// `}
-// `;
-
const Tags = ({ tags, type }) => {
- const { query, push } = useRouter();
- const linkTagsHandler = useCallback(
- (newQuery) => {
- // 複製一份，避免影響到使用體驗
- const clonedQuery = { ...query };
- delete clonedQuery.title;
- if (clonedQuery[type]) {
- push({
- pathname: '/search',
- query: {
- ...clonedQuery,
- [type]: [clonedQuery[type].split(','), newQuery].join(','),
- },
- });
- } else {
- push({
- pathname: '/search',
- query: {
- ...clonedQuery,
- [type]: newQuery,
- },
- });
- }
- },
- [push, query, type],
- );
+ const { query } = useRouter();
const linkList = useMemo(() => {
return tags.map((newQuery) => {
@@ -82,10 +45,8 @@ const Tags = ({ tags, type }) => {
{tags.map(({ name, color }, index) => (
- {/* */}
linkTagsHandler(name)}
sx={{
backgroundColor: COLOR_TABLE[color ?? 'default'],
cursor: 'pointer',
@@ -99,7 +60,6 @@ const Tags = ({ tags, type }) => {
},
}}
/>
- {/* */}
))}
diff --git a/components/Resource/index.jsx b/components/Resource/index.jsx
index c07447b..0f29b08 100644
--- a/components/Resource/index.jsx
+++ b/components/Resource/index.jsx
@@ -1,15 +1,10 @@
import React, { useEffect, useMemo, useState } from 'react';
import styled from '@emotion/styled';
import { useRouter } from 'next/router';
-import { Button, Paper, Box, Stack, Typography } from '@mui/material';
+import { Box, Typography } from '@mui/material';
import { css } from '@emotion/react';
-import { DiscussionEmbed, Recommendations, CommentEmbed } from 'disqus-react';
-import { Share } from '@mui/icons-material';
-import { CopyToClipboard } from 'react-copy-to-clipboard';
-import toast from 'react-hot-toast';
-import appendQuery from 'append-query';
+import { DiscussionEmbed } from 'disqus-react';
import Shares from './Shares';
-import { postFetcher } from '../../utils/fetcher';
import Tags from './Tags';
import RelatedResources from '../../shared/components/RelatedResources';
import Desc from './Desc';
diff --git a/components/Search/SearchField/AgeCheckbox/index.jsx b/components/Search/SearchField/AgeCheckbox/index.jsx
index 20fc06d..57ed841 100644
--- a/components/Search/SearchField/AgeCheckbox/index.jsx
+++ b/components/Search/SearchField/AgeCheckbox/index.jsx
@@ -1,30 +1,11 @@
/* eslint-disable react/jsx-wrap-multilines */
-import React, { useState } from 'react';
-import styled from '@emotion/styled';
-import { Box, Select, MenuItem } from '@mui/material';
import { useRouter } from 'next/router';
-// import { SEARCH_TAGS } from "../../../constants/category";
-import OutlinedInput from '@mui/material/OutlinedInput';
-import InputLabel from '@mui/material/InputLabel';
import FormControl from '@mui/material/FormControl';
-import Chip from '@mui/material/Chip';
import FormLabel from '@mui/material/FormLabel';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
-import FormHelperText from '@mui/material/FormHelperText';
import Checkbox from '@mui/material/Checkbox';
-const ITEM_HEIGHT = 48;
-const ITEM_PADDING_TOP = 8;
-const MenuProps = {
- PaperProps: {
- style: {
- maxHeight: ITEM_HEIGHT * 4.5 + ITEM_PADDING_TOP,
- width: 250,
- },
- },
-};
-
const names = ['學齡前', '國小', '國高中', '大學以上'];
const AgeDropdown = () => {
diff --git a/components/Search/SearchField/AgeDropdown/index.jsx b/components/Search/SearchField/AgeDropdown/index.jsx
index 93531bb..844522b 100644
--- a/components/Search/SearchField/AgeDropdown/index.jsx
+++ b/components/Search/SearchField/AgeDropdown/index.jsx
@@ -1,8 +1,5 @@
-import React, { useState } from 'react';
-import styled from '@emotion/styled';
import { Box, Select, MenuItem } from '@mui/material';
import { useRouter } from 'next/router';
-// import { SEARCH_TAGS } from "../../../constants/category";
import OutlinedInput from '@mui/material/OutlinedInput';
import InputLabel from '@mui/material/InputLabel';
import FormControl from '@mui/material/FormControl';
diff --git a/components/Search/SearchField/FeeDropdown/index.jsx b/components/Search/SearchField/FeeDropdown/index.jsx
index 19452fa..8df91cb 100644
--- a/components/Search/SearchField/FeeDropdown/index.jsx
+++ b/components/Search/SearchField/FeeDropdown/index.jsx
@@ -1,28 +1,10 @@
-import React, { useState } from 'react';
-import styled from '@emotion/styled';
-import { Box, Select, MenuItem } from '@mui/material';
import { useRouter } from 'next/router';
-// import { SEARCH_TAGS } from "../../../constants/category";
-import OutlinedInput from '@mui/material/OutlinedInput';
-import InputLabel from '@mui/material/InputLabel';
import FormControl from '@mui/material/FormControl';
-import Chip from '@mui/material/Chip';
import Radio from '@mui/material/Radio';
import RadioGroup from '@mui/material/RadioGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import FormLabel from '@mui/material/FormLabel';
-const ITEM_HEIGHT = 48;
-const ITEM_PADDING_TOP = 8;
-const MenuProps = {
- PaperProps: {
- style: {
- maxHeight: ITEM_HEIGHT * 4.5 + ITEM_PADDING_TOP,
- width: 250,
- },
- },
-};
-
const names = ['不拘', '免費', '部分免費', '需付費'];
const FeeDropdown = () => {
diff --git a/components/Search/SearchField/index.jsx b/components/Search/SearchField/index.jsx
index 19ea34c..ce53cec 100644
--- a/components/Search/SearchField/index.jsx
+++ b/components/Search/SearchField/index.jsx
@@ -1,44 +1,15 @@
-import React, { useState } from 'react';
import styled from '@emotion/styled';
-import { Box, Select, MenuItem } from '@mui/material';
+import { Box } from '@mui/material';
import { useRouter } from 'next/router';
-import { Whatshot } from '@mui/icons-material';
-import OutlinedInput from '@mui/material/OutlinedInput';
-import InputLabel from '@mui/material/InputLabel';
-import FormControl from '@mui/material/FormControl';
-import Chip from '@mui/material/Chip';
-import { SEARCH_TAGS } from '../../../constants/category';
import SearchInput from './SearchInput';
import HotTags from './HotTags';
-import AgeDropdown from './AgeDropdown';
import FeeDropdown from './FeeDropdown';
import AgeCheckbox from './AgeCheckbox';
const SearchFieldWrapper = styled.div`
width: 100%;
-
- /* @media (max-width: 767px) {
- margin: 0 10px 10px 10px;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- width: 100%;
- } */
`;
-const ITEM_HEIGHT = 48;
-const ITEM_PADDING_TOP = 8;
-const MenuProps = {
- PaperProps: {
- style: {
- maxHeight: ITEM_HEIGHT * 4.5 + ITEM_PADDING_TOP,
- width: 250,
- },
- },
-};
-
-const names = ['學齡前', '國小', '國高中', '大學以上'];
-
const SearchField = () => {
const { query } = useRouter();
const queryList = (query?.cats ?? '').split(',').reverse();
diff --git a/components/Search/SearchGalleryList/ImageItem/index.jsx b/components/Search/SearchGalleryList/ImageItem/index.jsx
index 179f82e..81bac5d 100644
--- a/components/Search/SearchGalleryList/ImageItem/index.jsx
+++ b/components/Search/SearchGalleryList/ImageItem/index.jsx
@@ -1,122 +1,15 @@
-/* eslint-disable react/jsx-wrap-multilines */
import React, { useMemo } from 'react';
-import styled from '@emotion/styled';
-import { css, keyframes } from '@emotion/react';
import {
- Typography,
- Box,
- ImageList,
ImageListItem,
ImageListItemBar,
IconButton,
} from '@mui/material';
import dayjs from 'dayjs';
import isBetween from 'dayjs/plugin/isBetween';
-// import { TikTokFont } from '../../../../shared/styles/css';
-dayjs.extend(isBetween);
-
-function srcset(image, width, height, rows = 1, cols = 1) {
- return {
- src: `${image}?w=${width * cols}&h=${height * rows}&fit=crop&auto=format`,
- srcSet: `${image}?w=${width * cols}&h=${
- height * rows
- }&fit=crop&auto=format&dpr=2 2x`,
- };
-}
-
-const ItemWrapper = styled.li`
- display: flex;
- padding-top: 20px;
- padding-bottom: 20px;
- border-bottom: 1px solid rgba(168, 168, 168, 0.3);
-`;
-
-const ContentWrapper = styled.article`
- width: calc(100% - 200px);
- padding: 0 10px;
- margin-left: 20px;
- @media (max-width: 767px) {
- width: calc(100% - 100px);
- }
-`;
-
-const ImageWrapper = styled.div`
- width: 200px;
- height: 200px;
- background-color: #f5f5f5;
- ${({ image }) => css`
- background-image: ${`url(${image})`};
- background-size: cover;
- background-repeat: no-repeat;
- background-position: 50% 50%;
- `}
- border-radius: 20px;
- /* object-fit: cover; */
- /* opacity: 0; */
-
- @media (max-width: 767px) {
- width: 100px;
- height: 100px;
- }
-`;
-
-const TitleWrapper = styled.div`
- display: flex;
- flex-wrap: wrap;
- justify-content: flex-start;
- align-items: center;
- .title {
- font-size: 24px;
- font-weight: 500;
- margin: 0 10px 0 0;
- color: black;
- &:hover {
- cursor: pointer;
- color: #16b9b3;
- transition: 0.5s;
- }
- }
-
- @media (max-width: 767px) {
- .title {
- text-overflow: ellipsis;
- width: 100%;
- }
- }
-`;
-
-const Item = ({ data, margin }) => {
- const hashTags = useMemo(
- () => data?.properties['標籤']?.multi_select ?? [],
- [data],
- );
- const resourcesTags = useMemo(
- () => data?.properties['資源類型']?.multi_select ?? [],
- [data],
- );
- const feeTags = useMemo(
- () =>
- data?.properties['費用']?.select
- ? [data?.properties['費用']?.select]
- : [],
- [data],
- );
- const isNewResource = useMemo(() => {
- const today = dayjs();
- const createDay = dayjs(data?.created_time);
- const isRecent = dayjs(createDay).isBetween(
- today,
- dayjs(today).subtract(1, 'month'),
- );
- return isRecent;
- }, [data]);
-
- const ageOfUserTags = useMemo(
- () => data?.properties['年齡層']?.multi_select ?? [],
- [data],
- );
+dayjs.extend(isBetween);
+const Item = ({ data }) => {
const title = useMemo(
() =>
(data?.properties['資源名稱']?.title ?? []).find(
@@ -125,26 +18,9 @@ const Item = ({ data, margin }) => {
[data?.properties],
);
- const contributors = useMemo(
- () => data?.properties['創建者']?.multi_select ?? [],
- [data?.properties],
- );
-
- // const link = useMemo(() => data?.properties["連結"]?.url ?? "", [data]);
- const link = useMemo(() => `/resource/${title}`, [title]);
-
return (
{
title={title}
position="top"
actionIcon={
-
- {/* */}
-
+
}
actionPosition="left"
/>
diff --git a/components/Search/SearchGalleryList/Item/Contributors/index.jsx b/components/Search/SearchGalleryList/Item/Contributors/index.jsx
index cacbefb..3b14cd6 100644
--- a/components/Search/SearchGalleryList/Item/Contributors/index.jsx
+++ b/components/Search/SearchGalleryList/Item/Contributors/index.jsx
@@ -1,10 +1,5 @@
-import React, { useMemo } from 'react';
-import styled from '@emotion/styled';
-import { css } from '@emotion/react';
import Link from 'next/link';
import { Typography, Box } from '@mui/material';
-import dayjs from 'dayjs';
-import isBetween from 'dayjs/plugin/isBetween';
const Contributors = ({ contributors }) => {
return (
diff --git a/components/Search/SearchGalleryList/Item/LogoImage/index.jsx b/components/Search/SearchGalleryList/Item/LogoImage/index.jsx
index a23a6d5..02cba3d 100644
--- a/components/Search/SearchGalleryList/Item/LogoImage/index.jsx
+++ b/components/Search/SearchGalleryList/Item/LogoImage/index.jsx
@@ -1,8 +1,6 @@
-import React, { useMemo } from 'react';
import styled from '@emotion/styled';
import { css } from '@emotion/react';
-import Link from 'next/link';
-import { Typography, Box } from '@mui/material';
+import { Box } from '@mui/material';
import dayjs from 'dayjs';
import isBetween from 'dayjs/plugin/isBetween';
diff --git a/components/Search/SearchGalleryList/Item/index.jsx b/components/Search/SearchGalleryList/Item/index.jsx
index 314ba8c..de66c47 100644
--- a/components/Search/SearchGalleryList/Item/index.jsx
+++ b/components/Search/SearchGalleryList/Item/index.jsx
@@ -1,14 +1,11 @@
import React, { useMemo } from 'react';
import styled from '@emotion/styled';
-import { css, keyframes } from '@emotion/react';
-import Link from 'next/link';
-import { Typography, Box } from '@mui/material';
import dayjs from 'dayjs';
import isBetween from 'dayjs/plugin/isBetween';
import Tags from './Tags';
import LogoImage from './LogoImage';
import Contributors from './Contributors';
-// import { TikTokFont } from '../../../../shared/styles/css';
+
dayjs.extend(isBetween);
const ItemWrapper = styled.li`
@@ -27,25 +24,6 @@ const ContentWrapper = styled.article`
}
`;
-const ImageWrapper = styled.div`
- width: 200px;
- height: 200px;
- background-color: #f5f5f5;
- ${({ image }) => css`
- background-image: ${`url(${image})`};
- background-size: cover;
- background-repeat: no-repeat;
- background-position: 50% 50%;
- `}
- border-radius: 20px;
- /* object-fit: cover; */
- /* opacity: 0; */
-
- @media (max-width: 767px) {
- width: 100px;
- height: 100px;
- }
-`;
const TitleWrapper = styled.div`
display: flex;
flex-wrap: wrap;
diff --git a/components/Search/SearchGalleryList/SponsorItem/Contributors/index.jsx b/components/Search/SearchGalleryList/SponsorItem/Contributors/index.jsx
index cacbefb..3b14cd6 100644
--- a/components/Search/SearchGalleryList/SponsorItem/Contributors/index.jsx
+++ b/components/Search/SearchGalleryList/SponsorItem/Contributors/index.jsx
@@ -1,10 +1,5 @@
-import React, { useMemo } from 'react';
-import styled from '@emotion/styled';
-import { css } from '@emotion/react';
import Link from 'next/link';
import { Typography, Box } from '@mui/material';
-import dayjs from 'dayjs';
-import isBetween from 'dayjs/plugin/isBetween';
const Contributors = ({ contributors }) => {
return (
diff --git a/components/Search/SearchGalleryList/SponsorItem/LogoImage/index.jsx b/components/Search/SearchGalleryList/SponsorItem/LogoImage/index.jsx
index afec2e0..92c1550 100644
--- a/components/Search/SearchGalleryList/SponsorItem/LogoImage/index.jsx
+++ b/components/Search/SearchGalleryList/SponsorItem/LogoImage/index.jsx
@@ -1,11 +1,8 @@
-import React, { useMemo } from 'react';
import styled from '@emotion/styled';
import { css } from '@emotion/react';
-import Link from 'next/link';
-import { Typography, Box } from '@mui/material';
+import { Box } from '@mui/material';
import dayjs from 'dayjs';
import isBetween from 'dayjs/plugin/isBetween';
-import { COLOR_TABLE } from '../../../../../constants/notion';
dayjs.extend(isBetween);
@@ -93,6 +90,7 @@ const PromoteWrapper = styled.div`
color: #ffffffff;
font-weight: bold;
transform: rotate(45deg);
+ }
`;
const LogoImage = ({ link, data }) => {
diff --git a/components/Search/SearchGalleryList/SponsorItem/index.jsx b/components/Search/SearchGalleryList/SponsorItem/index.jsx
index 2b46102..4f7433c 100644
--- a/components/Search/SearchGalleryList/SponsorItem/index.jsx
+++ b/components/Search/SearchGalleryList/SponsorItem/index.jsx
@@ -1,7 +1,5 @@
import React, { useMemo } from 'react';
import styled from '@emotion/styled';
-import { css } from '@emotion/react';
-import Link from 'next/link';
import { Typography, Box } from '@mui/material';
import dayjs from 'dayjs';
import isBetween from 'dayjs/plugin/isBetween';
@@ -9,7 +7,6 @@ import { Whatshot } from '@mui/icons-material';
import Tags from './Tags';
import LogoImage from './LogoImage';
import Contributors from './Contributors';
-import { COLOR_TABLE } from '../../../../constants/notion';
dayjs.extend(isBetween);
diff --git a/components/Search/SearchGalleryList/index.jsx b/components/Search/SearchGalleryList/index.jsx
index c24783b..96771b5 100644
--- a/components/Search/SearchGalleryList/index.jsx
+++ b/components/Search/SearchGalleryList/index.jsx
@@ -1,83 +1,20 @@
import React from 'react';
-import styled from '@emotion/styled';
import {
ImageList,
- ImageListItem,
- ImageListItemBar,
- IconButton,
} from '@mui/material';
-import StarBorderIcon from '@mui/icons-material/StarBorder';
-import Item from './Item';
-import SponsorItem from './SponsorItem';
-import SkeletonItem from './SkeletonItem';
import ImageItem from './ImageItem';
-const ListWrapper = styled.ul`
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-`;
-
const SearchGalleryList = ({
list,
- sponsorList,
- queryTags,
- isLoading,
- isLoadingNextData,
}) => {
- // if (isLoading && list.length === 0) {
- // return (
- //
- //
- //
- //
- //
- //
- //
- // );
- // }
- // return (
- //
- // {/* {sponsorList.map((item) => (
- //
- // ))} */}
- // {list.map((item, index) =>
- // isLoading ? (
- //
- // ) : (
- // {title}
*/}
{list.map(({ name, link, target }) => (
-
diff --git a/shared/components/MarkdownEditor/MarkdownEditor.jsx b/shared/components/MarkdownEditor/MarkdownEditor.jsx
index e47b1b4..b60ba54 100644
--- a/shared/components/MarkdownEditor/MarkdownEditor.jsx
+++ b/shared/components/MarkdownEditor/MarkdownEditor.jsx
@@ -85,7 +85,7 @@ function InternalMarkdownEditor(
}
return true;
})
- .map(([_, plugin]) => plugin),
+ .map(([, plugin]) => plugin),
[markdown.current]
);
diff --git a/shared/components/Mode/index.jsx b/shared/components/Mode/index.jsx
index 4edb0ed..ac25735 100644
--- a/shared/components/Mode/index.jsx
+++ b/shared/components/Mode/index.jsx
@@ -1,7 +1,4 @@
import { DarkMode, LightMode } from '@mui/icons-material';
-import React, { useCallback } from 'react';
-import { useRouter } from 'next/router';
-import styled from '@emotion/styled';
import { Box } from '@mui/material';
import { useDispatch, useSelector } from 'react-redux';
import { changeMode } from '../../../redux/actions/theme';
diff --git a/shared/components/Navigation_v2/MainNav/Hamberger/MarathonList/index.jsx b/shared/components/Navigation_v2/MainNav/Hamberger/MarathonList/index.jsx
index 5b6775d..46a680d 100644
--- a/shared/components/Navigation_v2/MainNav/Hamberger/MarathonList/index.jsx
+++ b/shared/components/Navigation_v2/MainNav/Hamberger/MarathonList/index.jsx
@@ -3,7 +3,6 @@ import { keyframes, css } from '@emotion/react';
import styled from '@emotion/styled';
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
-import useMediaQuery from '@mui/material/useMediaQuery';
import { Box, MenuItem } from '@mui/material';
import { useRouter } from 'next/router';
diff --git a/shared/components/Navigation_v2/MainNav/Hamberger/MenuItem.jsx b/shared/components/Navigation_v2/MainNav/Hamberger/MenuItem.jsx
index 6d15812..1342768 100644
--- a/shared/components/Navigation_v2/MainNav/Hamberger/MenuItem.jsx
+++ b/shared/components/Navigation_v2/MainNav/Hamberger/MenuItem.jsx
@@ -20,15 +20,6 @@ const slideInFrames = keyframes`
}
`;
-const shrinkFrames = keyframes`
- 0% {
- width: 95%;
- }
- 100% {
- width: 90%;
- }
-`;
-
const MenuItemWrapper = styled.li`
animation: 1s ${appearFrames} forwards;
${(props) => css`
diff --git a/shared/components/Navigation_v2/MainNav/List/index.jsx b/shared/components/Navigation_v2/MainNav/List/index.jsx
index a31066f..1b4a67c 100644
--- a/shared/components/Navigation_v2/MainNav/List/index.jsx
+++ b/shared/components/Navigation_v2/MainNav/List/index.jsx
@@ -1,16 +1,9 @@
import React from 'react';
import styled from '@emotion/styled';
import Link from 'next/link';
-import { css, keyframes } from '@emotion/css';
import { Box } from '@mui/material';
import { NAV_LINK } from '../../../../../constants/category';
-const textclip = keyframes`
- to {
- background-position: 200% center;
- }
-`;
-
const LinkListWrapper = styled.ul`
display: flex;
justify-content: space-around;
diff --git a/shared/components/Navigation_v2/MainNav/SubList/MarathonList/index.jsx b/shared/components/Navigation_v2/MainNav/SubList/MarathonList/index.jsx
index a43c2c9..ebebf5f 100644
--- a/shared/components/Navigation_v2/MainNav/SubList/MarathonList/index.jsx
+++ b/shared/components/Navigation_v2/MainNav/SubList/MarathonList/index.jsx
@@ -33,7 +33,7 @@ const StyledMenuItem = styled(MenuItem)`
`}
`;
-const MarathonList = ({ onCloseMenu = () => {}, user }) => {
+const MarathonList = ({ onCloseMenu = () => {} }) => {
const isPadScreen = useMediaQuery('(max-width: 767px)');
const [isOpenMenu, setIsOpenMenu] = useState(null);
const router = useRouter();
diff --git a/shared/components/Navigation_v2/MainNav/SubList/index.jsx b/shared/components/Navigation_v2/MainNav/SubList/index.jsx
index e71e876..10ba14d 100644
--- a/shared/components/Navigation_v2/MainNav/SubList/index.jsx
+++ b/shared/components/Navigation_v2/MainNav/SubList/index.jsx
@@ -1,6 +1,5 @@
import React from 'react';
import styled from '@emotion/styled';
-import Link from 'next/link';
import { Button } from '@mui/material';
import { useAuth, useAuthDispatch } from '@/contexts/Auth';
import UserAvatar from './UserAvatar';
diff --git a/shared/components/Navigation_v2/PromotionBar.jsx b/shared/components/Navigation_v2/PromotionBar.jsx
index 8e5a7aa..1cbc923 100644
--- a/shared/components/Navigation_v2/PromotionBar.jsx
+++ b/shared/components/Navigation_v2/PromotionBar.jsx
@@ -1,4 +1,3 @@
-import { useState, useEffect } from 'react';
import styled from '@emotion/styled';
import Link from 'next/link';
@@ -75,7 +74,7 @@ const CloseButton = styled.span`
}
`;
-const PromotionBar = ({ isShow, link, text, toggleAction }) => {
+const PromotionBar = ({ isShow, text, toggleAction }) => {
return (
<>
{isShow && (
diff --git a/shared/components/Navigation_v2/index.jsx b/shared/components/Navigation_v2/index.jsx
index 4bffd4a..519389a 100644
--- a/shared/components/Navigation_v2/index.jsx
+++ b/shared/components/Navigation_v2/index.jsx
@@ -20,26 +20,15 @@ export const NavigationWrapper = styled(AppBar)(({ hasPromote }) => ({
},
}));
-const donateTexts = [
- '✨島島阿學需要你的支持，讓人人都享有同等資源✨',
- '✨推廣民主教育，島島阿學需要你的支持✨',
- '✨用捐款與島島阿學一同推動民主教育✨',
-];
-
-const buildRandomText = () => {
- const randomIndex = Math.floor(Math.random() * donateTexts.length);
- return donateTexts[randomIndex];
-};
-
const texts = [
'✨「島島盃 - 2025 春季學習馬拉松」開跑啦！1/19 截止申請！✨',
'✨參加學習馬拉松，一起為自己重新打造喜歡的學習生活吧！✨',
'✨申請學習馬拉松，即可試用最新個人化功能輔助學習唷！✨',
+ // '✨島島阿學需要你的支持，讓人人都享有同等資源✨',
+ // '✨推廣民主教育，島島阿學需要你的支持✨',
+ // '✨用捐款與島島阿學一同推動民主教育✨',
];
-// const ToolbarWrapper = styled(Toolbar)`
-// margin: 0 auto;
-// `;
// 問卷 https://docs.google.com/forms/d/e/1FAIpQLSeyU9-Q-kIWp5uutcik3h-RO4o5VuG6oG0m-4u1Ua18EOu3aw/viewform
const Navigation = () => {
const [showPromotetionBar, setShowPromotionBar] = useState(true);
@@ -68,9 +57,7 @@ const Navigation = () => {
text={texts[currentIndex]}
toggleAction={setShowPromotionBar}
/>
- {/* */}
- {/* */}
);
diff --git a/shared/components/RelatedResources/Card/index.jsx b/shared/components/RelatedResources/Card/index.jsx
index 4e2988c..2c8ebeb 100644
--- a/shared/components/RelatedResources/Card/index.jsx
+++ b/shared/components/RelatedResources/Card/index.jsx
@@ -1,4 +1,3 @@
-import React, { useEffect, useMemo, useState } from 'react';
import styled from '@emotion/styled';
import { css } from '@emotion/react';
import { Tooltip } from '@mui/material';
diff --git a/shared/components/RelatedResources/index.jsx b/shared/components/RelatedResources/index.jsx
index 338cc6b..68b5f61 100644
--- a/shared/components/RelatedResources/index.jsx
+++ b/shared/components/RelatedResources/index.jsx
@@ -1,8 +1,7 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect } from 'react';
import styled from '@emotion/styled';
-import { css } from '@emotion/react';
import { useRouter } from 'next/router';
-import { Button, Paper, Box, Stack, Typography, Skeleton } from '@mui/material';
+import { Skeleton } from '@mui/material';
import { useDispatch, useSelector } from 'react-redux';
import Marquee from 'react-fast-marquee';
import { loadRelatedResources } from '../../../redux/actions/resource';
diff --git a/shared/components/ScrollToTop/index.jsx b/shared/components/ScrollToTop/index.jsx
index 39dce2c..882b654 100644
--- a/shared/components/ScrollToTop/index.jsx
+++ b/shared/components/ScrollToTop/index.jsx
@@ -1,10 +1,9 @@
import React, { useMemo } from 'react';
import styled from '@emotion/styled';
import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward';
-import { Button, Fab } from '@mui/material';
+import { Fab } from '@mui/material';
import useScrollPosition from '@react-hook/window-scroll';
import { scrollToTop } from '../../../utils/ux';
-// import { Navigation } from "@mui/icons-material";
const ScrollToTopWrapper = styled.div`
position: fixed;
diff --git a/shared/components/Speech/index.jsx b/shared/components/Speech/index.jsx
index bb385db..12dc0b0 100644
--- a/shared/components/Speech/index.jsx
+++ b/shared/components/Speech/index.jsx
@@ -9,32 +9,11 @@ import {
Button,
CircularProgress,
IconButton,
- Typography,
Box,
} from '@mui/material';
-import { Clear as ClearIcon, Mic as MicIcon } from '@mui/icons-material';
+import { Clear as ClearIcon } from '@mui/icons-material';
import styled from '@emotion/styled';
-// import { CentralBlock, HorizontalBlock } from "./general";
import useUnchanger from '../../../hooks/useUnchanger';
-// import { speech as i18n } from "../i18n";
-// en - US;
-// eslint-disable-next-line react/display-name
-// const HorizontalBlock = forwardRef(({ children = <>, minWidth = 0, style = {}, Tag = "div", width = "auto", ...otherProps }, ref) => {
-// return (
-//
-// {children}
-//
-// );
-// });
const pulse = keyframes`
0% {
diff --git a/shared/components/SurveyModal/index.jsx b/shared/components/SurveyModal/index.jsx
index 833e4e5..52c9081 100644
--- a/shared/components/SurveyModal/index.jsx
+++ b/shared/components/SurveyModal/index.jsx
@@ -1,7 +1,4 @@
import React, { useState } from 'react';
-import styled from '@emotion/styled';
-// import { css } from "@emotion/react";
-import { Box, Paper, Typography, Stack, Avatar } from '@mui/material';
import TextField from '@mui/material/TextField';
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
diff --git a/shared/components/WarmModal/index.jsx b/shared/components/WarmModal/index.jsx
index 9c2fc8a..3b88f8f 100644
--- a/shared/components/WarmModal/index.jsx
+++ b/shared/components/WarmModal/index.jsx
@@ -1,7 +1,5 @@
import React, { useState } from 'react';
-import styled from '@emotion/styled';
-// import { css } from "@emotion/react";
-import { Box, Paper, Typography, Stack, Avatar } from '@mui/material';
+import { Typography } from '@mui/material';
import TextField from '@mui/material/TextField';
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';