fix: challenge card -> hint

GZTimeWalker · Aug 28, 2022 · 00bc869 · 00bc869
1 parent 6039239
commit 00bc869
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/GZCTF/ClientApp/src/Api.ts b/GZCTF/ClientApp/src/Api.ts
@@ -609,7 +609,7 @@ export interface ChallengeEditDetailModel {
   /** 题目类型 */
   type: ChallengeType
 
-  /** 题目提示，用";"分隔 */
+  /** 题目提示 */
   hints?: string[]
 
   /** 是否启用题目 */
@@ -827,7 +827,7 @@ export interface ChallengeUpdateModel {
   /** 题目标签 */
   tag?: ChallengeTag | null
 
-  /** 题目提示，用";"分隔 */
+  /** 题目提示 */
   hints?: string[] | null
 
   /** 是否启用题目 */
@@ -1333,7 +1333,7 @@ export interface ChallengeDetailModel {
   /** 题目标签 */
   tag?: ChallengeTag
 
-  /** 题目提示，用";"分隔 */
+  /** 题目提示 */
   hints?: string[] | null
 
   /**

diff --git a/GZCTF/ClientApp/src/components/ChallengeDetailModal.tsx b/GZCTF/ClientApp/src/components/ChallengeDetailModal.tsx
@@ -306,6 +306,18 @@ const ChallengeDetailModal: FC<ChallengeDetailModalProps> = (props) => {
               <div dangerouslySetInnerHTML={{ __html: marked(challenge?.content ?? '') }} />
             </TypographyStylesProvider>
           </Group>
+          {challenge?.hints && challenge.hints.length > 0 && (
+            <Stack spacing={2}>
+              {challenge.hints.map((hint) => (
+                <Group spacing="xs" align="flex-start" noWrap>
+                  <Icon path={mdiLightbulbOnOutline} size={0.8} color={theme.colors.yellow[5]} />
+                  <Text key={hint} size="sm" style={{ maxWidth: 'calc(100% - 2rem)' }}>
+                    {hint}
+                  </Text>
+                </Group>
+              ))}
+            </Stack>
+          )}
           {isDynamic && !challenge?.context?.instanceEntry && (
             <Group position="center" spacing={2}>
               <Button onClick={onCreateContainer} disabled={disabled} loading={disabled}>
@@ -340,18 +352,6 @@ const ChallengeDetailModal: FC<ChallengeDetailModalProps> = (props) => {
               </Group>
             </Stack>
           )}
-          {challenge?.hints && (
-            <Stack spacing={2}>
-              {challenge.hints.map((hint) => (
-                <Group spacing="xs" align="flex-start" noWrap>
-                  <Icon path={mdiLightbulbOnOutline} size={0.8} color={theme.colors.yellow[5]} />
-                  <Text key={hint} size="sm" style={{ maxWidth: 'calc(100% - 2rem)' }}>
-                    {hint}
-                  </Text>
-                </Group>
-              ))}
-            </Stack>
-          )}
         </Stack>
         <Divider />
         {solved ? (

diff --git a/GZCTF/Models/Request/Edit/ChallengeEditDetailModel.cs b/GZCTF/Models/Request/Edit/ChallengeEditDetailModel.cs
@@ -39,7 +39,7 @@ public class ChallengeEditDetailModel
     public ChallengeType Type { get; set; } = ChallengeType.StaticAttachment;
 
     /// <summary>
-    /// 题目提示，用";"分隔
+    /// 题目提示
     /// </summary>
     public string[] Hints { get; set; } = Array.Empty<string>();
 

diff --git a/GZCTF/Models/Request/Edit/ChallengeUpdateModel.cs b/GZCTF/Models/Request/Edit/ChallengeUpdateModel.cs
@@ -25,7 +25,7 @@ public class ChallengeUpdateModel
     public ChallengeTag? Tag { get; set; }
 
     /// <summary>
-    /// 题目提示，用";"分隔
+    /// 题目提示
     /// </summary>
     public List<string>? Hints { get; set; }
 
@@ -82,4 +82,4 @@ public class ChallengeUpdateModel
     /// 统一文件名
     /// </summary>
     public string? FileName { get; set; }
-}
+}
diff --git a/GZCTF/Models/Request/Game/ChallengeDetailModel.cs b/GZCTF/Models/Request/Game/ChallengeDetailModel.cs
@@ -26,7 +26,7 @@ public class ChallengeDetailModel
     public ChallengeTag Tag { get; set; } = ChallengeTag.Misc;
 
     /// <summary>
-    /// 题目提示，用";"分隔
+    /// 题目提示
     /// </summary>
     public List<string>? Hints { get; set; }
 
@@ -82,4 +82,4 @@ public class ClientFlagContext
     /// 附件 Url
     /// </summary>
     public string? Url { get; set; } = null;
-}
+}