From f4feae5b361b7e24141bb93922d628bbb05ed6e5 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 12:25:59 -0400 Subject: [PATCH 01/21] deleted edit tobe replaced --- frontend/src/routes/create-goals/+page.svelte | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index 6cb617da..1c9e12e5 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -244,61 +244,7 @@ -
-
-
- -
- -
- {#if showModal} -
-
- -
- {/if} -
-
-
- - From 4634ce0d7acdde73bc00ce36a76e4b6581fd9de2 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 17:30:31 -0400 Subject: [PATCH 02/21] Changed Responsive Layout Screen Size --- frontend/src/lib/components/DaysOfWeekSelector.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/lib/components/DaysOfWeekSelector.svelte b/frontend/src/lib/components/DaysOfWeekSelector.svelte index c7b3ccf3..c3e38acf 100644 --- a/frontend/src/lib/components/DaysOfWeekSelector.svelte +++ b/frontend/src/lib/components/DaysOfWeekSelector.svelte @@ -11,7 +11,7 @@ } -
+
{#each Object.entries(daysOfWeek) as [day, value]} {#if day === 'monday' || day === 'tuesday' || day === 'wednesday' || day === 'thursday' || day === 'friday' || day === 'saturday' || day === 'sunday'}
From 97ce7a70df93176d48d926c3c5dabbb247d0b395 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 17:30:45 -0400 Subject: [PATCH 03/21] In Page Day Selector with Toggle Button --- .../DaysOfWeekSelectorToggle.svelte | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte diff --git a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte new file mode 100644 index 00000000..958d7326 --- /dev/null +++ b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte @@ -0,0 +1,62 @@ + + +
+
+
+
+ {#if goal.days_of_week} +
+ + Days + +
+ +
+ +
+
+

You needed more info?

+

Here is a description!

+
+
+
+
+
+ + {/if} +
+
+
+
From 98743da00075718a10ed0cfe24af6f47eab698c4 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 17:33:00 -0400 Subject: [PATCH 04/21] SMART Goal Detail Component --- .../lib/components/SmartGoalDetails.svelte | 236 ++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 frontend/src/lib/components/SmartGoalDetails.svelte diff --git a/frontend/src/lib/components/SmartGoalDetails.svelte b/frontend/src/lib/components/SmartGoalDetails.svelte new file mode 100644 index 00000000..f54ac5af --- /dev/null +++ b/frontend/src/lib/components/SmartGoalDetails.svelte @@ -0,0 +1,236 @@ + + +
+
+
+
+
+ + + + +
+ + {#if loadingGenerate} +
+ +
+ {/if} +
+
+ + +
+
+
+

Specific

+
+ + +
+
+
+
+ + +
+
+
+

Measurable

+
+ + +
+
+
+
+ + +
+
+
+

Attainable

+
+ + +
+
+
+
+ + +
+
+
+

Relevant

+
+ + +
+
+
+
+ + +
+
+
+

Time-Bound

+
+ + +
+
+
+
+
\ No newline at end of file From 0dd18f9134e1acc8a78350e749232a43d38cd925 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 17:36:48 -0400 Subject: [PATCH 05/21] Time and Date Selector Component --- .../lib/components/TimeAndDateSelector.svelte | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 frontend/src/lib/components/TimeAndDateSelector.svelte diff --git a/frontend/src/lib/components/TimeAndDateSelector.svelte b/frontend/src/lib/components/TimeAndDateSelector.svelte new file mode 100644 index 00000000..1a1cca7c --- /dev/null +++ b/frontend/src/lib/components/TimeAndDateSelector.svelte @@ -0,0 +1,105 @@ + + +
+
+
+ +
+ +
+ +
+
+

You needed more info?

+

Here is a description!

+
+
+
+
+
+
+
+ +
+
+
+ +
+ +
+ +
+
+

You needed more info?

+

Here is a description!

+
+
+
+
+
+
+
+ \ No newline at end of file From 0f383dc314f345b8f7ef9d9324540a7d543ba5c7 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 17:41:15 -0400 Subject: [PATCH 06/21] NPM Run format and lint --- .../DaysOfWeekSelectorToggle.svelte | 30 +- .../lib/components/SmartGoalDetails.svelte | 521 ++++++++++-------- .../lib/components/TimeAndDateSelector.svelte | 219 ++++---- 3 files changed, 443 insertions(+), 327 deletions(-) diff --git a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte index 958d7326..df69377c 100644 --- a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte +++ b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte @@ -32,20 +32,36 @@
{#if goal.days_of_week}
- - Days - + Days
-
+

You needed more info?

Here is a description!

diff --git a/frontend/src/lib/components/SmartGoalDetails.svelte b/frontend/src/lib/components/SmartGoalDetails.svelte index f54ac5af..768e77cf 100644 --- a/frontend/src/lib/components/SmartGoalDetails.svelte +++ b/frontend/src/lib/components/SmartGoalDetails.svelte @@ -1,236 +1,311 @@ - -
-
-
-
-
- - - - -
- - {#if loadingGenerate} -
- -
- {/if} -
+ }; + + let goalError = false; + + async function handleSave() { + goalError = false; + + if (!goal.goal) { + goalError = true; + } + + if (goalError) { + return; + } + + try { + await createGoal(goal); + } catch (error) { + console.log(error); + } + } + + +
+
+
+
+
+ + + + +
+ + {#if loadingGenerate} +
+ +
+ {/if}
- - -
-
-
-

Specific

-
- -
+ +
+
+ +
+
diff --git a/frontend/src/lib/components/TimeAndDateSelector.svelte b/frontend/src/lib/components/TimeAndDateSelector.svelte index 1a1cca7c..6c807d7b 100644 --- a/frontend/src/lib/components/TimeAndDateSelector.svelte +++ b/frontend/src/lib/components/TimeAndDateSelector.svelte @@ -1,105 +1,130 @@ - -
-
-
- -
- -
- -
-
-

You needed more info?

-

Here is a description!

-
+ }; + + let selectAll = false; + let goalError = false; + + const toggleAll = () => { + selectAll = !selectAll; + if (goal.days_of_week) { + Object.keys(goal.days_of_week).forEach((day) => { + goal.days_of_week![day as keyof DaysOfWeek] = selectAll; + }); + } + }; + + async function handleSave() { + goalError = false; + + if (!goal.goal) { + goalError = true; + } + + if (goalError) { + return; + } + + try { + await createGoal(goal); + } catch (error) { + console.log(error); + } + } + + +
+
+
+ +
+ +
+ +
+
+

You needed more info?

+

Here is a description!

-
-
-
- -
-
-
- -
- -
- -
-
-

You needed more info?

-

Here is a description!

-
+
+
+
+
+ +
+
+
+ +
+ +
+ +
+
+

You needed more info?

+

Here is a description!

-
-
-
- \ No newline at end of file +
+
+
+
From 8905c2ae0fb652f8cd9676c272f7bc165924b89c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 21:42:20 +0000 Subject: [PATCH 07/21] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- frontend/src/routes/create-goals/+page.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index 1c9e12e5..2f3ccef3 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -244,7 +244,8 @@
- + +
From ff4cbb7ab82b48403ebaa80f63c098d0d1043479 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:20:14 -0400 Subject: [PATCH 08/21] Updated layout --- .../DaysOfWeekSelectorToggle.svelte | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte index df69377c..bb0ef6f1 100644 --- a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte +++ b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte @@ -41,33 +41,37 @@ bind:checked={selectAll} on:click={toggleAll} /> - -
- -
-
-

You needed more info?

-

Here is a description!

+ +
+ +
-
-
+
From 5e1af4bd0396e8fcee25ee6987584ba3b2a685d7 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:20:34 -0400 Subject: [PATCH 09/21] Recreated entire page wit hout errors --- frontend/src/routes/create-goals/+page.svelte | 433 +++++++++++++----- 1 file changed, 325 insertions(+), 108 deletions(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index 1c9e12e5..61f33368 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -95,156 +95,373 @@ -
- -
-
-
-

Specific

+ +
+
+
+

Specific

+
-
- -
-
-
-
+ +
+ + +
- -
-
-
-

Measurable

+ +
+
+
+

Measurable

+
-
- -
-
-
-
+ +
+ + + - -
-
-
-

Attainable

+ +
+
+
+

Attainable

+
-
- -
-
-
-
+ +
+ + + - -
-
-
-

Relevant

+ +
+
+
+

Relevant

+
-
- -
-
-
-
+ +
+ + + - -
-
-
-

Time-Bound

+ +
+
+
+

Time-Bound

+
-
- -
+ +
+
+
+
+ +
+
+
+
+ {#if goal.days_of_week} +
+ Days +
+ +
+ +
+
+

You needed more info?

+

Here is a description!

+
+
+
+
+
+ + {/if}
+
-
-
- {#if goal.days_of_week} - Select the Days Your SMART Goal Repeats: - - - {/if} -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
-
- -
-
-
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + +
+
+
From 57aae015f058656908bebf98405aedacaaed27f9 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:32:29 -0400 Subject: [PATCH 10/21] removed unused scripts --- frontend/src/routes/create-goals/+page.svelte | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index 61f33368..a1cc4833 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -49,21 +49,6 @@ console.log(error); } } - - let showModal = false; // Modal state - - const openModal = () => { - showModal = true; - }; - - const closeModal = () => { - showModal = false; - }; - - const handleEdit = () => { - // Handle the edit logic here... - closeModal(); - };
@@ -326,12 +311,13 @@
-
+
{#if goal.days_of_week}
- Days +

Days

+
-
+
- +

Time

+
-
+
- +

Date

+
+ +
From 94b10cf3ba0e76c93ef3117614e6623203c74256 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:37:17 -0400 Subject: [PATCH 11/21] Merge Conflict Fix --- frontend/src/routes/create-goals/+page.svelte | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index c1988bee..a1cc4833 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -359,7 +359,6 @@
-<<<<<<< HEAD
@@ -453,63 +452,6 @@
-======= -
-
-
-
- {#if goal.days_of_week} - Select the Days Your SMART Goal Repeats: - - - {/if} -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
-
- -
-
-
-
-
-
->>>>>>> 8905c2ae0fb652f8cd9676c272f7bc165924b89c
From cb540a79a73405c1b30c7ca2d64888d9056e8ab7 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:46:07 -0400 Subject: [PATCH 12/21] Deleted b/c of errors, will recreate --- .../lib/components/SmartGoalDetails.svelte | 311 ------------------ .../lib/components/TimeAndDateSelector.svelte | 130 -------- 2 files changed, 441 deletions(-) delete mode 100644 frontend/src/lib/components/SmartGoalDetails.svelte delete mode 100644 frontend/src/lib/components/TimeAndDateSelector.svelte diff --git a/frontend/src/lib/components/SmartGoalDetails.svelte b/frontend/src/lib/components/SmartGoalDetails.svelte deleted file mode 100644 index 768e77cf..00000000 --- a/frontend/src/lib/components/SmartGoalDetails.svelte +++ /dev/null @@ -1,311 +0,0 @@ - - -
-
-
-
-
- - - - -
- - {#if loadingGenerate} -
- -
- {/if} -
-
- - -
-
-
-

Specific

-
- - -
-
-
-
- - -
-
-
-

Measurable

-
- - -
-
-
-
- - -
-
-
-

Attainable

-
- - -
-
-
-
- - -
-
-
-

Relevant

-
- - -
-
-
-
- - -
-
-
-

Time-Bound

-
- - -
-
-
-
-
diff --git a/frontend/src/lib/components/TimeAndDateSelector.svelte b/frontend/src/lib/components/TimeAndDateSelector.svelte deleted file mode 100644 index 6c807d7b..00000000 --- a/frontend/src/lib/components/TimeAndDateSelector.svelte +++ /dev/null @@ -1,130 +0,0 @@ - - -
-
-
- -
- -
- -
-
-

You needed more info?

-

Here is a description!

-
-
-
-
-
-
-
- -
-
-
- -
- -
- -
-
-

You needed more info?

-

Here is a description!

-
-
-
-
-
-
-
From 06de4890e08a2078943326d0896599a61dcc78f7 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:46:29 -0400 Subject: [PATCH 13/21] completed --- frontend/src/routes/create-goals/+page.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index a1cc4833..d941f6cf 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -317,7 +317,7 @@ {#if goal.days_of_week}

Days

- +
- + {/if} From 8cacdd0571e6b9c2338d4095c0ca10842d859eda Mon Sep 17 00:00:00 2001 From: Levy Tate <78818969+iLevyTate@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:18:53 -0400 Subject: [PATCH 17/21] Update frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte Co-authored-by: Paul Sanders --- frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte index 20857698..5d0b3082 100644 --- a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte +++ b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte @@ -73,7 +73,6 @@
- {/if} From cf352a769a4cb0a484f7bcdb1b1bbfcc1016edd3 Mon Sep 17 00:00:00 2001 From: Levy Tate <78818969+iLevyTate@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:18:59 -0400 Subject: [PATCH 18/21] Update frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte Co-authored-by: Paul Sanders --- frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte index 5d0b3082..e8351247 100644 --- a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte +++ b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte @@ -28,7 +28,6 @@
- {#if goal.days_of_week}
Days
From 43f62907f43e9228996248ceca9ce7aa44f7f70c Mon Sep 17 00:00:00 2001 From: Levy Tate <78818969+iLevyTate@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:19:16 -0400 Subject: [PATCH 19/21] Update frontend/src/routes/create-goals/+page.svelte Co-authored-by: Paul Sanders --- frontend/src/routes/create-goals/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/routes/create-goals/+page.svelte b/frontend/src/routes/create-goals/+page.svelte index d941f6cf..b222046e 100644 --- a/frontend/src/routes/create-goals/+page.svelte +++ b/frontend/src/routes/create-goals/+page.svelte @@ -280,7 +280,7 @@ + Days +
+
+ +
+ + +
+
- +
+
From cf9ddb7d9c5cc51bb4760f4da109f3823901d3c8 Mon Sep 17 00:00:00 2001 From: iLevyTate <78818969+iLevyTate@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:24:03 -0400 Subject: [PATCH 21/21] Not needed --- .../DaysOfWeekSelectorToggle.svelte | 78 ------------------- 1 file changed, 78 deletions(-) delete mode 100644 frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte diff --git a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte b/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte deleted file mode 100644 index 918d8671..00000000 --- a/frontend/src/lib/components/DaysOfWeekSelectorToggle.svelte +++ /dev/null @@ -1,78 +0,0 @@ - - -
-
-
-
-
- Days -
- -
-
- -
-
-
-