From 213567cd7e884b9243c8a6e8a8cd366449dac3ea Mon Sep 17 00:00:00 2001 From: iKAN2025 <142475176+iKAN2025@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:59:16 -0700 Subject: [PATCH 1/4] update home.html --- _includes/nav/flask.html | 1 - _includes/nav/home.html | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_includes/nav/flask.html b/_includes/nav/flask.html index 90fb0806b..0555c938d 100644 --- a/_includes/nav/flask.html +++ b/_includes/nav/flask.html @@ -6,6 +6,5 @@ Profile Scrum Admin - Logout \ No newline at end of file diff --git a/_includes/nav/home.html b/_includes/nav/home.html index 2f50e2d75..fa0e5af5d 100644 --- a/_includes/nav/home.html +++ b/_includes/nav/home.html @@ -54,7 +54,7 @@ CSP CSA README - Login + ${data.name} `; } else { // User is not authenticated, then "Login" link is shown - loginArea.innerHTML = 'Login'; + loginArea.innerHTML = 'Login'; } }) .catch(err => { // General error handler From 13c2b45536c2b05d728a962b458d309a29017074 Mon Sep 17 00:00:00 2001 From: iKAN2025 <142475176+iKAN2025@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:00:17 -0700 Subject: [PATCH 2/4] {% include nav/flask.html %} --- navigation/admin.md | 4 +++- navigation/profile.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/navigation/admin.md b/navigation/admin.md index 1460de8d0..b1ddfe8f8 100644 --- a/navigation/admin.md +++ b/navigation/admin.md @@ -3,4 +3,6 @@ layout: base title: Admin permalink: /admin search_exclude: true ---- \ No newline at end of file +--- +{% include nav/flask.html %} + diff --git a/navigation/profile.md b/navigation/profile.md index dbf08f685..7c3278c3d 100644 --- a/navigation/profile.md +++ b/navigation/profile.md @@ -2,4 +2,6 @@ layout: post title: Profile permalink: /profile ---- \ No newline at end of file +--- + +{% include nav/flask.html %} \ No newline at end of file From 2dcfa5147608b4c3096b274f0d3939853aa19554 Mon Sep 17 00:00:00 2001 From: iKAN2025 <142475176+iKAN2025@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:06:03 -0700 Subject: [PATCH 3/4] profile --- _includes/create_user.html | 61 +++- navigation/backend.md | 557 +++++++++++++++++-------------------- navigation/profile.md | 320 ++++++++++++++++++++- 3 files changed, 626 insertions(+), 312 deletions(-) diff --git a/_includes/create_user.html b/_includes/create_user.html index 3d284102f..bfc65986a 100644 --- a/_includes/create_user.html +++ b/_includes/create_user.html @@ -3,6 +3,56 @@ Create User +
@@ -18,6 +68,7 @@
+
@@ -25,17 +76,19 @@ async function submitForm() { const form = document.getElementById('userForm'); const formData = new FormData(form); - + + // Collect selected sections + // Create the payload const payload = { name: formData.get('name'), uid: formData.get('uid'), password: formData.get('password'), - kasm_server_needed: formData.get('kasm_server_needed') ? true : false + kasm_server_needed: formData.get('kasm_server_needed') === 'on', }; try { - const response = await fetch('http://127.0.0.1:8086/api/user', { + const response = await fetch('http://127.0.0.1:8086/api/users/', { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -57,3 +110,5 @@ + + diff --git a/navigation/backend.md b/navigation/backend.md index 588cf6004..198f56e4a 100644 --- a/navigation/backend.md +++ b/navigation/backend.md @@ -5,338 +5,281 @@ permalink: /login search_exclude: true --- - {% include nav/flask.html %} - - - -
- - - -
-

User Login (Java)

-
-

-

-

- -

-

-
- - - - - - - - - - - - - -
NameIDAgeRole
- Java Details -
- - - -
-

User Login (Python)

-
-

-

-

- -

-

-
- - - - - - - - - - + +
IDNameUIDRoleProfile PictureKASM Server NeededClasses
+ + + + + + - - - - -
NameIDAgeRoles
- Python Details + + + + + + Java Details +
+ + +
+

User Login (Python)

+
+

+ +

+

+ +

+

+ +

+

+
+ + + + + + + + + + + + + + + +
IDNameUIDRoleProfile PictureKASM Server NeededClasses
+ Python Details +
- - - - - - - - diff --git a/navigation/profile.md b/navigation/profile.md index 7c3278c3d..b45221f7b 100644 --- a/navigation/profile.md +++ b/navigation/profile.md @@ -1,7 +1,323 @@ --- layout: post -title: Profile +title: Profile Setup permalink: /profile --- -{% include nav/flask.html %} \ No newline at end of file +{% include nav/flask.html %} + + + + + + Profile Setup + + + + + + + + +
+ + +
+

Profile Setup

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

+
+ + + + + + + + + + +
AbbreviationName
+ Save Sections +
+ +
+ + + + + From 01c03d108ad4a13de99870f79bd0927085d2946a Mon Sep 17 00:00:00 2001 From: iKAN2025 <142475176+iKAN2025@users.noreply.github.com> Date: Wed, 3 Jul 2024 19:18:38 -0700 Subject: [PATCH 4/4] change --- _includes/create_user.html | 61 ++------------------------------------ navigation/profile.md | 4 +-- 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/_includes/create_user.html b/_includes/create_user.html index bfc65986a..3d284102f 100644 --- a/_includes/create_user.html +++ b/_includes/create_user.html @@ -3,56 +3,6 @@ Create User -
@@ -68,7 +18,6 @@
-
@@ -76,19 +25,17 @@ async function submitForm() { const form = document.getElementById('userForm'); const formData = new FormData(form); - - // Collect selected sections - + // Create the payload const payload = { name: formData.get('name'), uid: formData.get('uid'), password: formData.get('password'), - kasm_server_needed: formData.get('kasm_server_needed') === 'on', + kasm_server_needed: formData.get('kasm_server_needed') ? true : false }; try { - const response = await fetch('http://127.0.0.1:8086/api/users/', { + const response = await fetch('http://127.0.0.1:8086/api/user', { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -110,5 +57,3 @@ - - diff --git a/navigation/profile.md b/navigation/profile.md index b45221f7b..fbeecb40d 100644 --- a/navigation/profile.md +++ b/navigation/profile.md @@ -12,7 +12,8 @@ permalink: /profile Profile Setup - + + -