Merge remote-tracking branch 'origin/Deboshree_branch'

WSU-4110 · Apr 13, 2024 · e56fab2 · e56fab2
2 parents 3f20c37 + 40f37fa
commit e56fab2
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 28 deletions.
diff --git a/WellnessChallenges.html b/WellnessChallenges.html
@@ -5,6 +5,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Wellness Challenges</title>
     <link rel="stylesheet" href="WellnessChallenges.css">
+    <style>
+
+    </style>
 </head>
 
 <body>
@@ -30,10 +33,13 @@ <h1 class="title">Wellness Challenges</h1>
 
 
 
+
+
+
 <div class="challenge">
     <h2>Deep Breathing Exercise</h2>
-    <p>Take a break and practice deep breathing for 10 minutes.</p>
-    <p>This exercise helps to calm the mind and body, and can help with stress.</p>
+         <p> Challenge 1</p>
+    <p>Take a break and practice deep breathing for 10 minutes. This exercise helps to calm the mind and body, and can help with stress.</p>
     <div class="timer">
         <div id="Timer1" class="timer-display">10:00</div>
         <p>10 minutes challenge</p>
@@ -47,8 +53,8 @@ <h2>Deep Breathing Exercise</h2>
 
     <div class="challenge">
         <h2>Mindful Walking</h2>
-        <p>Take a short mindful walk outdoors or indoors,focusing on the environment around them.</p>
-        </p>Aim for a 10-minute walk, paying attention to the sights, sounds, and feelings.</p>
+        <p> Challenge 2</p>
+        <p>Take a short mindful walk outdoors or indoors,focusing on the environment around them. Aim for a 10-minute walk, paying attention to the sounds, and feelings.</p>
         <div class="timer">
             <div id="Timer2" class="timer-display">10:00</div>
             <p>10 minutes challenge</p>
@@ -61,11 +67,11 @@ <h2>Mindful Walking</h2>
 
     <div class="challenge">
         <h2>Gratitude Journaling</h2>
-        <p>Spend a few minutes writing down three things they are grateful for each day.</p>
-        </p>This practice can help shift focus from stressors to positive aspects of life.</p>
+        <p> Challenge 3</p>
+        <p>Spend a few minutes writing down three things they are grateful for each day. This can help shift focus to positive aspects of life.</p>
         <div class="timer">
             <div id="Timer3" class="timer-display">20:00</div>
-            <p>10 minutes challenge</p>
+            <p>20 minutes challenge</p>
             <button id="startTimer3" class="timer-btn">Start</button>
             <button id="stopTimer3" class="timer-btn">Stop</button>
             <button id="resetTimer3" class="timer-btn">Reset</button>
@@ -75,8 +81,8 @@ <h2>Gratitude Journaling</h2>
 
     <div class="challenge">
         <h2>Stretch Breaks</h2>
-        <p>Take mini stretch breaks throughout the day to release tension and improve circulation.</p>
-        </p>This can help improve overall well-being.</p>
+        <p> Challenge 4</p>
+        <p>Take mini stretch breaks throughout the day to release tension and improve circulation. This can help improve overall well-being.</p>
         <div class="timer">
             <div id="Timer4" class="timer-display">10:00</div>
             <p>10 minutes challenge</p>        
@@ -89,11 +95,11 @@ <h2>Stretch Breaks</h2>
 
     <div class="challenge">
         <h2>Digital Detox</h2>
-        <p>Take a break from screens for a designated period, such as one hour before bedtime or during meal times</p>
-        </p>Engage in offline activities like reading, crafting, or spending time with loved ones.</p>
+        <p> Challenge 5</p>
+        <p>Take a break from screens for a designated period, such as one hour before bedtime or during meal times. Engage in offline activities like reading, crafting, or spending time with loved ones.</p>
         <div class="timer">
             <div id="Timer5" class="timer-display">20:00</div>
-            <p>10 minutes challenge</p>
+            <p>20 minutes challenge</p>
             <button id="startTimer5" class="timer-btn">Start</button>
             <button id="stopTimer5" class="timer-btn">Stop</button>
             <button id="resetTimer5" class="timer-btn">Reset</button>
@@ -103,8 +109,8 @@ <h2>Digital Detox</h2>
 
     <div class="challenge">
         <h2>Progressive Muscle Relaxation</h2>
-        <p>Take some time to practice a progressive muscle relaxation exercise,and relax different muscle groups in your body.</p>
-        </p>This can help alleviate physical tension and promote relaxation.</p>
+        <p> Challenge 6</p>
+        <p>Take some time to practice a progressive muscle relaxation exercise,and relax different muscle groups in your body. This can help alleviate physical tension and promote relaxation.</p>
         <div class="timer">
             <div id="Timer6" class="timer-display">10:00</div>
             <p>10 minutes challenge</p> 
@@ -117,11 +123,11 @@ <h2>Progressive Muscle Relaxation</h2>
 
     <div class="challenge">
         <h2>Nature Connection</h2>
-        <p>Spend time in nature, whether it's taking a walk in a park, sitting by a tree, or simply gazing at the sky.</p>
-        </p>Being in nature has been shown to reduce stress and improve mood.</p>
+        <p> Challenge 7</p>
+        <p>Spend time in nature, whether it's taking a walk in a park, sitting by a tree, or simply gazing at the sky. Being in nature has been shown to reduce stress and improve mood.</p>
         <div class="timer">
             <div id="Timer7" class="timer-display">20:00</div>
-            <p>10 minutes challenge</p>
+            <p>20 minutes challenge</p>
             <button id="startTimer7" class="timer-btn">Start</button>
              <button id="stopTimer7" class="timer-btn">Stop</button>
             <button id="resetTimer7" class="timer-btn">Reset</button>
@@ -131,8 +137,8 @@ <h2>Nature Connection</h2>
 
     <div class="challenge">
         <h2>Visualization Exercise</h2>
-        <p>Take some time to practice visualization exercise in a peaceful and calming environment.</p>
-        </p>This practice can help shift focus from stressors to positive aspects of life.</p>
+        <p> Challenge 8</p>
+        <p>Take some time to practice visualization exercise in a peaceful and calming environment. This practice can help shift focus from stressors to positive aspects of life.</p>
         <div class="timer">
             <div id="Timer8" class="timer-display">10:00</div>
             <p>10 minutes challenge</p>
@@ -145,11 +151,11 @@ <h2>Visualization Exercise</h2>
 
     <div class="challenge">
         <h2>Social Connection</h2>
-        <p>Reach out to a friend or family member for social support and connection. </p>
-        </p>Even a brief conversation or message exchange can help alleviate stress and boost mood.</p>
+        <p> Challenge 9</p>
+        <p>Reach out to a friend or family member for social support and connection. Even a brief conversation or message exchange can help alleviate stress and boost mood.</p>
         <div class="timer">
           <div id="Timer9" class="timer-display">20:00</div>
-          <p>10 minutes challenge</p>
+          <p>20 minutes challenge</p>
             <button id="startTimer9" class="timer-btn">Start</button>
             <button id="stopTimer9" class="timer-btn">Stop</button>
             <button id="resetTimer9" class="timer-btn">Reset</button>
@@ -159,8 +165,8 @@ <h2>Social Connection</h2>
 
     <div class="challenge">
         <h2>Self-Compassion Practice</h2>
-        <p>Practice self-compassion by being kind to yourself.</p>
-        </p>This can help alleviate stress and boost mood.</p>
+        <p> Challenge 10</p>
+        <p>Practice self-compassion by being kind to yourself. This can help alleviate stress and boost mood.</p>
         <div class="timer">
             <div id="Timer10" class="timer-display">10:00</div>
             <p>10 minutes challenge</p>

diff --git a/WellnessChallenges.js b/WellnessChallenges.js
@@ -93,3 +93,4 @@ document.getElementById('resetTimer9').addEventListener('click', function() { so
 document.getElementById('startTimer10').addEventListener('click', function() { selfCompassionPracticeTimer.start(); });
 document.getElementById('stopTimer10').addEventListener('click', function() { selfCompassionPracticeTimer.stop(); });
 document.getElementById('resetTimer10').addEventListener('click', function() { selfCompassionPracticeTimer.reset(); });
+
diff --git a/tests/addComment.test.js b/tests/addComment.test.js
@@ -1,12 +1,12 @@
 //unit testing for addComment method
 
 // Mocking the required file and methods
-jest.mock('./MeditationSession', () => ({
+jest.mock('../MeditationSession', () => ({
     addComment: jest.fn()
 }));
 
 
-const { addComment } = require('./MeditationSession');
+const { addComment } = require('../MeditationSession');
 
 describe('addComment function', () => {
     test('should add a comment to the session', () => {

diff --git a/tests/removeBookmark.test.js b/tests/removeBookmark.test.js
@@ -1,12 +1,12 @@
 //unit test for removebookmark method
 
 
-jest.mock('./MeditationSession', () => ({
+jest.mock('../MeditationSession', () => ({
     removeBookmark: jest.fn()
 }));
 
 // Importing the removeBookmark function
-const { removeBookmark } = require('./MeditationSession');
+const { removeBookmark } = require('../MeditationSession');
 
 describe('removeBookmark function', () => {
     beforeEach(() => {