feat: support team sign up in competition

sdutacm · Dec 8, 2024 · f74442d · f74442d
1 parent 50179e9
commit f74442d
Show file tree

Hide file tree

Showing 15 changed files with 346 additions and 55 deletions.
diff --git a/src/common b/src/common
diff --git a/src/components/AchievementToast.tsx b/src/components/AchievementToast.tsx
@@ -17,7 +17,7 @@ class AchievementToast extends React.Component<IAchievementToastProps> {
   componentDidMount() {
     const sound = new Howl({
       src: [`${process.env.PUBLIC_PATH}assets/audio/achievement-toast.mp3`],
-      volume: 0.8,
+      volume: 0.5,
     });
     setTimeout(() => sound.play(), 200);
   }

diff --git a/src/components/GeneralForm.tsx b/src/components/GeneralForm.tsx
@@ -94,7 +94,7 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
             );
           }
           switch (item.component) {
-            case 'input':
+            case 'input': {
               return (
                 <Form.Item key={item.field} label={item.name}>
                   {getFieldDecorator(item.field, {
@@ -109,7 +109,8 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                   )}
                 </Form.Item>
               );
-            case 'textarea':
+            }
+            case 'textarea': {
               return (
                 <Form.Item key={item.field} label={item.name}>
                   {getFieldDecorator(item.field, {
@@ -124,7 +125,8 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                   )}
                 </Form.Item>
               );
-            case 'select':
+            }
+            case 'select': {
               const useCustomMode = item.options.some((i) => !!i.icon);
               return (
                 <Form.Item key={item.field} label={item.name}>
@@ -140,7 +142,14 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                     >
                       {item.options.map((opt) =>
                         useCustomMode ? (
-                          <Select.Option key={`${opt.value}`} value={`${opt.value}`} label={`${opt.name}`}>{opt.icon}{opt.name}</Select.Option>
+                          <Select.Option
+                            key={`${opt.value}`}
+                            value={`${opt.value}`}
+                            label={`${opt.name}`}
+                          >
+                            {opt.icon}
+                            {opt.name}
+                          </Select.Option>
                         ) : (
                           <Select.Option key={`${opt.value}`}>{opt.name}</Select.Option>
                         ),
@@ -149,7 +158,8 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                   )}
                 </Form.Item>
               );
-            case 'checkbox':
+            }
+            case 'checkbox': {
               return (
                 <Form.Item key={item.field}>
                   {getFieldDecorator(item.field, {
@@ -158,7 +168,8 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                   })(<Checkbox>{item.name}</Checkbox>)}
                 </Form.Item>
               );
-            case 'datetime':
+            }
+            case 'datetime': {
               return (
                 <Form.Item key={item.field} label={item.name}>
                   {getFieldDecorator(item.field, {
@@ -177,7 +188,8 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                   )}
                 </Form.Item>
               );
-            case 'richtext':
+            }
+            case 'richtext': {
               const rules = [...(item.rules || [])];
               // @ts-ignore
               let requiredRuleIndex = rules.findIndex((r) => r.required === true);
@@ -211,8 +223,20 @@ class GeneralForm extends React.Component<IGeneralFormProps, State> {
                   )}
                 </Form.Item>
               );
+            }
+            default: {
+              return item.field ? (
+                <Form.Item key={item.field} label={item.name}>
+                  {getFieldDecorator(item.field, {
+                    rules: item.rules,
+                    initialValue: initialValues[item.field] || item.initialValue,
+                  })(item.component)}
+                </Form.Item>
+              ) : (
+                item.component
+              );
+            }
           }
-          return null;
         })}
       </Form>
     );

diff --git a/src/components/UserBar.tsx b/src/components/UserBar.tsx
@@ -17,6 +17,7 @@ export interface Props {
   showAsText?: boolean;
   showRating?: boolean;
   useTooltip?: boolean;
+  tabindex?: number;
   nameFormat?: (user: IUser) => string;
 }
 
@@ -29,6 +30,7 @@ const UserBar: React.FC<Props> = ({
   showAsText = false,
   showRating = false,
   useTooltip = false,
+  tabindex,
   nameFormat,
   className,
 }) => {
@@ -59,13 +61,18 @@ const UserBar: React.FC<Props> = ({
   if (isContestUser || showAsText) {
     return inner;
   }
+  const extraAttrs: any = {};
+  if (tabindex) {
+    extraAttrs.tabIndex = tabindex;
+  }
   if (disableJump) {
-    return <a>{inner}</a>;
+    return <a {...extraAttrs}>{inner}</a>;
   }
   return (
     <Link
       to={urlf(pages.users.detail, { param: { id: user.userId } })}
       onClick={(e) => e.stopPropagation()}
+      {...extraAttrs}
     >
       {useTooltip ? <Tooltip title={nameFormat?.(user) ?? user.nickname}>{inner}</Tooltip> : inner}
     </Link>

diff --git a/src/global.less b/src/global.less
@@ -2238,6 +2238,7 @@ a {
       font-family: 'Marcellus', serif;
       font-size: 25px;
       text-transform: uppercase;
+      user-select: none;
     }
   }
 }

diff --git a/src/models/session.ts b/src/models/session.ts
@@ -79,6 +79,9 @@ export default {
         yield put({
           type: 'users/getSelfAchievedAchievements',
         });
+        yield put({
+          type: 'users/getSelfOfficialMembers',
+        });
         yield put({
           type: 'users/getSelfJoinedTeams',
         });
@@ -131,6 +134,9 @@ export default {
         yield put({
           type: 'users/getSelfAchievedAchievements',
         });
+        yield put({
+          type: 'users/getSelfOfficialMembers',
+        });
         yield put({
           type: 'users/getSelfJoinedTeams',
         });
@@ -178,6 +184,9 @@ export default {
         yield put({
           type: 'users/clearSelfAchievedAchievements',
         });
+        yield put({
+          type: 'users/clearSelfOfficialMembers',
+        });
         yield put({
           type: 'users/clearSelfJoinedTeams',
         });
+6 −0		codes/codes.json
+2 −0		codes/index.ts
+180 −0		contracts/competition.ts
+19 −0		contracts/user.ts
+4 −0		interfaces/competition.ts
+14 −0		routes/be.route.ts