Merge pull request #208 from MKuranowski/default-to-custom-questions

"Default to custom questions" mode

Author: taibeled

src/components/AddQuestionDialog.tsx

@@ -11,7 +11,12 @@ import {
     DialogTrigger,
 } from "@/components/ui/dialog";
 import { SidebarMenuButton } from "@/components/ui/sidebar-l";
-import { addQuestion, isLoading, leafletMapContext } from "@/lib/context";
+import {
+    addQuestion,
+    defaultCustomQuestions,
+    isLoading,
+    leafletMapContext,
+} from "@/lib/context";
 
 export const AddQuestionDialog = ({
     children,
@@ -59,7 +64,14 @@ export const AddQuestionDialog = ({
         const center = map.getCenter();
         addQuestion({
             id: "tentacles",
-            data: { lat: center.lat, lng: center.lng },
+            data: defaultCustomQuestions.get()
+                ? {
+                      lat: center.lat,
+                      lng: center.lng,
+                      locationType: "custom",
+                      places: [],
+                  }
+                : { lat: center.lat, lng: center.lng },
         });
         return true;
     };
@@ -70,7 +82,9 @@ export const AddQuestionDialog = ({
         const center = map.getCenter();
         addQuestion({
             id: "matching",
-            data: { lat: center.lat, lng: center.lng },
+            data: defaultCustomQuestions.get()
+                ? { lat: center.lat, lng: center.lng, type: "custom-points" }
+                : { lat: center.lat, lng: center.lng },
         });
         return true;
     };
@@ -81,7 +95,9 @@ export const AddQuestionDialog = ({
         const center = map.getCenter();
         addQuestion({
             id: "measuring",
-            data: { lat: center.lat, lng: center.lng },
+            data: defaultCustomQuestions.get()
+                ? { lat: center.lat, lng: center.lng, type: "custom-measure" }
+                : { lat: center.lat, lng: center.lng },
         });
         return true;
     };

src/components/OptionDrawers.tsx

@@ -19,6 +19,7 @@ import {
     customInitPreference,
     customPresets,
     customStations,
+    defaultCustomQuestions,
     defaultUnit,
     disabledStations,
     displayHidingZonesOptions,
@@ -72,6 +73,7 @@ const PASTEBIN_URL_PARAM = "pb";
 
 export const OptionDrawers = ({ className }: { className?: string }) => {
     useStore(triggerLocalRefresh);
+    const $defaultCustomQuestions = useStore(defaultCustomQuestions);
     const $defaultUnit = useStore(defaultUnit);
     const $animateMapMovements = useStore(animateMapMovements);
     const $autoZoom = useStore(autoZoom);
@@ -615,6 +617,19 @@ export const OptionDrawers = ({ className }: { className?: string }) => {
                                     }
                                 />
                             </div>
+                            <div className="flex flex-row items-center gap-2">
+                                <label className="text-2xl font-semibold font-poppins">
+                                    Default to custom questions?
+                                </label>
+                                <Checkbox
+                                    checked={$defaultCustomQuestions}
+                                    onCheckedChange={() =>
+                                        defaultCustomQuestions.set(
+                                            !$defaultCustomQuestions,
+                                        )
+                                    }
+                                />
+                            </div>
                             <div className="flex flex-row items-center gap-2">
                                 <label className="text-2xl font-semibold font-poppins">
                                     Hider mode?

src/lib/context.ts

@@ -348,6 +348,14 @@ export const followMe = persistentAtom<boolean>("followMe", false, {
     encode: JSON.stringify,
     decode: JSON.parse,
 });
+export const defaultCustomQuestions = persistentAtom<boolean>(
+    "defaultCustomQuestions",
+    false,
+    {
+        encode: JSON.stringify,
+        decode: JSON.parse,
+    },
+);
 
 export const pastebinApiKey = persistentAtom<string>("pastebinApiKey", "");
 export const alwaysUsePastebin = persistentAtom<boolean>(