Merge branch 'main' of github.com:brandonnorsworthy/rust-quest into updates

Author: brandonnorsworthy

pnpm-lock.yaml

@@ -11,6 +11,7 @@
 
 ## Future Updates
 - Light/Dark mode toggle
+- Select the tier/stage you are in for the wipe to get challenges relevant to your progression. (e.g. early game, mid game, late game)
 - Bingo card generator with a code to share with friends to compete or collaborate  
 __^^ let us know if this is a feature you'd like to see! ^^__
 

public/assets/text/news.md

@@ -0,0 +1,4 @@
+User-agent: *
+Disallow:
+
+Sitemap: https://rustquests.com/sitemap.xml

public/robots.txt

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <!-- Public Routes -->
+  <url>
+    <loc>https://rustquests.com/</loc>
+  </url>
+  <url>
+    <loc>https://rustquests.com/login</loc>
+  </url>
+  <url>
+    <loc>https://rustquests.com/unauthorized</loc>
+  </url>
+  <url>
+    <loc>https://rustquests.com/leaderboard</loc>
+  </url>
+
+</urlset>

public/sitemap.xml

@@ -26,10 +26,11 @@ const Toaster: React.FC = () => {
     });
   };
 
+  const toastsCopy = [...toasts];
   return (
     <div className="absolute bottom-4 md:bottom-8 right-4 md:right-8 z-[1000] flex flex-col items-end">
       {
-        toasts.reverse().map((toast, index) => {
+        toastsCopy.reverse().map((toast, index) => {
           let toastStyle = null;
           switch (toast.type) {
             case 'error':

src/components/Toaster/index.tsx

@@ -8,7 +8,8 @@ interface ModalProps {
   onSkip?: () => void;
   onComplete?: () => void;
   onIncomplete?: () => void;
-  quest: Quest
+  quest: Quest,
+  disableButtons?: boolean;
 }
 
 const ViewQuest: React.FC<ModalProps> = (props) => {
@@ -17,7 +18,8 @@ const ViewQuest: React.FC<ModalProps> = (props) => {
     onSkip,
     onComplete,
     onIncomplete,
-    quest
+    quest,
+    disableButtons
   } = props;
   const { title, description, objectives, image_url, category, info_url, username } = quest;
 
@@ -78,6 +80,7 @@ const ViewQuest: React.FC<ModalProps> = (props) => {
               info_url &&
               <Button
                 type="info"
+                disabled={disableButtons}
                 onClick={() => window.open(info_url, '_blank', 'noopener,noreferrer')}>
                 learn more
               </Button>
@@ -88,6 +91,7 @@ const ViewQuest: React.FC<ModalProps> = (props) => {
               onSkip &&
               <Button
                 type="cancel"
+                disabled={disableButtons}
                 onClick={onSkip}>
                 skip
               </Button>
@@ -96,6 +100,7 @@ const ViewQuest: React.FC<ModalProps> = (props) => {
               onComplete &&
               <Button
                 type="confirm"
+                disabled={disableButtons}
                 onClick={onComplete}>
                 complete
               </Button>
@@ -104,6 +109,7 @@ const ViewQuest: React.FC<ModalProps> = (props) => {
               onIncomplete &&
               <Button
                 type="cancel"
+                disabled={disableButtons}
                 onClick={onIncomplete}>
                 mark incomplete
               </Button>

src/modals/ViewQuest/ViewQuest.tsx

@@ -29,6 +29,7 @@ const LandingPage = () => {
   const [currentQuest, setCurrentQuest] = useState<Quest | null>(storedQuests);
   const [currentOpenModal, setCurrentOpenModal] = useState<ModalTypes>(null);
   const [spinning, setSpinning] = useState(false);
+  const [isModalLoading, setIsModalLoading] = useState(false);
 
   const disableButtons = currentOpenModal ? true : false;
 
@@ -48,10 +49,13 @@ const LandingPage = () => {
     if (!accessToken) return navigate("/login");
 
     try {
+      setIsModalLoading(true);
       const randomQuestResponse = await questService.getRandomQuest(accessToken);
 
       if (!randomQuestResponse) {
         toast.warning("No quests available, add new filters or reset your progress to see more quests.");
+        setCurrentOpenModal(null);
+        setCurrentQuest(null);
         return;
       }
 
@@ -60,24 +64,31 @@ const LandingPage = () => {
       setCurrentOpenModal("quest");
       localStorage.setItem('currentQuest', JSON.stringify(randomQuestResponse));
     } catch (error) {
+      setCurrentOpenModal(null);
+      setCurrentQuest(null);
       toast.error("Failed to get random quest", error);
+    } finally {
+      setIsModalLoading(false);
     }
   };
 
   const handleQuestSkip = () => {
-    setCurrentQuest(null);
+    // setCurrentQuest(null);
     localStorage.removeItem('currentQuest');
+    handleSpinWheel();
   };
 
   const handleQuestComplete = async () => {
     if (!accessToken) return navigate("/login");
 
     try {
+      setIsModalLoading(true);
       const completeQuestResponse = await userService.completeQuest(accessToken, currentQuest!.id);
 
-      setCurrentQuest(null);
+      // setCurrentQuest(null);
       localStorage.removeItem('currentQuest');
       toast.success(completeQuestResponse);
+      handleSpinWheel();
     } catch (error) {
       toast.error("Failed to complete quest", error);
     }
@@ -132,6 +143,7 @@ const LandingPage = () => {
               onSkip={handleQuestSkip}
               onComplete={handleQuestComplete}
               quest={currentQuest}
+              disableButtons={isModalLoading}
             />
           </Modal>
         );

src/pages/LandingPage.tsx

@@ -85,18 +85,6 @@ const AdminSuggestionsPage = () => {
     closeModal();
   };
 
-  const handleDeleteSuggestion = async () => {
-    const onConfirm = () => toast.info('not implemented yet');
-    setConfirmDialog({
-      title: "Are you sure?",
-      description: "If you delete this suggestion, you will lose all changes.",
-      onConfirm: () => {
-        onConfirm();
-        setConfirmDialog(null);
-      }
-    });
-  };
-
   const handleCreateQuest = async (newQuest: convertSuggestionIntoQuestBodyRequest) => {
     const handleConvertSuggestionToQuest = async () => {
       try {
@@ -125,6 +113,30 @@ const AdminSuggestionsPage = () => {
       }
     });
   };
+  
+  const handleDeleteSuggestion = async () => {
+    const onConfirm = () => {
+      try {
+        if (!selectedSuggestion) return;
+        if (!accessToken) return;
+
+        suggestionService.deleteSuggestion(accessToken, selectedSuggestion.id);
+        closeModal();
+        fetchSuggestions();
+
+        toast.success("Suggestion deleted successfully");
+      } catch (error) {
+        toast.error("Failed to delete suggestion", error);
+      } finally {
+        setConfirmDialog(null);
+      }
+    };
+    setConfirmDialog({
+      title: "Are you sure?",
+      description: "If you delete this suggestion, you will lose all changes.",
+      onConfirm: onConfirm,
+    });
+  };
 
   return (
     <main className="overflow-hidden h-dvh w-dvw">