From a285412843e2615dd8ce0b931b2915b143ebf310 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 4 Dec 2024 10:36:33 +0000 Subject: [PATCH 01/59] testing to see if i can push to main from vscode --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 2ada206..b2b057d 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@

hello

+

test 1 2

From 32da372480a44b488fc9f79df60e5b348f51b3eb Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 11:12:33 +0000 Subject: [PATCH 02/59] jamie gay ass --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index b2b057d..20c517b 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,9 @@

hello

test 1 2

+

this is jamies gay ass

+ git config --global user.email "you@example.com" + git config --global user.name "Your Name" From 3d0dcff09ed137d6d9f84ced3d5c9a1f696eafba Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 11:13:58 +0000 Subject: [PATCH 03/59] remove that shi --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index 20c517b..81716b6 100644 --- a/index.html +++ b/index.html @@ -10,8 +10,6 @@

test 1 2

this is jamies gay ass

- git config --global user.email "you@example.com" - git config --global user.name "Your Name" From 857c31b22c21d9a8f1f37071de69653bfa8a0fa2 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 11:14:36 +0000 Subject: [PATCH 04/59] removed jamie gay ass --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index 81716b6..b2b057d 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,6 @@

hello

test 1 2

-

this is jamies gay ass

From 3b086dc363da80de3110ba979197e1195705c323 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 11:29:56 +0000 Subject: [PATCH 05/59] removed test dialoug --- index.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/index.html b/index.html index b2b057d..4fded0c 100644 --- a/index.html +++ b/index.html @@ -6,10 +6,7 @@ Chippie Digital data visualisation -

hello

-

test 1 2

- - + From b83aeca4b8e7f90d7f3623c344c40708a85bfe07 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 12:58:05 +0000 Subject: [PATCH 06/59] landing page --- index.html | 4 +++- stylesheet.css | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 4fded0c..1d2767d 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,8 @@ - +
+

Chippie Digital

+
diff --git a/stylesheet.css b/stylesheet.css index 8b13789..b1e0e03 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -1 +1,60 @@ +/* Define color presets using CSS variables */ +:root { + --deep-blue: #355085; + --blue: #7F9FEB; + --creme: #F4F3E8; + --white: #FEFCFF; + --licorice: #312121; +} + +/* Example application of color presets */ +body { + background-color: var(--creme); /* Set the background to creme */ + color: var(--licorice); /* Use licorice for text */ + font-family: Arial, sans-serif; + margin: 0; + padding: 0; + width: 100%; + height: 100%; +} + +.top-bar { + background-color: var(--deep-blue); /* Deep blue for the top bar */ +} + +.top-bar ul li a { + color: var(--white); /* White for the links in the top bar */ +} + +.top-bar ul li a:hover { + background-color: var(--blue); /* Blue for hover effect */ +} + +p { + color: var(--licorice); /* Licorice for paragraph text */ + background-color: var(--white); /* White background for emphasis */ + padding: 10px; + border: 1px solid var(--blue); /* Blue border for styling */ + border-radius: 5px; /* Rounded corners */ +} + +/* Style for the landing container */ +.landing-container { + display: flex; + justify-content: center; /* Centers horizontally */ + align-items: center; /* Centers vertically */ + height: 100vh; /* Takes full viewport height */ + background: linear-gradient(to bottom right, #355085, #7F9FEB); /* Gradient background */ + color: #F4F3E8; /* Cream text color */ + text-align: center; /* Center the text */ +} + +/* Style for the title */ +.landing-title { + font-size: 5rem; /* Large font size */ + font-weight: bold; /* Bold text */ + font-family: 'Arial', sans-serif; /* Clean, readable font */ + text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); /* Subtle shadow for depth */ + margin: 0; +} \ No newline at end of file From 5bf1cfa075a788dcda62050a7e74e3f75333d908 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 12:59:11 +0000 Subject: [PATCH 07/59] minor change --- stylesheet.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylesheet.css b/stylesheet.css index b1e0e03..6ea7c19 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -52,7 +52,7 @@ p { /* Style for the title */ .landing-title { - font-size: 5rem; /* Large font size */ + font-size: 8rem; /* Large font size */ font-weight: bold; /* Bold text */ font-family: 'Arial', sans-serif; /* Clean, readable font */ text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); /* Subtle shadow for depth */ From 3963e2e9a17c7e4f9a6b02859817a9390a875e1e Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 13:06:05 +0000 Subject: [PATCH 08/59] button reallignment, css to be changed --- index.html | 11 +++++----- stylesheet.css | 59 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/index.html b/index.html index 1d2767d..6a8286a 100644 --- a/index.html +++ b/index.html @@ -3,15 +3,16 @@ - Chippie Digital data visualisation + Chippie Digital Data Visualisation - - -
-

Chippie Digital

+

Chippy Digital

+
+ + +
diff --git a/stylesheet.css b/stylesheet.css index 6ea7c19..1ace060 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -39,22 +39,55 @@ p { border-radius: 5px; /* Rounded corners */ } -/* Style for the landing container */ +/* Center the landing container */ .landing-container { display: flex; - justify-content: center; /* Centers horizontally */ - align-items: center; /* Centers vertically */ - height: 100vh; /* Takes full viewport height */ - background: linear-gradient(to bottom right, #355085, #7F9FEB); /* Gradient background */ - color: #F4F3E8; /* Cream text color */ - text-align: center; /* Center the text */ + flex-direction: column; /* Stack items vertically */ + justify-content: center; /* Center vertically */ + align-items: center; /* Center horizontally */ + height: 100vh; /* Full viewport height */ + background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); /* Gradient background */ + color: var(--creme); /* Text color */ + text-align: center; /* Center-align text */ } /* Style for the title */ .landing-title { - font-size: 8rem; /* Large font size */ - font-weight: bold; /* Bold text */ - font-family: 'Arial', sans-serif; /* Clean, readable font */ - text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); /* Subtle shadow for depth */ - margin: 0; -} \ No newline at end of file + font-size: 8rem; /* Large font size */ + font-weight: bold; /* Bold text */ + text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); /* Subtle shadow */ + margin-bottom: 30px; /* Space between title and buttons */ +} + +/* Container for buttons */ +.button-container { + display: flex; + gap: 20px; /* Space between buttons */ +} + +/* Styling for the buttons */ +.large-button { + padding: 15px 30px; /* Large clickable area */ + font-size: 1.5rem; /* Bigger text */ + font-weight: bold; /* Bold text */ + color: var(--white); /* White text */ + background-color: var(--deep-blue); /* Deep blue background */ + border: none; /* Removes border */ + border-radius: 10px; /* Rounded corners */ + box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.2); /* Subtle shadow */ + cursor: pointer; /* Pointer cursor on hover */ + transition: all 0.3s ease; /* Smooth hover effect */ +} + +/* Hover effect for buttons */ +.large-button:hover { + background-color: var(--blue); /* Lighter blue on hover */ + transform: scale(1.05); /* Slightly enlarge on hover */ +} + +/* Active button effect */ +.large-button:active { + transform: scale(0.95); /* Slightly shrink when clicked */ + box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); /* Adjust shadow */ +} + From 02f27afb39bfa7a397b7f1b5ff7fc726cd89c35f Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 13:14:15 +0000 Subject: [PATCH 09/59] cleaning --- index.html | 4 +-- stylesheet.css | 91 +++++++++++++++++++------------------------------- 2 files changed, 37 insertions(+), 58 deletions(-) diff --git a/index.html b/index.html index 6a8286a..eb38a9b 100644 --- a/index.html +++ b/index.html @@ -10,8 +10,8 @@

Chippy Digital

- - + +
diff --git a/stylesheet.css b/stylesheet.css index 1ace060..0029915 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -1,17 +1,16 @@ -/* Define color presets using CSS variables */ -:root { +/* colour pallete */ +:root{ --deep-blue: #355085; --blue: #7F9FEB; --creme: #F4F3E8; --white: #FEFCFF; --licorice: #312121; } - -/* Example application of color presets */ +/* body styling*/ body { - background-color: var(--creme); /* Set the background to creme */ - color: var(--licorice); /* Use licorice for text */ + background-color: var(--creme); + color: var(--licorice); font-family: Arial, sans-serif; margin: 0; padding: 0; @@ -19,75 +18,55 @@ body { height: 100%; } -.top-bar { - background-color: var(--deep-blue); /* Deep blue for the top bar */ -} - -.top-bar ul li a { - color: var(--white); /* White for the links in the top bar */ -} - -.top-bar ul li a:hover { - background-color: var(--blue); /* Blue for hover effect */ -} - -p { - color: var(--licorice); /* Licorice for paragraph text */ - background-color: var(--white); /* White background for emphasis */ - padding: 10px; - border: 1px solid var(--blue); /* Blue border for styling */ - border-radius: 5px; /* Rounded corners */ -} - /* Center the landing container */ .landing-container { display: flex; - flex-direction: column; /* Stack items vertically */ - justify-content: center; /* Center vertically */ - align-items: center; /* Center horizontally */ - height: 100vh; /* Full viewport height */ - background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); /* Gradient background */ - color: var(--creme); /* Text color */ - text-align: center; /* Center-align text */ + flex-direction: column; + justify-content: center; + align-items: center; + height: 100vh; + background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); + color: var(--creme); + text-align: center; } -/* Style for the title */ +/* title */ .landing-title { - font-size: 8rem; /* Large font size */ - font-weight: bold; /* Bold text */ - text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); /* Subtle shadow */ - margin-bottom: 30px; /* Space between title and buttons */ + font-size: 8rem; + font-weight: bold; + text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); + margin-bottom: 30px; } /* Container for buttons */ .button-container { display: flex; - gap: 20px; /* Space between buttons */ + gap: 20px; } /* Styling for the buttons */ -.large-button { - padding: 15px 30px; /* Large clickable area */ - font-size: 1.5rem; /* Bigger text */ - font-weight: bold; /* Bold text */ - color: var(--white); /* White text */ - background-color: var(--deep-blue); /* Deep blue background */ - border: none; /* Removes border */ - border-radius: 10px; /* Rounded corners */ - box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.2); /* Subtle shadow */ - cursor: pointer; /* Pointer cursor on hover */ - transition: all 0.3s ease; /* Smooth hover effect */ +.button { + padding: 15px 30px; + font-size: 1.5rem; + font-weight: bold; + color: var(--white); + background-color: var(--deep-blue); + border: none; + border-radius: 10px; + box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.2); + cursor: pointer; + transition: all 0.3s ease; } /* Hover effect for buttons */ -.large-button:hover { - background-color: var(--blue); /* Lighter blue on hover */ - transform: scale(1.05); /* Slightly enlarge on hover */ +.button:hover { + background-color: var(--blue); + transform: scale(1.05); } /* Active button effect */ -.large-button:active { - transform: scale(0.95); /* Slightly shrink when clicked */ - box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); /* Adjust shadow */ +.button:active { + transform: scale(0.95); + box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); } From 7c920914d30969409053c49c80640106707e2713 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 5 Dec 2024 13:22:40 +0000 Subject: [PATCH 10/59] gradient fix --- stylesheet.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stylesheet.css b/stylesheet.css index 0029915..5892c53 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -7,15 +7,17 @@ --white: #FEFCFF; --licorice: #312121; } + /* body styling*/ -body { +html, body { background-color: var(--creme); - color: var(--licorice); font-family: Arial, sans-serif; margin: 0; padding: 0; width: 100%; height: 100%; + background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); + } /* Center the landing container */ @@ -24,18 +26,17 @@ body { flex-direction: column; justify-content: center; align-items: center; - height: 100vh; - background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); + height: 90vh; color: var(--creme); text-align: center; } /* title */ .landing-title { - font-size: 8rem; + font-size: 8.5rem; font-weight: bold; text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); - margin-bottom: 30px; + /* margin-bottom: 30px; */ } /* Container for buttons */ From 7c4ddadba7f7db38be1310ddedf4acd5f484fdc9 Mon Sep 17 00:00:00 2001 From: Joseph Howarth Date: Thu, 5 Dec 2024 15:13:46 +0000 Subject: [PATCH 11/59] procrastinating at this point --- comparison.html | 12 ++++++++++++ index.html | 1 + masterStyleSheet.css | 8 ++++++++ profileDefault.html | 12 ++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 comparison.html create mode 100644 masterStyleSheet.css create mode 100644 profileDefault.html diff --git a/comparison.html b/comparison.html new file mode 100644 index 0000000..3e89cdc --- /dev/null +++ b/comparison.html @@ -0,0 +1,12 @@ + + + + + + Comparison + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index eb38a9b..bd50666 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,7 @@ Chippie Digital Data Visualisation +
diff --git a/masterStyleSheet.css b/masterStyleSheet.css new file mode 100644 index 0000000..37904a1 --- /dev/null +++ b/masterStyleSheet.css @@ -0,0 +1,8 @@ +/* colour pallete */ +:root{ + --deep-blue: #355085; + --blue: #7F9FEB; + --creme: #F4F3E8; + --white: #FEFCFF; + --licorice: #312121; +} diff --git a/profileDefault.html b/profileDefault.html new file mode 100644 index 0000000..f01fa6b --- /dev/null +++ b/profileDefault.html @@ -0,0 +1,12 @@ + + + + + + profile default + + + + + + \ No newline at end of file From eae1430818354b2f7a92c7c22d5f3ee9878b5f90 Mon Sep 17 00:00:00 2001 From: Joseph Howarth Date: Thu, 5 Dec 2024 15:19:25 +0000 Subject: [PATCH 12/59] linking --- comparison.html | 2 +- index.html | 4 ++-- profileDefault.html | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/comparison.html b/comparison.html index 3e89cdc..e0c1af7 100644 --- a/comparison.html +++ b/comparison.html @@ -7,6 +7,6 @@ - + Back to Home \ No newline at end of file diff --git a/index.html b/index.html index bd50666..5499230 100644 --- a/index.html +++ b/index.html @@ -11,8 +11,8 @@

Chippy Digital

- - + Profiles + Comparisons
diff --git a/profileDefault.html b/profileDefault.html index f01fa6b..aa0f342 100644 --- a/profileDefault.html +++ b/profileDefault.html @@ -8,5 +8,8 @@ + Back to Home + + \ No newline at end of file From ede00beb229c8046122b1959d21e3582d1d031f6 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 22:26:02 +0000 Subject: [PATCH 13/59] css cleanup (display flex and max width} --- index.html | 3 ++- profileDefault.html | 4 +--- stylesheet.css | 19 ++++++++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 5499230..54a4bc5 100644 --- a/index.html +++ b/index.html @@ -11,8 +11,9 @@

Chippy Digital

diff --git a/profileDefault.html b/profileDefault.html index aa0f342..03655c9 100644 --- a/profileDefault.html +++ b/profileDefault.html @@ -8,8 +8,6 @@ - Back to Home - - + Back to Home \ No newline at end of file diff --git a/stylesheet.css b/stylesheet.css index 5892c53..383dd9d 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -10,7 +10,8 @@ /* body styling*/ html, body { - background-color: var(--creme); + display: flex; + flex-wrap: wrap; font-family: Arial, sans-serif; margin: 0; padding: 0; @@ -22,13 +23,12 @@ html, body { /* Center the landing container */ .landing-container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - height: 90vh; + max-width: fit-content; + margin-left: auto; + margin-right: auto; + position: relative; + align-self: center; color: var(--creme); - text-align: center; } /* title */ @@ -42,11 +42,16 @@ html, body { /* Container for buttons */ .button-container { display: flex; + + max-width: fit-content; + margin-left: auto; + margin-right: auto; gap: 20px; } /* Styling for the buttons */ .button { + text-decoration: none; padding: 15px 30px; font-size: 1.5rem; font-weight: bold; From 9e675ec2a833fa923e9d1cd17b7d051acc1ba4f3 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 22:31:05 +0000 Subject: [PATCH 14/59] removed extra metrics page --- index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/index.html b/index.html index 54a4bc5..5499230 100644 --- a/index.html +++ b/index.html @@ -11,9 +11,8 @@

Chippy Digital

From 87270b74f7f8ffcdfd57a8a3f99d44c3a6f10a95 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 22:34:19 +0000 Subject: [PATCH 15/59] removed extra space --- stylesheet.css | 1 - 1 file changed, 1 deletion(-) diff --git a/stylesheet.css b/stylesheet.css index 383dd9d..3b9916d 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -42,7 +42,6 @@ html, body { /* Container for buttons */ .button-container { display: flex; - max-width: fit-content; margin-left: auto; margin-right: auto; From e7b79369be8f2ce41e1e3c499f08e84f63be8c38 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 23:19:03 +0000 Subject: [PATCH 16/59] adding top bar in comparisons page --- comparison.html | 14 +++++++++++++- stylesheet.css | 24 ++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/comparison.html b/comparison.html index e0c1af7..f859203 100644 --- a/comparison.html +++ b/comparison.html @@ -1,12 +1,24 @@ + + + Chippie Digital Data Visualisation + + + Comparison - Back to Home +
+ Home + News + Contact + About +
+ \ No newline at end of file diff --git a/stylesheet.css b/stylesheet.css index 3b9916d..4288eeb 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -13,8 +13,6 @@ html, body { display: flex; flex-wrap: wrap; font-family: Arial, sans-serif; - margin: 0; - padding: 0; width: 100%; height: 100%; background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); @@ -75,3 +73,25 @@ html, body { box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); } +/* top nav */ +.topnav { + background-color: #2b2b2bc9; + overflow: hidden; +} +.topnav a { + float: left; + color: #2b2b2bc9; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; +} +.topnav a:hover { + background-color: #ddd; + color: black; +} + /* Add a color to the active/current link */ +.topnav a.active { + background-color: #04AA6D; + color: white; +} \ No newline at end of file From f9f17a158d90c8d9b96266800573a77d4e1859b5 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 23:44:25 +0000 Subject: [PATCH 17/59] making a top bar in comparison --- comparison.html | 7 ++----- stylesheet.css | 9 +++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/comparison.html b/comparison.html index f859203..47ef31f 100644 --- a/comparison.html +++ b/comparison.html @@ -13,12 +13,9 @@ -
- Home + - \ No newline at end of file diff --git a/stylesheet.css b/stylesheet.css index 4288eeb..885bd62 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -75,8 +75,13 @@ html, body { /* top nav */ .topnav { - background-color: #2b2b2bc9; - overflow: hidden; + position: fixed; + top: 0; + left: 0; + z-index: 999; + width: 100%; + height: 23px; + flex-direction: column; } .topnav a { float: left; From a727b12f850e4d00b3b9710b6a25f1e3a7a1fddc Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Thu, 5 Dec 2024 23:53:58 +0000 Subject: [PATCH 18/59] removed unnecessary stylesheet link --- comparison.html | 2 -- index.html | 2 -- 2 files changed, 4 deletions(-) diff --git a/comparison.html b/comparison.html index 47ef31f..523b025 100644 --- a/comparison.html +++ b/comparison.html @@ -2,10 +2,8 @@ - Chippie Digital Data Visualisation - diff --git a/index.html b/index.html index 5499230..1e83dcf 100644 --- a/index.html +++ b/index.html @@ -2,10 +2,8 @@ - Chippie Digital Data Visualisation -
From eafcf4464c897b2c335649fc9d096189a9aa41fb Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Fri, 6 Dec 2024 01:01:49 +0000 Subject: [PATCH 19/59] latest change --- index.html | 4 +- stylesheet.css | 112 ++++++++++++++++--------------------------------- 2 files changed, 37 insertions(+), 79 deletions(-) diff --git a/index.html b/index.html index 1e83dcf..82ceb37 100644 --- a/index.html +++ b/index.html @@ -9,8 +9,8 @@

Chippy Digital

- Profiles - Comparisons + +
diff --git a/stylesheet.css b/stylesheet.css index 885bd62..f7a8ab2 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -1,6 +1,4 @@ - -/* colour pallete */ -:root{ +:root { --deep-blue: #355085; --blue: #7F9FEB; --creme: #F4F3E8; @@ -8,95 +6,55 @@ --licorice: #312121; } -/* body styling*/ -html, body { - display: flex; - flex-wrap: wrap; - font-family: Arial, sans-serif; - width: 100%; - height: 100%; +body { + font-family: Arial, Helvetica, sans-serif; + color: var(--creme); background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); - -} - -/* Center the landing container */ -.landing-container { - max-width: fit-content; - margin-left: auto; - margin-right: auto; - position: relative; - align-self: center; - color: var(--creme); + text-align: center; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + height: 100vh; + margin: 0; } -/* title */ .landing-title { - font-size: 8.5rem; + margin-bottom: 20px; + font-size: 8rem; font-weight: bold; text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.3); - /* margin-bottom: 30px; */ } -/* Container for buttons */ .button-container { - display: flex; - max-width: fit-content; - margin-left: auto; - margin-right: auto; + display: flex; + justify-content: center; gap: 20px; + margin-top: 20px; } -/* Styling for the buttons */ -.button { - text-decoration: none; - padding: 15px 30px; - font-size: 1.5rem; - font-weight: bold; +.button-2 { + text-decoration: none; + font-weight: bold; + font-size: 20px; color: var(--white); - background-color: var(--deep-blue); - border: none; - border-radius: 10px; - box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.2); - cursor: pointer; - transition: all 0.3s ease; -} - -/* Hover effect for buttons */ -.button:hover { - background-color: var(--blue); - transform: scale(1.05); + background-color: var(--deep-blue); + border: none; + border-radius: 10px; + box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.2); + cursor: pointer; + transition: all 0.3s ease; + padding: 15px 32px; } -/* Active button effect */ -.button:active { - transform: scale(0.95); - box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); +/* hover effect for buttons */ +.button-2:hover { + background-color: var(--blue); + transform: scale(1.05); } -/* top nav */ -.topnav { - position: fixed; - top: 0; - left: 0; - z-index: 999; - width: 100%; - height: 23px; - flex-direction: column; -} -.topnav a { - float: left; - color: #2b2b2bc9; - text-align: center; - padding: 14px 16px; - text-decoration: none; - font-size: 17px; +/* active button effect */ +.button-2:active { + transform: scale(0.95); + box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); } -.topnav a:hover { - background-color: #ddd; - color: black; -} - /* Add a color to the active/current link */ -.topnav a.active { - background-color: #04AA6D; - color: white; -} \ No newline at end of file From deed12ddfa25224b4d102be841bf7759a58bd9f9 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Fri, 6 Dec 2024 01:14:56 +0000 Subject: [PATCH 20/59] latest changes to css --- comparison.html | 13 +++++-------- index.html | 4 ++-- stylesheet.css | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/comparison.html b/comparison.html index 523b025..056a127 100644 --- a/comparison.html +++ b/comparison.html @@ -4,16 +4,13 @@ Chippie Digital Data Visualisation - - - - Comparison - - \ No newline at end of file diff --git a/index.html b/index.html index 82ceb37..b192cc3 100644 --- a/index.html +++ b/index.html @@ -9,8 +9,8 @@

Chippy Digital

- - + +
diff --git a/stylesheet.css b/stylesheet.css index f7a8ab2..e90fae0 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -6,17 +6,20 @@ --licorice: #312121; } -body { +.landing-container { font-family: Arial, Helvetica, sans-serif; color: var(--creme); background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); - text-align: center; display: flex; flex-direction: column; justify-content: center; align-items: center; - height: 100vh; - margin: 0; + position:fixed; + width:100%; + height:100%; + top:0px; + left:0px; + z-index:1000; } .landing-title { @@ -58,3 +61,26 @@ body { transform: scale(0.95); box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); } + + +.topnav { + overflow: hidden; + background-color: #333; + margin: 0; +} +.topnav a { + float: left; + color: #f2f2f2; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; +} +.topnav a:hover { + background-color: #ddd; + color: black; +} +.topnav a.active { + background-color: #04AA6D; + color: white; +} From 78766beb8fe06a10b38049e69880e39a65bcf9d4 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Fri, 6 Dec 2024 01:40:08 +0000 Subject: [PATCH 21/59] top bar --- comparison.html | 13 +++++++----- stylesheet.css | 53 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/comparison.html b/comparison.html index 056a127..f96abc1 100644 --- a/comparison.html +++ b/comparison.html @@ -7,10 +7,13 @@
- Home - News - Contact - About -
+

Chippy Digital

+ +
\ No newline at end of file diff --git a/stylesheet.css b/stylesheet.css index e90fae0..daa66be 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -62,25 +62,52 @@ box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); } - +/* Title inside topnav */ .topnav { + display: flex; + align-items: center; + + position: fixed; + top: 0; + left: 0; + width: 100%; + background-color: var(--deep-blue); + color: var(--creme); + padding: 10px 20px; + box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2); + z-index: 1000; overflow: hidden; - background-color: #333; +} + +/* Title inside topnav */ +.topnav p { margin: 0; -} + font-size: 1.5rem; + font-weight: bold; + color: var(--creme); +} + +/* Links inside topnav */ .topnav a { - float: left; - color: #f2f2f2; - text-align: center; - padding: 14px 16px; + color: var(--creme); text-decoration: none; - font-size: 17px; + float: right; + padding: 11px 14px; + font-size: 1rem; + transition: background-color 0.3s ease, color 0.3s ease; + border-radius: 5px; } + +/* Hover effects for links */ .topnav a:hover { - background-color: #ddd; - color: black; -} + background-color: var(--blue); + color: var(--white); +} + +/* Active link styling */ .topnav a.active { - background-color: #04AA6D; - color: white; + background-color: var(--white); + color: var(--deep-blue); } + + From 3bf37fa38adae053de8706c5b3483a9489bedc7a Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Fri, 6 Dec 2024 07:33:57 +0000 Subject: [PATCH 22/59] comparisons semi-complete --- comparison.html | 85 ++++++++++++++++++++++++++++++++++++++++++++----- stylesheet.css | 54 +++++++++++++++++++++++++------ 2 files changed, 122 insertions(+), 17 deletions(-) diff --git a/comparison.html b/comparison.html index f96abc1..70a1b62 100644 --- a/comparison.html +++ b/comparison.html @@ -1,19 +1,88 @@ + Chippie Digital Data Visualisation -
-

Chippy Digital

- + + + + \ No newline at end of file diff --git a/stylesheet.css b/stylesheet.css index daa66be..3b2b8d9 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -39,13 +39,7 @@ .button-2 { text-decoration: none; font-weight: bold; - font-size: 20px; - color: var(--white); - background-color: var(--deep-blue); - border: none; - border-radius: 10px; - box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.2); - cursor: pointer; + font-size: 20px;margin: 0; transition: all 0.3s ease; padding: 15px 32px; } @@ -65,8 +59,7 @@ /* Title inside topnav */ .topnav { display: flex; - align-items: center; - + align-items: center; position: fixed; top: 0; left: 0; @@ -79,6 +72,10 @@ overflow: hidden; } +/* Page layout */ +.page-layout { + margin: 0; +} /* Title inside topnav */ .topnav p { margin: 0; @@ -110,4 +107,43 @@ color: var(--deep-blue); } +.sidebar { + margin: 0; + padding: 0; + margin-top: 59px; + width: 350px; + background-color: var(--deep-blue); + position: fixed; + height: 100%; + overflow: auto; +} + + + +.sidebar a { + display: block; + color: black; + padding: 16px; + text-decoration: none; +} + +.sidebar a.active { + background-color: #000000; + color: white; +} + +.sidebar a:hover:not(.active) { + background-color: #555; + color: white; +} + +/* Main content */ +.main-content { + height: 70vh; + width: 70vh; + padding-left: 60vh; + padding-top: 10vh; + margin: 0 +} + From 72121ef13f268a74abcecece57c8ac6d066978e4 Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Fri, 6 Dec 2024 08:34:12 +0000 Subject: [PATCH 23/59] latest compaarison edits --- comparison.html | 56 ++++++++++++++++++++++++++++++++++----------- stylesheet.css | 61 +++++++++++++++++++------------------------------ 2 files changed, 66 insertions(+), 51 deletions(-) diff --git a/comparison.html b/comparison.html index 70a1b62..81f8cda 100644 --- a/comparison.html +++ b/comparison.html @@ -13,25 +13,29 @@

Chippy Digital

-
- + +
+
+
-
-
- -
-
- -
-
- -
+
+
-
- +
+
+ +
+ +
diff --git a/index.html b/index.html index b192cc3..0b704c3 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@

Chippy Digital

- +
diff --git a/profileDefault.html b/profileDefault.html index 03655c9..2fdb223 100644 --- a/profileDefault.html +++ b/profileDefault.html @@ -1,13 +1,111 @@ + - - profile default - + Chippie Digital Data Visualisation + +
+
+

Chippy Digital

+ +
+
+
+
+
One
+
Two
+
Three
has
extra
text
+
+
+ +
+
+
+
- Back to Home + + + + \ No newline at end of file diff --git a/stylesheet.css b/stylesheet.css index c3cce60..925fb5b 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -52,8 +52,8 @@ box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); } /* Page layout */ -.page-layout { - margin: 0; +.body-container{ + display: flex; } /* Title inside topnav */ @@ -122,7 +122,7 @@ .main-content { height: 70vh; width: 70vh; - padding-left: 70vh; + display: flex; padding-top: 10vh; margin: 0 @@ -130,5 +130,15 @@ canvas { padding-bottom: 10vh; } +.box > * { + border: 2px solid rgb(96 139 168); + border-radius: 50px; +} +.box { + + display: flex; + margin: 10px; + gap: 10px; +} From f3b017d7f1f9dbeb47c85111a75a22663e05d49b Mon Sep 17 00:00:00 2001 From: Katie Date: Mon, 9 Dec 2024 12:16:21 +0000 Subject: [PATCH 25/59] katie test --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 0b704c3..e44ae60 100644 --- a/index.html +++ b/index.html @@ -13,5 +13,8 @@

Chippy Digital

+

katie

+git config --global user.email "you@example.com" +git config --global user.name "Your Name" \ No newline at end of file From 84c554d541dedb92cd4c3b1bd96ef5701b948097 Mon Sep 17 00:00:00 2001 From: Freya Date: Mon, 9 Dec 2024 12:17:31 +0000 Subject: [PATCH 26/59] frayer change --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index 0b704c3..8a4b7aa 100644 --- a/index.html +++ b/index.html @@ -13,5 +13,7 @@

Chippy Digital

+

my name is frayer

+ From ae780651452aa7dc7b7d7e820beb51272ca4a2d2 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 9 Dec 2024 12:21:38 +0000 Subject: [PATCH 27/59] joe test 2 --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 0b704c3..05e2978 100644 --- a/index.html +++ b/index.html @@ -13,5 +13,8 @@

Chippy Digital

+ + +

joe test upload

From 2cf20f007413ba07972fd638391ab1bd82f34bed Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 9 Dec 2024 12:23:46 +0000 Subject: [PATCH 28/59] undo joe change --- index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/index.html b/index.html index 05e2978..0b704c3 100644 --- a/index.html +++ b/index.html @@ -13,8 +13,5 @@

Chippy Digital

- - -

joe test upload

From 5de542e90b36513887cfab894dc4608cadd1a584 Mon Sep 17 00:00:00 2001 From: Katie Date: Mon, 9 Dec 2024 12:33:59 +0000 Subject: [PATCH 29/59] katie --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index e44ae60..b58992d 100644 --- a/index.html +++ b/index.html @@ -16,5 +16,3 @@

Chippy Digital

katie

-git config --global user.email "you@example.com" -git config --global user.name "Your Name" \ No newline at end of file From 4ceab7735f7d51f38b7e7c437acf9e41b80d3922 Mon Sep 17 00:00:00 2001 From: freya Date: Mon, 9 Dec 2024 12:35:36 +0000 Subject: [PATCH 30/59] freya --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index 8a4b7aa..f67bcf9 100644 --- a/index.html +++ b/index.html @@ -14,6 +14,5 @@

Chippy Digital

my name is frayer

- From cf860650edabadc6d917f18879cb773785174b8c Mon Sep 17 00:00:00 2001 From: freya Date: Mon, 9 Dec 2024 12:43:09 +0000 Subject: [PATCH 31/59] undo freya --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index f67bcf9..0b704c3 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,5 @@

Chippy Digital

-

my name is frayer

From 823bdac4e5e801a64eb3404d28a9f2c607e6db93 Mon Sep 17 00:00:00 2001 From: Katie Date: Mon, 9 Dec 2024 12:52:03 +0000 Subject: [PATCH 32/59] undo katie --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index b58992d..0b704c3 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,5 @@

Chippy Digital

-

katie

From d0149c8b129d90acab05f259a8a536b6e42699ce Mon Sep 17 00:00:00 2001 From: Katie Date: Mon, 9 Dec 2024 13:02:56 +0000 Subject: [PATCH 33/59] colours on landing container --- stylesheet.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stylesheet.css b/stylesheet.css index 925fb5b..8088ca7 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -8,8 +8,8 @@ .landing-container { font-family: Arial, Helvetica, sans-serif; - color: var(--creme); - background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); + color: var(--deep-blue); + background: linear-gradient(to bottom right, var(--blue), var(--blue)); display: flex; flex-direction: column; justify-content: center; From 23b109db2cbda00e2687d44ebc620b562764b1e1 Mon Sep 17 00:00:00 2001 From: Katie Date: Mon, 9 Dec 2024 13:04:03 +0000 Subject: [PATCH 34/59] undo --- stylesheet.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stylesheet.css b/stylesheet.css index 8088ca7..efff425 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -8,8 +8,8 @@ .landing-container { font-family: Arial, Helvetica, sans-serif; - color: var(--deep-blue); - background: linear-gradient(to bottom right, var(--blue), var(--blue)); + color: var(--cream); + background: linear-gradient(to bottom right, var(--deep-blue), var(--blue)); display: flex; flex-direction: column; justify-content: center; From ad8bc6d0574d4df60466245599e75513cd2c6771 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 12 Dec 2024 11:39:00 +0000 Subject: [PATCH 35/59] comp2added --- comp2.html | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 comp2.html diff --git a/comp2.html b/comp2.html new file mode 100644 index 0000000..9e12c92 --- /dev/null +++ b/comp2.html @@ -0,0 +1,82 @@ + + + + + + charts + + + + + + + + +
+
+

navbar

+
+ +
+
+
+
+
+ + +
+ +
+ + + + + From f7402d0731db286e3d977d9b44de7e404997b054 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 12 Dec 2024 11:40:15 +0000 Subject: [PATCH 36/59] stylesheet for comp 2 addded --- style.css | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 style.css diff --git a/style.css b/style.css new file mode 100644 index 0000000..c9ee1ec --- /dev/null +++ b/style.css @@ -0,0 +1,69 @@ +@import url(https://fonts.googleapis.com/css?family=Open+Sans); +html, +body { + font-family: 'Montserrat', sans-serif; + margin: 0; + padding: 0; + height: 100%; +} +.wrapper { + height: 100%; + display: flex; + flex-direction: column; + text-align: center; + overflow: hidden; +} + +.main-content { + display: flex; + flex-flow: row wrap; + height: 100%; +} +.main-content > * { + flex: 1 100%; + margin: 1px; +} +.header { + background-color: aqua; +} +.footer { + background-color: aquamarine; + margin-top: auto; +} +.main { + flex: 3; + order: 2; + display: flex; + flex-direction: column; /* Stack elements vertically */ + justify-content: flex-start; /* Align content to the top */ +} + +.sidebar1 { + background-color: blue; +} +.sidebar2 { + background-color: firebrick; +} + +.sidebar { + flex: 1; +} +@media screen and (min-width:750px) { + .main { + flex: 3; + order: 2; + } + .sidebar1 { + order: 1; + } + .sidebar2 { + order: 3; + } + +} + +@media screen and (min-width:600px){ + .sidebar { + flex: 1; + } +} From 38dd8f7ff835d658a7bc378849a3228eace7bc2d Mon Sep 17 00:00:00 2001 From: freya Date: Thu, 12 Dec 2024 12:17:05 +0000 Subject: [PATCH 37/59] f test --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 0b704c3..c60a6f3 100644 --- a/index.html +++ b/index.html @@ -13,5 +13,6 @@

Chippy Digital

+ From a5a24cf5ca179094a21c5ca80e9f3f7d91a7170d Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 12 Dec 2024 12:54:46 +0000 Subject: [PATCH 38/59] test data added to github --- .../another test/.vscode/settings.json | 3 + another test/another test/charts.js | 100 ++++++++++++++++++ another test/another test/data.js | 8 ++ another test/another test/forumbox.js | 1 + another test/another test/index.html | 82 ++++++++++++++ another test/another test/style.css | 69 ++++++++++++ 6 files changed, 263 insertions(+) create mode 100644 another test/another test/.vscode/settings.json create mode 100644 another test/another test/charts.js create mode 100644 another test/another test/data.js create mode 100644 another test/another test/forumbox.js create mode 100644 another test/another test/index.html create mode 100644 another test/another test/style.css diff --git a/another test/another test/.vscode/settings.json b/another test/another test/.vscode/settings.json new file mode 100644 index 0000000..6f3a291 --- /dev/null +++ b/another test/another test/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/another test/another test/charts.js b/another test/another test/charts.js new file mode 100644 index 0000000..7865d60 --- /dev/null +++ b/another test/another test/charts.js @@ -0,0 +1,100 @@ +// Chart Configuration +Highcharts.chart('container', { + chart: { + zoomType: 'xy' + }, + title: { + text: 'Metrics' + }, + xAxis: { + categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] + }, + yAxis: [{ + // Primary yAxis (Column and Line Data) + labels: { + format: '{value}°C', + style: { + color: Highcharts.getOptions().colors[1] + } + }, + title: { + text: 'Tempearature', + style: { + color: Highcharts.getOptions().colors[1] + } + } + }, { + // Secondary yAxis (Pie Data) + title: { + text: 'Precipitation', + style: { + color: Highcharts.getOptions().colors[0] + } + }, + labels: { + format: '{value} mm', + style: { + color: Highcharts.getOptions().colors[0] + } + }, + opposite: true + }], + tooltip: { + shared: true + }, + legend: { + layout: 'vertical', + align: 'left', + x: 80, + verticalAlign: 'top', + y: 55, + floating: true, + backgroundColor: + Highcharts.defaultOptions.legend.backgroundColor || 'rgba(255,255,255,0.25)' + }, + series: [{ + type: 'column', + name: 'Rainfall', + data: [49.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4], + tooltip: { + valueSuffix: ' mm' + } + }, { + type: 'spline', + name: 'Temperature', + data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6], + tooltip: { + valueSuffix: '°C' + } + }, { + type: 'pie', + name: 'Total Precipitation', + data: [{ + name: 'January', + y: 49.9, + color: Highcharts.getOptions().colors[0] // Rainfall color + }, { + name: 'February', + y: 71.5, + color: Highcharts.getOptions().colors[1] // Temperature color + }, { + name: 'March', + y: 106.4, + color: Highcharts.getOptions().colors[2] + }, { + name: 'April', + y: 129.2, + color: Highcharts.getOptions().colors[3] + }, { + name: 'May', + y: 144.0, + color: Highcharts.getOptions().colors[4] + }], + center: [100, 80], + size: 100, + showInLegend: false, + dataLabels: { + enabled: false + } + }] +}); diff --git a/another test/another test/data.js b/another test/another test/data.js new file mode 100644 index 0000000..049a74e --- /dev/null +++ b/another test/another test/data.js @@ -0,0 +1,8 @@ +export const datasets = { + temperature: { + name: 'Temperature', + unit: '°C', + data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6], + }, + // add other data + }; \ No newline at end of file diff --git a/another test/another test/forumbox.js b/another test/another test/forumbox.js new file mode 100644 index 0000000..7c38ddb --- /dev/null +++ b/another test/another test/forumbox.js @@ -0,0 +1 @@ +// read data from user and push it to data.js \ No newline at end of file diff --git a/another test/another test/index.html b/another test/another test/index.html new file mode 100644 index 0000000..9e12c92 --- /dev/null +++ b/another test/another test/index.html @@ -0,0 +1,82 @@ + + + + + + charts + + + + + + + + +
+
+

navbar

+
+ +
+
+
+
+
+ + +
+ +
+ + + + + diff --git a/another test/another test/style.css b/another test/another test/style.css new file mode 100644 index 0000000..c9ee1ec --- /dev/null +++ b/another test/another test/style.css @@ -0,0 +1,69 @@ +@import url(https://fonts.googleapis.com/css?family=Open+Sans); +html, +body { + font-family: 'Montserrat', sans-serif; + margin: 0; + padding: 0; + height: 100%; +} +.wrapper { + height: 100%; + display: flex; + flex-direction: column; + text-align: center; + overflow: hidden; +} + +.main-content { + display: flex; + flex-flow: row wrap; + height: 100%; +} +.main-content > * { + flex: 1 100%; + margin: 1px; +} +.header { + background-color: aqua; +} +.footer { + background-color: aquamarine; + margin-top: auto; +} +.main { + flex: 3; + order: 2; + display: flex; + flex-direction: column; /* Stack elements vertically */ + justify-content: flex-start; /* Align content to the top */ +} + +.sidebar1 { + background-color: blue; +} +.sidebar2 { + background-color: firebrick; +} + +.sidebar { + flex: 1; +} +@media screen and (min-width:750px) { + .main { + flex: 3; + order: 2; + } + .sidebar1 { + order: 1; + } + .sidebar2 { + order: 3; + } + +} + +@media screen and (min-width:600px){ + .sidebar { + flex: 1; + } +} From 708a3ceaccc28022369bd08e04f9bc6531139795 Mon Sep 17 00:00:00 2001 From: Joseph Howarth Date: Thu, 12 Dec 2024 15:06:46 +0000 Subject: [PATCH 39/59] example data in repo --- example_data.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 example_data.js diff --git a/example_data.js b/example_data.js new file mode 100644 index 0000000..c3f8aa7 --- /dev/null +++ b/example_data.js @@ -0,0 +1,26 @@ +const developer_data = { + "Alice": { + name: "Alice", + data: [ + { commit_date: "2023-01-10", linesCreated: 150, linesDeleted: 30, code_quality: 8, code_readability: 9 }, + { commit_date: "2023-02-15", linesCreated: 200, linesDeleted: 50, code_quality: 7, code_readability: 8 }, + { commit_date: "2023-03-20", linesCreated: 300, linesDeleted: 100, code_quality: 9, code_readability: 7 } + ] + }, + "Bob": { + name: "Bob", + data: [ + { commit_date: "2023-01-15", linesCreated: 180, linesDeleted: 40, code_quality: 6, code_readability: 8 }, + { commit_date: "2023-02-25", linesCreated: 250, linesDeleted: 70, code_quality: 8, code_readability: 7 }, + { commit_date: "2023-04-01", linesCreated: 350, linesDeleted: 120, code_quality: 9, code_readability: 10 } + ] + }, + "Charlie": { + name: "Charlie", + data: [ + { commit_date: "2023-01-20", linesCreated: 100, linesDeleted: 20, code_quality: 5, code_readability: 7 }, + { commit_date: "2023-03-10", linesCreated: 220, linesDeleted: 60, code_quality: 7, code_readability: 6 }, + { commit_date: "2023-05-05", linesCreated: 320, linesDeleted: 80, code_quality: 8, code_readability: 8 } + ] + }, +}; From f9641399d7478b1d44a8eaf2e65d00c872bbcea2 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 12 Dec 2024 15:39:21 +0000 Subject: [PATCH 40/59] yuh --- another test/another test/charts.js | 120 ++++++--------------------- another test/another test/index.html | 10 +-- another test/another test/style.css | 53 ++++++++++++ 3 files changed, 81 insertions(+), 102 deletions(-) diff --git a/another test/another test/charts.js b/another test/another test/charts.js index 7865d60..e43eedd 100644 --- a/another test/another test/charts.js +++ b/another test/another test/charts.js @@ -1,100 +1,28 @@ -// Chart Configuration -Highcharts.chart('container', { - chart: { - zoomType: 'xy' - }, - title: { - text: 'Metrics' - }, - xAxis: { - categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] - }, - yAxis: [{ - // Primary yAxis (Column and Line Data) - labels: { - format: '{value}°C', - style: { - color: Highcharts.getOptions().colors[1] - } +(async () => { + + // Load the dataset + const data = await fetch( + 'https://demo-live-data.highcharts.com/aapl-c.json' + ).then(response => response.json()); + + // Create the chart + Highcharts.stockChart('container', { + + rangeSelector: { + selected: 1 }, + title: { - text: 'Tempearature', - style: { - color: Highcharts.getOptions().colors[1] - } - } - }, { - // Secondary yAxis (Pie Data) - title: { - text: 'Precipitation', - style: { - color: Highcharts.getOptions().colors[0] - } + text: 'AAPL Stock Price' }, - labels: { - format: '{value} mm', - style: { - color: Highcharts.getOptions().colors[0] + + series: [{ + name: 'AAPL Stock Price', + data: data, + step: true, + tooltip: { + valueDecimals: 2 } - }, - opposite: true - }], - tooltip: { - shared: true - }, - legend: { - layout: 'vertical', - align: 'left', - x: 80, - verticalAlign: 'top', - y: 55, - floating: true, - backgroundColor: - Highcharts.defaultOptions.legend.backgroundColor || 'rgba(255,255,255,0.25)' - }, - series: [{ - type: 'column', - name: 'Rainfall', - data: [49.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4], - tooltip: { - valueSuffix: ' mm' - } - }, { - type: 'spline', - name: 'Temperature', - data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6], - tooltip: { - valueSuffix: '°C' - } - }, { - type: 'pie', - name: 'Total Precipitation', - data: [{ - name: 'January', - y: 49.9, - color: Highcharts.getOptions().colors[0] // Rainfall color - }, { - name: 'February', - y: 71.5, - color: Highcharts.getOptions().colors[1] // Temperature color - }, { - name: 'March', - y: 106.4, - color: Highcharts.getOptions().colors[2] - }, { - name: 'April', - y: 129.2, - color: Highcharts.getOptions().colors[3] - }, { - name: 'May', - y: 144.0, - color: Highcharts.getOptions().colors[4] - }], - center: [100, 80], - size: 100, - showInLegend: false, - dataLabels: { - enabled: false - } - }] -}); + }] + }); +})(); \ No newline at end of file diff --git a/another test/another test/index.html b/another test/another test/index.html index 9e12c92..316dbcc 100644 --- a/another test/another test/index.html +++ b/another test/another test/index.html @@ -5,11 +5,10 @@ charts - - - + + + -
@@ -20,7 +19,6 @@

navbar

-
- + diff --git a/another test/another test/style.css b/another test/another test/style.css index c9ee1ec..4eed9d7 100644 --- a/another test/another test/style.css +++ b/another test/another test/style.css @@ -48,6 +48,59 @@ body { .sidebar { flex: 1; } + +.highcharts-figure, +.highcharts-data-table table { + min-width: 320px; + max-width: 800px; + margin: 1em auto; +} + +.highcharts-figure { + padding: 10px; +} + +.chart { + height: 220px; +} + +.highcharts-data-table table { + font-family: Verdana, sans-serif; + border-collapse: collapse; + border: 1px solid #ebebeb; + margin: 10px auto; + text-align: center; + width: 100%; + max-width: 500px; +} + +.highcharts-data-table caption { + padding: 1em 0; + font-size: 1.2em; + color: #555; +} + +.highcharts-data-table th { + font-weight: 600; + padding: 0.5em; +} + +.highcharts-data-table td, +.highcharts-data-table th, +.highcharts-data-table caption { + padding: 0.5em; +} + +.highcharts-data-table thead tr, +.highcharts-data-table tr:nth-child(even) { + background: #f8f8f8; +} + +.highcharts-data-table tr:hover { + background: #f1f7ff; +} + + @media screen and (min-width:750px) { .main { flex: 3; From dd821116d5a4cad6e0e5018a9d4def0e5a931d1f Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 12 Dec 2024 17:02:40 +0000 Subject: [PATCH 41/59] yuh --- another test/another test/charts.js | 12 +++++-- another test/another test/data.json | 52 +++++++++++++++++++++++++++++ another test/another test/style.css | 50 --------------------------- 3 files changed, 61 insertions(+), 53 deletions(-) create mode 100644 another test/another test/data.json diff --git a/another test/another test/charts.js b/another test/another test/charts.js index e43eedd..b515eca 100644 --- a/another test/another test/charts.js +++ b/another test/another test/charts.js @@ -2,7 +2,7 @@ // Load the dataset const data = await fetch( - 'https://demo-live-data.highcharts.com/aapl-c.json' + 'data.json' ).then(response => response.json()); // Create the chart @@ -13,11 +13,17 @@ }, title: { - text: 'AAPL Stock Price' + text: 'User Data' }, + yAxis: { + title: { + text: 'Number of Employees' + } + }, + series: [{ - name: 'AAPL Stock Price', + name: 'User Data', data: data, step: true, tooltip: { diff --git a/another test/another test/data.json b/another test/another test/data.json new file mode 100644 index 0000000..5027322 --- /dev/null +++ b/another test/another test/data.json @@ -0,0 +1,52 @@ +[ + [1670803200000, 118.96], + [1670889600000, 108.17], + [1670976000000, 126.69], + [1671062400000, 95.61], + [1671148800000, 8.62], + [1671235200000, 109.64], + [1671321600000, 26.23], + [1671408000000, 37.77], + [1671494400000, 180.38], + [1671580800000, 141.69], + [1671667200000, 162.75], + [1671753600000, 35.97], + [1671840000000, 57.07], + [1671926400000, 182.37], + [1672012800000, 66.39], + [1672099200000, 125.9], + [1672185600000, 12.19], + [1672272000000, 103.68], + [1672358400000, 51.0], + [1672444800000, 6.95], + [1672531200000, 137.83], + [1672617600000, 69.99], + [1672704000000, 151.54], + [1672790400000, 21.41], + [1672876800000, 29.86], + [1672963200000, 28.39], + [1673049600000, 11.23], + [1673136000000, 121.63], + [1673222400000, 29.82], + [1673308800000, 80.94], + [1673395200000, 39.97], + [1673481600000, 26.36], + [1673568000000, 105.07], + [1673654400000, 110.02], + [1673740800000, 105.94], + [1673827200000, 1.86], + [1673913600000, 44.39], + [1674000000000, 138.35], + [1674086400000, 194.31], + [1674172800000, 153.43], + [1674259200000, 99.51], + [1674345600000, 134.84], + [1674432000000, 24.96], + [1674518400000, 142.66], + [1674604800000, 40.06], + [1674691200000, 9.83], + [1674777600000, 181.34], + [1674864000000, 25.37], + [1674950400000, 83.09], + [1675036800000, 57.13] +] diff --git a/another test/another test/style.css b/another test/another test/style.css index 4eed9d7..78b152a 100644 --- a/another test/another test/style.css +++ b/another test/another test/style.css @@ -49,56 +49,6 @@ body { flex: 1; } -.highcharts-figure, -.highcharts-data-table table { - min-width: 320px; - max-width: 800px; - margin: 1em auto; -} - -.highcharts-figure { - padding: 10px; -} - -.chart { - height: 220px; -} - -.highcharts-data-table table { - font-family: Verdana, sans-serif; - border-collapse: collapse; - border: 1px solid #ebebeb; - margin: 10px auto; - text-align: center; - width: 100%; - max-width: 500px; -} - -.highcharts-data-table caption { - padding: 1em 0; - font-size: 1.2em; - color: #555; -} - -.highcharts-data-table th { - font-weight: 600; - padding: 0.5em; -} - -.highcharts-data-table td, -.highcharts-data-table th, -.highcharts-data-table caption { - padding: 0.5em; -} - -.highcharts-data-table thead tr, -.highcharts-data-table tr:nth-child(even) { - background: #f8f8f8; -} - -.highcharts-data-table tr:hover { - background: #f1f7ff; -} @media screen and (min-width:750px) { From bda83a7549c95ec5008b4f9a17f1d3981b14beea Mon Sep 17 00:00:00 2001 From: Mohamed Alsawidi Date: Fri, 13 Dec 2024 08:09:37 +0000 Subject: [PATCH 42/59] yessur --- another test/another test/charts.js | 227 ++++++++++++++++++++++++--- another test/another test/data.js | 8 - another test/another test/data.json | 52 ------ another test/another test/index.html | 9 +- another test/another test/style.css | 28 ++++ 5 files changed, 238 insertions(+), 86 deletions(-) delete mode 100644 another test/another test/data.js diff --git a/another test/another test/charts.js b/another test/another test/charts.js index b515eca..a4a4442 100644 --- a/another test/another test/charts.js +++ b/another test/another test/charts.js @@ -1,34 +1,219 @@ (async () => { - // Load the dataset - const data = await fetch( - 'data.json' - ).then(response => response.json()); - // Create the chart - Highcharts.stockChart('container', { - - rangeSelector: { - selected: 1 + const data = [ + // [date DD-MM-YYYY --> Unix time stamp, lines created n(integer), lines deleted n(integer), code readability 0-10, something else 0-10] + ['x', 'created', 'deleted', 'readability', 'idk'], + [1672531200000, 120, 30, 8, 7], + [1672617600000, 90, 20, 7, 6], + [1672704000000, 150, 40, 9, 8], + [1672790400000, 200, 50, 6, 7], + [1672876800000, 110, 10, 8, 9], + [1672963200000, 70, 5, 7, 6], + [1673049600000, 130, 25, 9, 8], + [1673136000000, 95, 15, 6, 7], + [1673222400000, 160, 35, 8, 9], + [1673308800000, 180, 45, 7, 8] + ]; + Highcharts.setOptions({ + chart: { + spacingTop: 20, + spacingBottom: 20, + height: 300, + type: 'area', + zooming: { + type: 'xy' + } }, - - title: { - text: 'User Data' + legend: { + enabled: false + }, + tooltip: { + stickOnContact: true }, yAxis: { title: { - text: 'Number of Employees' + text: 'Lines' + }, + accessibility: { + description: 'value in percents' } }, + xAxis: { + title: { + text: 'Date' + }, + type: 'datetime', + accessibility: { + description: 'Years', + rangeDescription: 'Data ranges from 2000-01-01 to 2021-01-01.' + } + } + }); + Dashboards.board('dashboard-container', { + editMode: { + enabled: true, + contextMenu: { + enabled: true + } + }, + dataPool: { + connectors: [{ + id: 'connector-1', + type: 'JSON', + options: { + data + } + }, { + id: 'connector-2', + type: 'JSON', + options: { + data + } + }, + { + id: 'connector-3', + type: 'JSON', + options: { + data + } + }, { + id: 'connector-4', + type: 'JSON', + options: { + data + } + }] + }, + gui: { + layouts: [{ + id: 'layout-1', + rows: [{ + cells: [{ + id: 'title' + }] + }, { + cells: [{ + id: 'dashboard-col-1' + }] + }, { + cells: [{ + id: 'dashboard-col-2' + }] + }, { + cells: [{ + id: 'dashboard-col-3' + }, { + id: 'dashboard-col-4' + }] + }] + }] + }, + components: [{ + renderTo: 'title', + type: 'HTML', + elements: [{ + tagName: 'h1', + textContent: 'Git data' + }] + }, + + + { + renderTo: 'dashboard-col-1', + type: 'Highcharts', + connector: { + id: 'connector-1', + columnAssignment: [{ + seriesId: 'Created', + data: ['x', 'created'] + }, + { + seriesId: 'Deleted', + data: ['x', 'deleted'] + }] + }, + sync: { + extremes: true, + highlight: true + }, + chartOptions: { + chart: { + zooming: { + type: 'x' + } + }, + title: { + text: 'Lines' + }, + legend: { + enabled: true + }, + credits: { + enabled: false + } + } + }, + + + + + + { + renderTo: 'dashboard-col-2', + type: 'Highcharts', + connector: { + id: 'connector-1', + columnAssignment: [{ + seriesId: 'South-East Asia', + data: ['x', 'South-East Asia'] + }] + }, + sync: { + extremes: true, + highlight: true + }, + chartOptions: { + chart: { + zooming: { + type: 'x' + } + }, + title: { + text: 'yuh' + }, + legend: { + enabled: false + }, + credits: { + enabled: false + }, + plotOptions: + { + series: { + colorIndex: 1 + } + } + } + }, + - series: [{ - name: 'User Data', - data: data, - step: true, - tooltip: { - valueDecimals: 2 + + + { + renderTo: 'dashboard-col-0', + type: 'Highcharts', + connector: { + id: 'synchro-data' + }, + sync: { + highlight: true + }, + chartOptions: { + } }] - }); -})(); \ No newline at end of file + }, true); +})(); + diff --git a/another test/another test/data.js b/another test/another test/data.js deleted file mode 100644 index 049a74e..0000000 --- a/another test/another test/data.js +++ /dev/null @@ -1,8 +0,0 @@ -export const datasets = { - temperature: { - name: 'Temperature', - unit: '°C', - data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6], - }, - // add other data - }; \ No newline at end of file diff --git a/another test/another test/data.json b/another test/another test/data.json index 5027322..e69de29 100644 --- a/another test/another test/data.json +++ b/another test/another test/data.json @@ -1,52 +0,0 @@ -[ - [1670803200000, 118.96], - [1670889600000, 108.17], - [1670976000000, 126.69], - [1671062400000, 95.61], - [1671148800000, 8.62], - [1671235200000, 109.64], - [1671321600000, 26.23], - [1671408000000, 37.77], - [1671494400000, 180.38], - [1671580800000, 141.69], - [1671667200000, 162.75], - [1671753600000, 35.97], - [1671840000000, 57.07], - [1671926400000, 182.37], - [1672012800000, 66.39], - [1672099200000, 125.9], - [1672185600000, 12.19], - [1672272000000, 103.68], - [1672358400000, 51.0], - [1672444800000, 6.95], - [1672531200000, 137.83], - [1672617600000, 69.99], - [1672704000000, 151.54], - [1672790400000, 21.41], - [1672876800000, 29.86], - [1672963200000, 28.39], - [1673049600000, 11.23], - [1673136000000, 121.63], - [1673222400000, 29.82], - [1673308800000, 80.94], - [1673395200000, 39.97], - [1673481600000, 26.36], - [1673568000000, 105.07], - [1673654400000, 110.02], - [1673740800000, 105.94], - [1673827200000, 1.86], - [1673913600000, 44.39], - [1674000000000, 138.35], - [1674086400000, 194.31], - [1674172800000, 153.43], - [1674259200000, 99.51], - [1674345600000, 134.84], - [1674432000000, 24.96], - [1674518400000, 142.66], - [1674604800000, 40.06], - [1674691200000, 9.83], - [1674777600000, 181.34], - [1674864000000, 25.37], - [1674950400000, 83.09], - [1675036800000, 57.13] -] diff --git a/another test/another test/index.html b/another test/another test/index.html index 316dbcc..5283982 100644 --- a/another test/another test/index.html +++ b/another test/another test/index.html @@ -5,10 +5,9 @@ charts - - - - + + +
@@ -18,7 +17,7 @@

navbar

-
+