done

Author: sezanzeb

frontend/src/api/index.ts

@@ -182,6 +182,12 @@ export class ApiClient {
         allowProfileFormUntil: this.reviveDate(
           settings.application.allowProfileFormUntil,
         ),
+        acceptanceDeadline: this.reviveDate(
+          settings.application.acceptanceDeadline,
+        ),
+        confirmSpotUntil: this.reviveDate(
+          settings.application.confirmSpotUntil,
+        ),
       },
     };
   }

frontend/src/components/settings/application/application-settings.tsx

@@ -40,38 +40,32 @@ export const ApplicationSettings = () => {
     [settings],
   );
 
-  const handleAllowProfileFormFromChange = useCallback(
-    (value: string) => {
-      setAllowProfileFormFrom(value);
-      const date = new Date(value);
-
-      if (!isValidDate(date)) {
-        return;
-      }
+  const [allowProfileFormUntil, setAllowProfileFormUntil] = useDerivedState(
+    () => settings.application.allowProfileFormUntil.toISOString(),
+    [settings],
+  );
 
-      updateApplicationSettings({
-        allowProfileFormFrom: date,
-      });
-    },
-    [updateApplicationSettings],
+  const [acceptanceDeadline, setAcceptanceDeadline] = useDerivedState(
+    () => settings.application.acceptanceDeadline.toISOString(),
+    [settings],
   );
 
-  const [allowProfileFormUntil, setAllowProfileFormUntil] = useDerivedState(
-    () => settings.application.allowProfileFormUntil.toISOString(),
+  const [confirmSpotUntil, setConfirmSpotUntil] = useDerivedState(
+    () => settings.application.confirmSpotUntil.toISOString(),
     [settings],
   );
 
-  const handleAllowProfileFormUntilChange = useCallback(
-    (value: string) => {
-      setAllowProfileFormUntil(value);
+  const handleDateChange = useCallback(
+    (value: string, setter, key: string) => {
+      setter(value);
       const date = new Date(value);
 
       if (!isValidDate(date)) {
         return;
       }
 
       updateApplicationSettings({
-        allowProfileFormUntil: date,
+        [key]: date,
       });
     },
     [updateApplicationSettings],
@@ -112,11 +106,16 @@ export const ApplicationSettings = () => {
             placeholder="keep it fair, e.g. 240 for 10 days"
           />
         </FlexRowColumnContainer>
-        <Spacer />
+      </FlexRowContainer>
+      <FlexRowContainer>
         <FlexRowColumnContainer>
           <TextInput
             value={allowProfileFormFrom}
-            onChange={handleAllowProfileFormFromChange}
+            onChange={(value) => handleDateChange(
+              value,
+              setAllowProfileFormFrom,
+              "allowProfileFormFrom"
+            )}
             title="Open registration on"
             placeholder="1970-01-01 00:00:00"
           />
@@ -125,12 +124,43 @@ export const ApplicationSettings = () => {
         <FlexRowColumnContainer>
           <TextInput
             value={allowProfileFormUntil}
-            onChange={handleAllowProfileFormUntilChange}
+            onChange={(value) => handleDateChange(
+              value,
+              setAllowProfileFormUntil,
+              "allowProfileFormUntil"
+            )}
             title="Close registration on"
             placeholder="1970-01-01 00:00:00"
           />
         </FlexRowColumnContainer>
       </FlexRowContainer>
+      <FlexRowContainer>
+        <FlexRowColumnContainer>
+          <TextInput
+            value={acceptanceDeadline}
+            onChange={(value) => handleDateChange(
+              value,
+              setAcceptanceDeadline,
+              "acceptanceDeadline"
+            )}
+            title="When we will accept people"
+            placeholder="1970-01-01 00:00:00"
+          />
+        </FlexRowColumnContainer>
+        <Spacer />
+        <FlexRowColumnContainer>
+          <TextInput
+            value={confirmSpotUntil}
+            onChange={(value) => handleDateChange(
+              value,
+              setConfirmSpotUntil,
+              "confirmSpotUntil"
+            )}
+            title="Until when accepted people need to confirm their spot"
+            placeholder="1970-01-01 00:00:00"
+          />
+        </FlexRowColumnContainer>
+      </FlexRowContainer>
 
       <Text>
         Use the add button to add new questions and the edit button in the top