Merge pull request #96 from fac30/fix-bugs2

Fix bugs2
fac30 · Dec 17, 2024 · cba4018 · cba4018
2 parents 83d9495 + b85bb02
commit cba4018
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 22 deletions.
diff --git a/src/app/moods/info/page.tsx b/src/app/moods/info/page.tsx
@@ -97,10 +97,10 @@ export default function MoodsInfoPage() {
               layout="responsive"
             />
             <Link
-              className="text-twd-text-link"
+              className="text-twd-text-link mb-6"
               href="https://www.eisenhower.me/eisenhower-matrix/#:~:text=What%20is%20the%20Eisenhower%20Matrix,or%20not%20do%20at%20all."
             >
-              Learn More Here
+              Learn more about the Eisenhower Matrix
             </Link>
           </>
         ) : (
@@ -146,7 +146,7 @@ export default function MoodsInfoPage() {
               alt="Image of an Eisenhower Matrix"
               layout="responsive"
             />
-            <div className="flex flex-col gap-3">
+            <div className="flex flex-col gap-3 mb-6">
               <p>Three-Dimensional Model of Emotions (Lovheim, 2011)</p>
               <p>
                 Eight basic emotions are ordered into each corner of a cube.
@@ -158,6 +158,12 @@ export default function MoodsInfoPage() {
                 relabelled as their emotional state. Disgust refers to the
                 feeling of having had enough, and has been relabelled content.)
               </p>
+              <Link
+                className="text-twd-text-link"
+                href="https://www.researchgate.net/publication/51863789_A_new_three-dimensional_model_for_emotions_and_monoamine_neurotransmitters"
+              >
+                Learn more about the Three-Dimensional Model Of Emotions
+              </Link>
             </div>
           </>
         )}

diff --git a/src/app/needs/info/page.tsx b/src/app/needs/info/page.tsx
@@ -65,7 +65,7 @@ export default function NeedsInfoPage() {
           className="text-twd-text-link"
           href="https://journals.sagepub.com/doi/10.1177/21582440221096139"
         >
-          Learn More Here
+          See paper on the effects of Non Violent Communication Program on Nursing Students
         </Link>
         <div className="flex flex-col gap-3 bg-twd-primary-purple p-4 rounded-lg">
           <p>

diff --git a/src/app/toolkit/info/categories-info/page.tsx b/src/app/toolkit/info/categories-info/page.tsx
@@ -31,7 +31,7 @@ export default function CategoriesInfoPage() {
 
           {/* Subheader */}
           <p className="text-gray-400 mt-3 mb-2">
-            Filter by categories you might find helpful or add your own:
+            Filter by tags you might find helpful or add your own:
           </p>
 
           {/* Scrollable Categories */}
@@ -69,9 +69,9 @@ export default function CategoriesInfoPage() {
                 ))}
                 <div className="space-y-2">
                   <h2 className="text-xl font-semibold text-white">
-                    Add your own category
+                    Add your own tag
                   </h2>
-                  <p className="text-gray-400">Adding your own categories can help you organise in the best way for you.</p>
+                  <p className="text-gray-400">Adding your own tags can help you organise in the best way for you.</p>
                 </div>
             </div>
 

diff --git a/src/app/toolkit/info/page.tsx b/src/app/toolkit/info/page.tsx
@@ -57,7 +57,7 @@ export default function ToolkitInfoPage() {
             <div className="mt-10">
               <Link href="/toolkit/info/categories-info" 
                 className="bg-twd-primary-purple text-white text-base px-6 py-3 rounded-full font-semibold">
-                Go to Categories
+                Go to Tabs
               </Link>
             </div>
 

diff --git a/src/lib/db/seed/toolkit.ts b/src/lib/db/seed/toolkit.ts
@@ -14,42 +14,42 @@ export const categories = [
 export const toolkit = [
   {
     id: uuidv4(),
-    name: "Listen to my favourite music",
-    categories: ["Replace", "Barrier"],
+    name: "Listen to your favourite music",
+    categories: ["Distract", "Change state"],
     checked: false,
-    infoUrl: "https://google.com/music",
+    infoUrl: "https://open.spotify.com/",
     imageUrl:
-      "https://daily.jstor.org/wp-content/uploads/2023/01/good_times_with_bad_music_1050x700.jpg",
+      "https://media.discordapp.net/attachments/1310562134932979735/1318576041073315900/received_950544553601344.jpg?ex=6762d322&is=676181a2&hm=c11e753161510ab37001c9057d18856b24402bde95c4d7808b97b5616dd4a53a&=&format=webp&width=936&height=936",
     timestamp: new Date().toISOString(),
   },
   {
     id: uuidv4(),
     name: "Breathing exercises",
-    categories: ["Distract"],
+    categories: ["Change state"],
     checked: false,
-    infoUrl: "https://www.youtube.com/watch?v=DbDoBzGY3vo",
+    infoUrl: "https://youtu.be/i5apnLrzaT4?si=e_D3D5e-orQWUfLw",
     imageUrl:
-      "https://www.bhf.org.uk/-/media/images/information-support/heart-matters/2023/december/wellbeing/deep-breathing-620x400.png?h=400&w=620&rev=4506ebd34dab4476b56c225b6ff3ad60&hash=B3CFFEEE704E4432D101432CEE8B2766",
+      "https://media.discordapp.net/attachments/1310562134932979735/1318576040750088252/received_1503272180337642.jpg?ex=6762d322&is=676181a2&hm=df31873554df20b51e5c40e2e27306c7b4a459337353576f400237d4160a7434&=&format=webp&width=936&height=936",
     timestamp: new Date().toISOString(),
   },
   {
     id: uuidv4(),
     name: "Call a friend",
     categories: ["Distract", "Change state"],
     checked: false,
-    infoUrl: "https://example.com/call",
+    infoUrl: "",
     imageUrl:
-      "https://t4.ftcdn.net/jpg/04/63/63/59/360_F_463635935_IweuYhCqZRtHp3SLguQL8svOVroVXvvZ.jpg",
+      "https://media.discordapp.net/attachments/1310562134932979735/1318576040041381908/received_960755905929645.jpg?ex=6762d321&is=676181a1&hm=c4b3219ff3bca866b47cd013f616879809317d954b5b4019a466a7117b129065&=&format=webp&width=936&height=936",
     timestamp: new Date().toISOString(),
   },
   {
     id: uuidv4(),
     name: "Drink water",
-    categories: ["Distract", "Change state"],
+    categories: ["Replace", "Distract", "Change state"],
     checked: false,
-    infoUrl: "https://example.com/call",
+    infoUrl: "https://www.medicalnewstoday.com/articles/290814",
     imageUrl:
-      "https://content.health.harvard.edu/wp-content/uploads/2023/07/b8a1309a-ba53-48c7-bca3-9c36aab2338a.jpg",
+      "https://media.discordapp.net/attachments/1310562134932979735/1318576040418742355/received_570339555846105.jpg?ex=6762d321&is=676181a1&hm=0c2bd8744d116ac1e455da589d769eb018bbeb5bd22894012d6fa71e7745e250&=&format=webp&width=936&height=936",
     timestamp: new Date().toISOString(),
   },
 ];
diff --git a/src/ui/shared/InfoButton.tsx b/src/ui/shared/InfoButton.tsx
@@ -1,7 +1,6 @@
 "use client";
 import { useState, useEffect, useRef } from "react";
 import { useRouter } from "next/navigation";
-import { InformationCircleIcon } from "@heroicons/react/24/outline";
 import Button from "./Button";
 
 interface QuestionMarkButtonProps {
@@ -49,7 +48,11 @@ export default function InfoButton({
         onClick={togglePopup}
         className="flex items-center justify-center w-8 h-8 border-2 border-twd-background rounded-full text-white font-bold transition"
       >
-        <InformationCircleIcon />
+        {/* <InformationCircleIcon className="text-white !important" /> */}
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" className="size-6">
+          <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
+        </svg>
+
       </button>
       {isPopupOpen && (
         <div