From 77c62f216295707130d28a615867cd1c5ad4eb90 Mon Sep 17 00:00:00 2001 From: judithweng Date: Mon, 26 Aug 2024 22:08:00 -0400 Subject: [PATCH 1/8] adding buttons, need to fix spacing and links --- packages/frontend/layouts/learn_more.vue | 15 ++++++++++----- packages/frontend/pages/home.vue | 14 +++++++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/packages/frontend/layouts/learn_more.vue b/packages/frontend/layouts/learn_more.vue index 6f0c8ae..68ef5dc 100644 --- a/packages/frontend/layouts/learn_more.vue +++ b/packages/frontend/layouts/learn_more.vue @@ -20,12 +20,17 @@ along with this program. If not, see . --> diff --git a/packages/frontend/pages/home.vue b/packages/frontend/pages/home.vue index 03bf465..ceadfcc 100644 --- a/packages/frontend/pages/home.vue +++ b/packages/frontend/pages/home.vue @@ -25,8 +25,14 @@ along with this program. If not, see . -->

Trust and transparancy when you need it most.

-
- **buttons go here** +
+
+ +
+
+ +
@@ -41,7 +47,8 @@ along with this program. If not, see . -->
- **This is where button goes.** +
@@ -56,6 +63,7 @@ along with this program. If not, see . --> -
- - - + - \ No newline at end of file diff --git a/packages/frontend/pages/data_privacy.vue b/packages/frontend/pages/data_privacy.vue new file mode 100644 index 0000000..26366b0 --- /dev/null +++ b/packages/frontend/pages/data_privacy.vue @@ -0,0 +1,33 @@ + + + + + + + + + diff --git a/packages/frontend/pages/home.vue b/packages/frontend/pages/home.vue index ceadfcc..7325b34 100644 --- a/packages/frontend/pages/home.vue +++ b/packages/frontend/pages/home.vue @@ -25,12 +25,10 @@ along with this program. If not, see . -->

Trust and transparancy when you need it most.

-
+
- -
-
- +
@@ -46,10 +44,11 @@ along with this program. If not, see . -->

{{ item.descr }}

-
- +
+
From 0540cf682b8b1cf5ed331bedb83f14b8e5d111ff Mon Sep 17 00:00:00 2001 From: judithweng Date: Tue, 27 Aug 2024 14:58:21 -0400 Subject: [PATCH 4/8] adjusting styles for about page --- packages/frontend/assets/styles/main.scss | 5 +++++ packages/frontend/pages/about.vue | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/frontend/assets/styles/main.scss b/packages/frontend/assets/styles/main.scss index 8916aa8..c5f0fa6 100644 --- a/packages/frontend/assets/styles/main.scss +++ b/packages/frontend/assets/styles/main.scss @@ -115,6 +115,11 @@ h1 { font-weight: 600; line-height: 72px; } + + h2 { + font-size: 40px; + line-height: 60px; + } h3 { diff --git a/packages/frontend/pages/about.vue b/packages/frontend/pages/about.vue index 936ec6e..02ed960 100644 --- a/packages/frontend/pages/about.vue +++ b/packages/frontend/pages/about.vue @@ -36,14 +36,14 @@ along with this program. If not, see . -->
-

Our Mission: Trust Through Transparency

+

Our Mission: Trust Through Transparency

As an open-source organization, GOSQAS prioritizes transparency in all projects. Because we know that openness and clarity build trust and promote wide user adoption, our commitment to Trust Through Transparency (TTT) ensures our initiatives are enacted with integrity and accountability.

-

Our Values

+

Our Values

Data Ownership
Users maintain full ownership of the data generated within the GOSQAS flagship product, Global Distributed Tracking. We do not have access to any user data, ensuring complete privacy and independent ownership.

@@ -85,6 +85,10 @@ export default { .row{ margin-top:32px; } + #subtitle{ + margin-bottom:16px + } + } @@ -96,6 +100,10 @@ export default { .row{ margin-top:32px; } + #subtitle{ + margin-bottom:20px + } + } From 16f38301979cee4afcde86e432afc31df761c6ab Mon Sep 17 00:00:00 2001 From: judithweng Date: Tue, 27 Aug 2024 17:24:17 -0400 Subject: [PATCH 5/8] data and privacy page --- packages/frontend/layouts/learn_more.vue | 2 +- packages/frontend/pages/about.vue | 2 -- packages/frontend/pages/data_privacy.vue | 42 ++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/packages/frontend/layouts/learn_more.vue b/packages/frontend/layouts/learn_more.vue index 7212fc4..0729431 100644 --- a/packages/frontend/layouts/learn_more.vue +++ b/packages/frontend/layouts/learn_more.vue @@ -25,7 +25,7 @@ along with this program. If not, see . --> gosqasystem@gmail.com or visiting the links below.

- diff --git a/packages/frontend/pages/about.vue b/packages/frontend/pages/about.vue index 02ed960..a67a978 100644 --- a/packages/frontend/pages/about.vue +++ b/packages/frontend/pages/about.vue @@ -55,9 +55,7 @@ along with this program. If not, see . --> reinforcing our dedication to community benefit and accessibility.

-
-
diff --git a/packages/frontend/pages/data_privacy.vue b/packages/frontend/pages/data_privacy.vue index 26366b0..1201962 100644 --- a/packages/frontend/pages/data_privacy.vue +++ b/packages/frontend/pages/data_privacy.vue @@ -21,9 +21,21 @@ along with this program. If not, see . --> @@ -31,3 +43,29 @@ along with this program. If not, see . --> import Learn_more from '~/layouts/learn_more.vue'; + + From ae2bc585c4b8bab73f4e9fbab9358ff9ffa5f824 Mon Sep 17 00:00:00 2001 From: judithweng Date: Tue, 27 Aug 2024 17:46:16 -0400 Subject: [PATCH 6/8] change learn more to about us --- packages/frontend/pages/home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/pages/home.vue b/packages/frontend/pages/home.vue index 7325b34..112e5e1 100644 --- a/packages/frontend/pages/home.vue +++ b/packages/frontend/pages/home.vue @@ -45,7 +45,7 @@ along with this program. If not, see . -->
-
From e063c04605d561d6fe8d09dfceabfdeb47ac32a6 Mon Sep 17 00:00:00 2001 From: judithweng Date: Fri, 6 Sep 2024 13:40:43 -0400 Subject: [PATCH 7/8] adding track asset function --- packages/frontend/components/TrackAsset.vue | 70 +++++++++++++++++++++ packages/frontend/pages/home.vue | 36 +++++++++-- 2 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 packages/frontend/components/TrackAsset.vue diff --git a/packages/frontend/components/TrackAsset.vue b/packages/frontend/components/TrackAsset.vue new file mode 100644 index 0000000..32dcde4 --- /dev/null +++ b/packages/frontend/components/TrackAsset.vue @@ -0,0 +1,70 @@ + + + + + + + + + \ No newline at end of file diff --git a/packages/frontend/pages/home.vue b/packages/frontend/pages/home.vue index 112e5e1..4a92de4 100644 --- a/packages/frontend/pages/home.vue +++ b/packages/frontend/pages/home.vue @@ -25,11 +25,16 @@ along with this program. If not, see . -->

Trust and transparancy when you need it most.

-
-
- +
+
+ +
+
+ borderColor="#CCECFD" color="#1E2019" > +
+
@@ -60,9 +65,10 @@ along with this program. If not, see . --> From 6dc4fafa0e6f0f3241afcd20b32608b8b29b2b96 Mon Sep 17 00:00:00 2001 From: judithweng Date: Fri, 6 Sep 2024 18:37:07 -0400 Subject: [PATCH 8/8] changing button font size --- packages/frontend/layouts/learn_more.vue | 6 ++--- packages/frontend/pages/home.vue | 29 ++++++++++++++++-------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/packages/frontend/layouts/learn_more.vue b/packages/frontend/layouts/learn_more.vue index 0729431..e257b21 100644 --- a/packages/frontend/layouts/learn_more.vue +++ b/packages/frontend/layouts/learn_more.vue @@ -26,11 +26,11 @@ along with this program. If not, see . --> or visiting the links below.

+ backgroundColor="#ffffff00" onclick="window.location.href='how_it_works'" style="font-size:18px"> + backgroundColor="#ffffff00" style="font-size:18px"> + backgroundColor="#ffffff00" style="font-size:18px">
diff --git a/packages/frontend/pages/home.vue b/packages/frontend/pages/home.vue index 4a92de4..0918516 100644 --- a/packages/frontend/pages/home.vue +++ b/packages/frontend/pages/home.vue @@ -25,16 +25,17 @@ along with this program. If not, see . -->

Trust and transparancy when you need it most.

-
-
- +
+ + -
- +
+
@@ -50,7 +51,7 @@ along with this program. If not, see . -->
-
@@ -81,17 +82,19 @@ export default { // Function to have the 'Track an asset' input field appear async trackingForm() { let trackAssetDiv = document.getElementById("trackAssetDiv"); - let trackButton = document.getElementById("unclicked"); + let trackButton = document.getElementById("trackButton"); if (!showTrack) { //if showTrack is false showTrack = true; trackAssetDiv.style.visibility="visible"; //make text input available trackButton.style.backgroundColor = "#322253"; + trackButton.style.borderColor = "#322253"; } else { showTrack = false; trackAssetDiv.style.visibility="hidden"; trackButton.style.backgroundColor = "#4E3681"; + trackButton.style.borderColor = "#4E3681"; } }, } @@ -128,6 +131,9 @@ export default { #learn-more{ padding: 40px 30px; } + .button{ + font-size: 18px; + } } @@ -145,6 +151,11 @@ export default { #learn-more{ padding: 70px 126px; } + .button{ + font-size: 20px; + padding: 1px; + + } }