Merge pull request #132 from daodaoedu/dev

Merge to prod
daodaoedu · Nov 17, 2024 · 9a97e3b · 9a97e3b
2 parents 7dc19c1 + d371de0
commit 9a97e3b
Show file tree

Hide file tree

Showing 22 changed files with 739 additions and 292 deletions.
diff --git a/components/About/Cooperate/index.jsx b/components/About/Cooperate/index.jsx
@@ -22,118 +22,73 @@ const Cooperate = () => {
       >
         合作夥伴
       </Typography>
-      <Box
-        sx={{
-          margin: '20px',
-          display: 'flex',
-          justifyContent: 'flex-start',
-          alignItems: 'center',
-          flexWrap: 'wrap',
-        }}
-      >
-        <Box
-          sx={{
-            backgroundColor: 'black',
-            padding: '5px',
-            width: '210px',
-            borderRadius: '5px',
-            margin: '10px',
-          }}
-        >
+      <div className="flex flex-wrap items-center gap-4">
+        <div className="bg-black">
           <a
             href="https://grants.g0v.tw/power/?from=daoedu.tw"
             target="_blank"
             rel="noreferrer"
           >
             <img
               src="https://grants.g0v.tw/power/images/g0v-logo.svg"
-              width={200}
-              height={32}
+              className="h-8 w-52"
               alt="g0v零時政府"
             />
           </a>
-        </Box>
-        <Box
-          sx={{
-            padding: '5px',
-            height: '120px',
-            borderRadius: '5px',
-            margin: '10px',
-          }}
-        >
+        </div>
+        <div>
           <a
             href="https://sch001.g0v.tw/?from=daoedu.tw"
             target="_blank"
             rel="noreferrer"
           >
             <img
               src="https://sch001.g0v.tw/assets/img/main_new.jpg"
-              height={120}
+              className="h-32"
               alt="g0v零時小學校"
             />
           </a>
-        </Box>
-        <Box
-          sx={{
-            padding: '5px',
-            height: '130px',
-            borderRadius: '5px',
-            margin: '10px',
-          }}
-        >
+        </div>
+        <div>
           <a
             href="https://zashare.org/?from=daoedu.tw"
             target="_blank"
             rel="noreferrer"
           >
             <img
               src="https://i.imgur.com/QpMVwqe.png"
-              height={120}
+              className="h-32"
               alt="雜學校"
             />
           </a>
-        </Box>
-        <Box
-          sx={{
-            padding: '5px',
-            height: '130px',
-            borderRadius: '5px',
-            margin: '10px',
-          }}
-        >
+        </div>
+        <div>
           <a
             href="https://www.parenting.com.tw/?from=daoedu.tw"
             target="_blank"
             rel="noreferrer"
           >
             <img
               src="https://www.parenting.com.tw/files/images/fb_share.png"
-              height={120}
+              className="h-32"
               alt="親子天下"
             />
           </a>
-        </Box>
-        <Box
-          sx={{
-            padding: '5px',
-            height: '130px',
-            borderRadius: '5px',
-            margin: '10px',
-          }}
-        >
+        </div>
+        <div>
           <a
             href="https://codingbar.ai/?from=daoedu.tw"
             target="_blank"
             rel="noreferrer"
           >
             <img
               src="https://i.imgur.com/n6GG0vF.png"
-              height={120}
+              className="h-32"
               alt="Coding bar"
             />
           </a>
-        </Box>
-      </Box>
+        </div>
+      </div>
     </SectionWrapper>
   );
 };

diff --git a/components/About/TechStack/index.jsx b/components/About/TechStack/index.jsx
@@ -28,39 +28,39 @@ const Thanks = () => {
         }}
       >
         <LineWrapper variant="p">
-          <p float="left" margin="10px">
+          <p className="flex flex-wrap gap-2">
             <img
               src="https://media.giphy.com/media/I2Gobnade5rqM/giphy.gif"
-              height="80px"
+              className="h-20"
             />
             <img
               src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/React-icon.svg/1200px-React-icon.svg.png"
-              height="80px"
+              className="h-20"
             />
             <img
               src="https://seeklogo.com/images/N/next-js-logo-8FCFF51DD2-seeklogo.com.png"
-              height="100px"
+              className="h-20"
             />
-            <img src="https://mui.com/static/logo.png" height="80px" />
+            <img src="https://mui.com/static/logo.png" className="h-20" />
             {/* <img
               src="https://redux-saga.js.org/img/Redux-Saga-Logo.png"
               height="100px"
             /> */}
             <img
               src="https://raw.githubusercontent.com/emotion-js/emotion/main/emotion.png"
-              height="80px"
+              className="h-20"
             />
             <img
               src="https://www.cloudflare.com/resources/images/slt3lc6tev37/CHOl0sUhrumCxOXfRotGt/9bf83d4ca877bb8f0f917c8d379a84ce/cloudflare-icon-color_3x.png"
-              height="80px"
+              className="h-20"
             />
             <img
               src="https://repository-images.githubusercontent.com/175043545/92352780-93a7-11ea-805a-0e76ca033a94"
-              height="80px"
+              className="h-20"
             />
             <img
               src="https://upload.wikimedia.org/wikipedia/commons/4/45/Notion_app_logo.png"
-              height="80px"
+              className="h-20"
             />
           </p>
         </LineWrapper>

diff --git a/components/Group/Form/Fields/AreaCheckbox.jsx b/components/Group/Form/Fields/AreaCheckbox.jsx
@@ -71,6 +71,7 @@ export default function AreaCheckbox({
           control={physicalAreaControl}
         />
       </Box>
+      {isPhysicalArea && !physicalAreaValue && <span className="ml-28 text-alert">請選擇地點</span>}
       <div>
         <FormControlLabel
           control={<Checkbox onClick={() => handleCheckboxChange('線上')} />}

diff --git a/components/Group/Form/Fields/TextField.jsx b/components/Group/Form/Fields/TextField.jsx
@@ -1,4 +1,5 @@
 import MuiTextField from '@mui/material/TextField';
+import MarkdownEditor from '@/shared/components/MarkdownEditor/MarkdownEditor';
 
 export default function TextField({
   id,
@@ -12,20 +13,29 @@ export default function TextField({
 }) {
   return (
     <>
-      <MuiTextField
-        inputRef={(element) => control.setRef?.(name, element)}
-        fullWidth
-        id={id}
-        name={name}
-        sx={{ '& legend': { display: 'none' } }}
-        size="small"
-        placeholder={placeholder}
-        value={value}
-        multiline={multiline}
-        rows={multiline && 6}
-        helperText={helperText}
-        {...control}
-      />
+      {multiline ? (
+        <MarkdownEditor
+          rootClassName="p-px bg-basic-200 rounded-md focus-within:bg-primary-base"
+          className="bg-white rounded-md"
+          ref={(element) => control.setRef?.(name, element)}
+          value={value}
+          placeholder={placeholder}
+          onChange={(markdown) => control.onChange({ target: { name, value: markdown } })}
+        />
+      ) : (
+        <MuiTextField
+          inputRef={(element) => control.setRef?.(name, element)}
+          fullWidth
+          id={id}
+          name={name}
+          sx={{ '& legend': { display: 'none' } }}
+          size="small"
+          placeholder={placeholder}
+          value={value}
+          helperText={helperText}
+          {...control}
+        />
+      )}
       <span className="error-message">{error}</span>
     </>
   );

diff --git a/components/Group/Form/index.jsx b/components/Group/Form/index.jsx
@@ -99,13 +99,13 @@ export default function GroupForm({
             label="揪團類型"
             name="activityCategory"
             handleValues={(action, value, activityCategory) => {
-              if (action === 'add' && value === 'Other') {
-                return ['Other'];
+              if (action === 'add' && value === '其他') {
+                return ['其他'];
               }
               if (action === 'remove' && !activityCategory.length) {
-                return ['Other'];
+                return ['其他'];
               }
-              return activityCategory.filter((item) => item !== 'Other');
+              return activityCategory.filter((item) => item !== '其他');
             }}
             control={control}
             value={values.activityCategory}