-
-
-
-
-
-
-
-
-
-
- - {announcement.heading} -
- - -- {announcement.announcement} -
-
- Background lights are cool you know.
-
-
- And this, is chemical burn.
-
-
-
-
- Home
- Admins
-
-
-
diff --git a/src/client/src/lib/components/admin/+Announcements.svelte b/src/client/src/lib/components/admin/+Announcements.svelte
deleted file mode 100644
index ebb4ed7f..00000000
--- a/src/client/src/lib/components/admin/+Announcements.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
- {/each}
-
diff --git a/src/client/src/lib/components/admin/+Degrees.svelte b/src/client/src/lib/components/admin/+Degrees.svelte
index fe513be1..8629a9c7 100644
--- a/src/client/src/lib/components/admin/+Degrees.svelte
+++ b/src/client/src/lib/components/admin/+Degrees.svelte
@@ -1,8 +1,11 @@
+
-
- {#each announcements as announcement}
- - Announcements -
-
+
Degree Dashboard
+
{#each degrees as degree}
diff --git a/src/client/src/lib/components/admin/+Lectures.svelte b/src/client/src/lib/components/admin/+Lectures.svelte
index c86b9289..46ca61a4 100644
--- a/src/client/src/lib/components/admin/+Lectures.svelte
+++ b/src/client/src/lib/components/admin/+Lectures.svelte
@@ -1,10 +1,10 @@
-
-
- Home
- Lecturers
-
-
-
diff --git a/src/client/src/lib/components/admin/+Organisation.svelte b/src/client/src/lib/components/admin/+Organisation.svelte
index e02bd399..ce3dd231 100644
--- a/src/client/src/lib/components/admin/+Organisation.svelte
+++ b/src/client/src/lib/components/admin/+Organisation.svelte
@@ -1,10 +1,10 @@
-
diff --git a/src/client/src/lib/components/lecturer/+Overview.svelte b/src/client/src/lib/components/lecturer/+Overview.svelte new file mode 100644 index 00000000..eee5ec5b --- /dev/null +++ b/src/client/src/lib/components/lecturer/+Overview.svelte @@ -0,0 +1,47 @@ + + +
+
+
diff --git a/src/client/src/lib/components/student/+Home.svelte b/src/client/src/lib/components/student/+Home.svelte
new file mode 100644
index 00000000..bc6a9254
--- /dev/null
+++ b/src/client/src/lib/components/student/+Home.svelte
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/src/client/src/lib/components/authentication/+LeftSideImage.svelte b/src/client/src/lib/components/universal/auth/+LeftSideImage.svelte
similarity index 100%
rename from src/client/src/lib/components/authentication/+LeftSideImage.svelte
rename to src/client/src/lib/components/universal/auth/+LeftSideImage.svelte
diff --git a/src/client/src/lib/components/authentication/+SignInForm.svelte b/src/client/src/lib/components/universal/auth/+SignInForm.svelte
similarity index 90%
rename from src/client/src/lib/components/authentication/+SignInForm.svelte
rename to src/client/src/lib/components/universal/auth/+SignInForm.svelte
index 9abf078d..f3059e93 100644
--- a/src/client/src/lib/components/authentication/+SignInForm.svelte
+++ b/src/client/src/lib/components/universal/auth/+SignInForm.svelte
@@ -3,7 +3,8 @@
import Google from '$lib/images/google.svg';
import { goto } from '$app/navigation';
import { Input, Label, Button, A } from 'flowbite-svelte';
- import { signIn } from '../../../services/auth';
+ import { signIn } from '$lib/services/auth';
+ import { user_details } from '$lib/store';
import '@fontsource/roboto';
@@ -30,15 +31,19 @@
// Send a request to your server-side action
try {
const response = await signIn(username, password);
+ user_details.set(response);
+
+ const details = $user_details;
+ console.log(details);
console.log('Response:', response);
if (response && response.accessToken) {
storeAccessToken(response.accessToken, response.sub);
- goto('/');
}
+ goto('/student');
} catch (error) {
- console.error('Sign-ip error:', error);
+ console.error('Sign-in error:', error);
alert('Sign-in failed');
}
}
@@ -96,7 +101,7 @@
diff --git a/src/client/src/lib/components/authentication/+SignUpForm.svelte b/src/client/src/lib/components/universal/auth/+SignUpForm.svelte
similarity index 93%
rename from src/client/src/lib/components/authentication/+SignUpForm.svelte
rename to src/client/src/lib/components/universal/auth/+SignUpForm.svelte
index 9bb9827a..4e8c75a9 100644
--- a/src/client/src/lib/components/authentication/+SignUpForm.svelte
+++ b/src/client/src/lib/components/universal/auth/+SignUpForm.svelte
@@ -5,7 +5,8 @@
import Google from '$lib/images/google.svg';
import { Input, Label, Button, Checkbox, A } from 'flowbite-svelte';
- import { signUp } from '../../../services/auth';
+ import { signUp } from '$lib/services/auth';
+ import { user_details } from '$lib/store';
function storeAccessToken(token: string): void {
localStorage.setItem('accessToken', token);
@@ -31,13 +32,17 @@
//creates user but does not redirect to home page
try {
const response = await signUp(name, surname, email, image, password);
+ user_details.set(response);
+
+ const details = $user_details;
+ console.log(details);
console.log('Response:', response);
if (response && response.accessToken) {
storeAccessToken(response.accessToken);
- goto('/');
}
+ goto('/student');
} catch (error) {
console.error('Sign-up error:', error);
alert('Sign-up failed');
@@ -102,7 +107,7 @@
diff --git a/src/client/src/lib/components/utils/+SideBar.svelte b/src/client/src/lib/components/utils/+SideBar.svelte
deleted file mode 100644
index 39a5f1e2..00000000
--- a/src/client/src/lib/components/utils/+SideBar.svelte
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
diff --git a/src/client/src/lib/components/utils/+TopBar.svelte b/src/client/src/lib/components/utils/+TopBar.svelte
new file mode 100644
index 00000000..49278561
--- /dev/null
+++ b/src/client/src/lib/components/utils/+TopBar.svelte
@@ -0,0 +1,37 @@
+
+
+
+
+
+ Eugene Mpande
+ u21573558@tuks.co.za
+
+ Profile
+ Sign out
+
+
diff --git a/src/client/src/lib/components/utils/admin/+SideBar.svelte b/src/client/src/lib/components/utils/admin/+SideBar.svelte
new file mode 100644
index 00000000..01b3b57a
--- /dev/null
+++ b/src/client/src/lib/components/utils/admin/+SideBar.svelte
@@ -0,0 +1,89 @@
+
+
+
diff --git a/src/client/src/lib/components/utils/lecturer/+FilesCard.svelte b/src/client/src/lib/components/utils/lecturer/+FilesCard.svelte
new file mode 100644
index 00000000..8772ddf9
--- /dev/null
+++ b/src/client/src/lib/components/utils/lecturer/+FilesCard.svelte
@@ -0,0 +1,32 @@
+
+
+
+
diff --git a/src/client/src/lib/components/utils/student/+ModuleSideBar.svelte b/src/client/src/lib/components/utils/student/+ModuleSideBar.svelte
new file mode 100644
index 00000000..3e771980
--- /dev/null
+++ b/src/client/src/lib/components/utils/student/+ModuleSideBar.svelte
@@ -0,0 +1,62 @@
+
+
+
diff --git a/src/client/src/lib/components/utils/student/+SideBar.svelte b/src/client/src/lib/components/utils/student/+SideBar.svelte
new file mode 100644
index 00000000..a728d54a
--- /dev/null
+++ b/src/client/src/lib/components/utils/student/+SideBar.svelte
@@ -0,0 +1,56 @@
+
+
+
diff --git a/src/client/src/lib/components/utils/universal/+Breadcrumbs.svelte b/src/client/src/lib/components/utils/universal/+Breadcrumbs.svelte
new file mode 100644
index 00000000..be32b788
--- /dev/null
+++ b/src/client/src/lib/components/utils/universal/+Breadcrumbs.svelte
@@ -0,0 +1,34 @@
+
+
+
+ Home
+ {#each breadcrumbItems as item}
+ {item.name}
+ {/each}
+
diff --git a/src/client/src/lib/components/utils/universal/cards/+AnnCard.svelte b/src/client/src/lib/components/utils/universal/cards/+AnnCard.svelte
new file mode 100644
index 00000000..8a95e810
--- /dev/null
+++ b/src/client/src/lib/components/utils/universal/cards/+AnnCard.svelte
@@ -0,0 +1,58 @@
+
+
+ {
return response.data;
} catch (error) {
+ console.log(error);
throw new Error('Sign-in failed');
}
}
diff --git a/src/client/src/services/orgs.ts b/src/client/src/lib/services/orgs.ts
similarity index 100%
rename from src/client/src/services/orgs.ts
rename to src/client/src/lib/services/orgs.ts
diff --git a/src/client/src/services/users.ts b/src/client/src/lib/services/users.ts
similarity index 100%
rename from src/client/src/services/users.ts
rename to src/client/src/lib/services/users.ts
diff --git a/src/client/src/lib/stores/store.ts b/src/client/src/lib/store/index.ts
similarity index 82%
rename from src/client/src/lib/stores/store.ts
rename to src/client/src/lib/store/index.ts
index 8c9830c7..ca5a5939 100644
--- a/src/client/src/lib/stores/store.ts
+++ b/src/client/src/lib/store/index.ts
@@ -12,10 +12,17 @@ export const lessons = writable([
]);
export const organisationName = writable('Organisation');
+
export const lecChange = writable('change');
export const stuChange = writable('change');
export const admChange = writable('change');
+export const user = writable('eugene');
+export const email = writable('eugene.mpande@tuks.co.za');
+export const file = writable('');
+export const module = writable('');
+
+export const user_details = writable({});
export const username = 'e241198014';
export const userInfo = writable({
diff --git a/src/client/src/routes/+layout.svelte b/src/client/src/routes/+layout.svelte
index 6328e459..5157c9f1 100644
--- a/src/client/src/routes/+layout.svelte
+++ b/src/client/src/routes/+layout.svelte
@@ -1,14 +1,9 @@
-
-
diff --git a/src/client/src/routes/activities/+page.svelte b/src/client/src/routes/activities/+page.svelte
deleted file mode 100644
index 219f6c15..00000000
--- a/src/client/src/routes/activities/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/admin/+page.svelte b/src/client/src/routes/admin/+page.svelte
new file mode 100644
index 00000000..4d28ea07
--- /dev/null
+++ b/src/client/src/routes/admin/+page.svelte
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/src/client/src/routes/admin/+page.ts b/src/client/src/routes/admin/+page.ts
new file mode 100644
index 00000000..7bd59715
--- /dev/null
+++ b/src/client/src/routes/admin/+page.ts
@@ -0,0 +1,75 @@
+/** @type {import('./$types').PageLoad} */
+
+export function load() {
+ return {
+ degrees: [
+ {
+ program: 'BEng Mechanical Engineering',
+ duration: '4 years',
+ level: 'Undergraduate',
+ link: '/'
+ },
+ {
+ program: 'BEng Electrical Engineering',
+ duration: '4 years',
+ level: 'Undergraduate',
+ link: '/'
+ },
+ {
+ program: 'BEng Civil Engineering',
+ duration: '4 years',
+ level: 'Undergraduate',
+ link: '/'
+ },
+ {
+ program: 'BSc Computer Science',
+ duration: '3 years',
+ level: 'Undergraduate',
+ link: '/degree'
+ },
+ {
+ program: 'BEng Chemical Engineering',
+ duration: '4 years',
+ level: 'Undergraduate',
+ link: '/'
+ },
+ {
+ program: 'BSc Information Technology',
+ duration: '3 years',
+ level: 'Undergraduate',
+ link: '/'
+ },
+ {
+ program: 'MEng Industrial Engineering',
+ duration: '2 years',
+ level: 'Postgraduate',
+ link: '/'
+ },
+ {
+ program: 'MEng Mechanical Engineering',
+ duration: '2 years',
+ level: 'Postgraduate',
+ link: '/'
+ },
+ {
+ program: 'MEng Electrical Engineering',
+ duration: '2 years',
+ level: 'Postgraduate',
+ link: '/'
+ },
+ {
+ program: 'MSc Computer Science',
+ duration: '2 years',
+ level: 'Postgraduate',
+ link: '/'
+ },
+ { program: 'PhD Civil Engineering', duration: '3-5 years', level: 'Doctoral', link: '/' },
+ {
+ program: 'PhD Information Technology',
+ duration: '3-5 years',
+ level: 'Doctoral',
+ link: '/'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/admin/activities/+page.svelte b/src/client/src/routes/admin/activities/+page.svelte
new file mode 100644
index 00000000..f48185c2
--- /dev/null
+++ b/src/client/src/routes/admin/activities/+page.svelte
@@ -0,0 +1,19 @@
+
+
+
+
diff --git a/src/client/src/routes/activities/+page.ts b/src/client/src/routes/admin/activities/+page.ts
similarity index 100%
rename from src/client/src/routes/activities/+page.ts
rename to src/client/src/routes/admin/activities/+page.ts
diff --git a/src/client/src/routes/admin/admins/+page.svelte b/src/client/src/routes/admin/admins/+page.svelte
new file mode 100644
index 00000000..e2b38800
--- /dev/null
+++ b/src/client/src/routes/admin/admins/+page.svelte
@@ -0,0 +1,19 @@
+
+
+
+
diff --git a/src/client/src/routes/admins/+page.ts b/src/client/src/routes/admin/admins/+page.ts
similarity index 100%
rename from src/client/src/routes/admins/+page.ts
rename to src/client/src/routes/admin/admins/+page.ts
diff --git a/src/client/src/routes/admin/announcements/+page.svelte b/src/client/src/routes/admin/announcements/+page.svelte
new file mode 100644
index 00000000..b2d8b9e9
--- /dev/null
+++ b/src/client/src/routes/admin/announcements/+page.svelte
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/src/client/src/routes/admin/announcements/+page.ts b/src/client/src/routes/admin/announcements/+page.ts
new file mode 100644
index 00000000..afb68e9c
--- /dev/null
+++ b/src/client/src/routes/admin/announcements/+page.ts
@@ -0,0 +1,26 @@
+/** @type {import('./$types').PageLoad} */
+
+export function load() {
+ return {
+ announcements: [
+ {
+ date: '10 Oct',
+ heading: 'Campus Safety Drill',
+ announcement:
+ 'A campus-wide safety drill will be conducted on October 15th at 10 AM. All students and staff are required to participate. Please review the safety procedures and follow instructions during the drill.'
+ },
+ {
+ date: '12 Oct',
+ heading: 'New Library Hours',
+ announcement:
+ 'Starting October 20th, the university library will have extended hours. It will now be open from 8 AM to 12 AM, Monday through Friday, and 9 AM to 10 PM on weekends.'
+ },
+ {
+ date: '15 Oct',
+ heading: 'Guest Lecture Series',
+ announcement:
+ 'We are excited to announce a new guest lecture series starting October 25th. Prominent speakers from various fields will be sharing their insights. All students and faculty are encouraged to attend.'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/degrees.ts b/src/client/src/routes/admin/degrees.ts
similarity index 100%
rename from src/client/src/routes/degrees.ts
rename to src/client/src/routes/admin/degrees.ts
diff --git a/src/client/src/routes/lecturers/+page.server.js b/src/client/src/routes/admin/lecturers/+page.server.js
similarity index 100%
rename from src/client/src/routes/lecturers/+page.server.js
rename to src/client/src/routes/admin/lecturers/+page.server.js
diff --git a/src/client/src/routes/admin/lecturers/+page.svelte b/src/client/src/routes/admin/lecturers/+page.svelte
new file mode 100644
index 00000000..fa8bab60
--- /dev/null
+++ b/src/client/src/routes/admin/lecturers/+page.svelte
@@ -0,0 +1,19 @@
+
+
+
+
diff --git a/src/client/src/routes/announcements/+page.ts b/src/client/src/routes/admin/lecturers/+page.ts
similarity index 100%
rename from src/client/src/routes/announcements/+page.ts
rename to src/client/src/routes/admin/lecturers/+page.ts
diff --git a/src/client/src/routes/organisation/+page.server.js b/src/client/src/routes/admin/organisation/+page.server.js
similarity index 100%
rename from src/client/src/routes/organisation/+page.server.js
rename to src/client/src/routes/admin/organisation/+page.server.js
diff --git a/src/client/src/routes/admin/organisation/+page.svelte b/src/client/src/routes/admin/organisation/+page.svelte
new file mode 100644
index 00000000..31e27b36
--- /dev/null
+++ b/src/client/src/routes/admin/organisation/+page.svelte
@@ -0,0 +1,19 @@
+
+
+
+
diff --git a/src/client/src/routes/lecturers/+page.ts b/src/client/src/routes/admin/organisation/+page.ts
similarity index 100%
rename from src/client/src/routes/lecturers/+page.ts
rename to src/client/src/routes/admin/organisation/+page.ts
diff --git a/src/client/src/routes/admin/settings/+page.svelte b/src/client/src/routes/admin/settings/+page.svelte
new file mode 100644
index 00000000..6a89416f
--- /dev/null
+++ b/src/client/src/routes/admin/settings/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/organisation/+page.ts b/src/client/src/routes/admin/settings/+page.ts
similarity index 100%
rename from src/client/src/routes/organisation/+page.ts
rename to src/client/src/routes/admin/settings/+page.ts
diff --git a/src/client/src/routes/admin/students/+page.svelte b/src/client/src/routes/admin/students/+page.svelte
new file mode 100644
index 00000000..43fd074b
--- /dev/null
+++ b/src/client/src/routes/admin/students/+page.svelte
@@ -0,0 +1,19 @@
+
+
+
+
diff --git a/src/client/src/routes/profile/+page.ts b/src/client/src/routes/admin/students/+page.ts
similarity index 100%
rename from src/client/src/routes/profile/+page.ts
rename to src/client/src/routes/admin/students/+page.ts
diff --git a/src/client/src/routes/admin/workspaces/+page.server.js b/src/client/src/routes/admin/workspaces/+page.server.js
new file mode 100644
index 00000000..53e8481f
--- /dev/null
+++ b/src/client/src/routes/admin/workspaces/+page.server.js
@@ -0,0 +1,71 @@
+/** @type {import('./$types').Actions} */
+
+// Mock add, edit, and delete functions
+async function addDetails(name, email, role) {
+ console.log(name);
+ console.log(email);
+ console.log(role);
+}
+
+async function editDetails(name, email, role) {
+ console.log(name);
+ console.log(email);
+ console.log(role);
+}
+
+async function deleteDetails(name, email, role) {
+ console.log(name);
+ console.log(email);
+ console.log(role);
+}
+
+export const actions = {
+ default: async ({ request }) => {
+ const formData = await request.formData();
+ const name = formData.get('org_name');
+ const email = formData.get('email');
+ const role = formData.get('role');
+
+ console.log(name);
+ console.log(email);
+ console.log(role);
+
+ addDetails(name, email, role);
+
+ return {
+ status: 200
+ };
+ },
+ edit: async ({ request }) => {
+ const formData = await request.formData();
+ const name = formData.get('org_name');
+ const email = formData.get('email');
+ const role = formData.get('role');
+
+ console.log(name);
+ console.log(email);
+ console.log(role);
+
+ editDetails(name, email, role);
+
+ return {
+ status: 200
+ };
+ },
+ delete: async ({ request }) => {
+ const formData = await request.formData();
+ const name = formData.get('org_name');
+ const email = formData.get('email');
+ const role = formData.get('role');
+
+ console.log(name);
+ console.log(email);
+ console.log(role);
+
+ deleteDetails(name, email, role);
+
+ return {
+ status: 200
+ };
+ }
+};
diff --git a/src/client/src/routes/admin/workspaces/+page.svelte b/src/client/src/routes/admin/workspaces/+page.svelte
new file mode 100644
index 00000000..b9922bcc
--- /dev/null
+++ b/src/client/src/routes/admin/workspaces/+page.svelte
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/src/client/src/routes/admin/workspaces/+page.ts b/src/client/src/routes/admin/workspaces/+page.ts
new file mode 100644
index 00000000..e7379ee1
--- /dev/null
+++ b/src/client/src/routes/admin/workspaces/+page.ts
@@ -0,0 +1,20 @@
+/** @type {import('./$types').PageLoad} */
+
+export function load() {
+ return {
+ workspaces: [
+ {
+ name: 'Computer Networks'
+ },
+ {
+ name: 'Artificial Intelligence'
+ },
+ {
+ name: 'Programming Languages'
+ },
+ {
+ name: 'Computer Graphics'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/admins/+page.svelte b/src/client/src/routes/admins/+page.svelte
deleted file mode 100644
index fd4eee42..00000000
--- a/src/client/src/routes/admins/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/announcements/+page.svelte b/src/client/src/routes/announcements/+page.svelte
deleted file mode 100644
index 88aff789..00000000
--- a/src/client/src/routes/announcements/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/auth/+page.svelte b/src/client/src/routes/auth/+page.svelte
new file mode 100644
index 00000000..4b3c9410
--- /dev/null
+++ b/src/client/src/routes/auth/+page.svelte
@@ -0,0 +1,7 @@
+
diff --git a/src/client/src/routes/signin/+page.server.js b/src/client/src/routes/auth/signin/+page.server.js
similarity index 100%
rename from src/client/src/routes/signin/+page.server.js
rename to src/client/src/routes/auth/signin/+page.server.js
diff --git a/src/client/src/routes/signin/+page.svelte b/src/client/src/routes/auth/signin/+page.svelte
similarity index 61%
rename from src/client/src/routes/signin/+page.svelte
rename to src/client/src/routes/auth/signin/+page.svelte
index dcf2483d..5488a742 100644
--- a/src/client/src/routes/signin/+page.svelte
+++ b/src/client/src/routes/auth/signin/+page.svelte
@@ -1,6 +1,6 @@
diff --git a/src/client/src/routes/settings/+page.ts b/src/client/src/routes/auth/signin/+page.ts
similarity index 100%
rename from src/client/src/routes/settings/+page.ts
rename to src/client/src/routes/auth/signin/+page.ts
diff --git a/src/client/src/routes/signup/+page.svelte b/src/client/src/routes/auth/signup/+page.svelte
similarity index 65%
rename from src/client/src/routes/signup/+page.svelte
rename to src/client/src/routes/auth/signup/+page.svelte
index 04d9c222..2e1e114e 100644
--- a/src/client/src/routes/signup/+page.svelte
+++ b/src/client/src/routes/auth/signup/+page.svelte
@@ -1,6 +1,6 @@
diff --git a/src/client/src/routes/signin/+page.ts b/src/client/src/routes/auth/signup/+page.ts
similarity index 100%
rename from src/client/src/routes/signin/+page.ts
rename to src/client/src/routes/auth/signup/+page.ts
diff --git a/src/client/src/routes/degree/+page.svelte b/src/client/src/routes/degree/+page.svelte
deleted file mode 100644
index 25694c78..00000000
--- a/src/client/src/routes/degree/+page.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
diff --git a/src/client/src/routes/degree/+page.ts b/src/client/src/routes/degree/+page.ts
deleted file mode 100644
index 189f71e2..00000000
--- a/src/client/src/routes/degree/+page.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const prerender = true;
diff --git a/src/client/src/routes/degree/workspaces.ts b/src/client/src/routes/degree/workspaces.ts
deleted file mode 100644
index be40198f..00000000
--- a/src/client/src/routes/degree/workspaces.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import COS333Logo from '$lib/images/COS333_logo.png';
-import COS314Logo from '$lib/images/COS314_logo.png';
-import COS344Logo from '$lib/images/COS344_logo.png';
-import COS332Logo from '$lib/images/COS332_logo.png';
-
-//This file mock stores the mock data needed to display the workspaces on the home page.
-//The information is stored as an array of JSON objects
-//Each workspace has a title, a description and an image.
-export const workspaces = [
- {
- title: 'COS 333',
- description: 'Programming languages',
- image: COS333Logo
- },
- {
- title: 'COS 314',
- description: 'Artificial Intelligence',
- image: COS314Logo
- },
- {
- title: 'COS 344',
- description: 'Computer Graphics',
- image: COS344Logo
- },
- {
- title: 'COS 332',
- description: 'Networking',
- image: COS332Logo
- }
-];
diff --git a/src/client/src/routes/lecturer/+page.svelte b/src/client/src/routes/lecturer/+page.svelte
new file mode 100644
index 00000000..f5f8f0c8
--- /dev/null
+++ b/src/client/src/routes/lecturer/+page.svelte
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/src/client/src/routes/lecturer/+page.ts b/src/client/src/routes/lecturer/+page.ts
new file mode 100644
index 00000000..afb68e9c
--- /dev/null
+++ b/src/client/src/routes/lecturer/+page.ts
@@ -0,0 +1,26 @@
+/** @type {import('./$types').PageLoad} */
+
+export function load() {
+ return {
+ announcements: [
+ {
+ date: '10 Oct',
+ heading: 'Campus Safety Drill',
+ announcement:
+ 'A campus-wide safety drill will be conducted on October 15th at 10 AM. All students and staff are required to participate. Please review the safety procedures and follow instructions during the drill.'
+ },
+ {
+ date: '12 Oct',
+ heading: 'New Library Hours',
+ announcement:
+ 'Starting October 20th, the university library will have extended hours. It will now be open from 8 AM to 12 AM, Monday through Friday, and 9 AM to 10 PM on weekends.'
+ },
+ {
+ date: '15 Oct',
+ heading: 'Guest Lecture Series',
+ announcement:
+ 'We are excited to announce a new guest lecture series starting October 25th. Prominent speakers from various fields will be sharing their insights. All students and faculty are encouraged to attend.'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/lecturer/activities/+page.svelte b/src/client/src/routes/lecturer/activities/+page.svelte
new file mode 100644
index 00000000..6bd262eb
--- /dev/null
+++ b/src/client/src/routes/lecturer/activities/+page.svelte
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/src/client/src/routes/signup/+page.ts b/src/client/src/routes/lecturer/activities/+page.ts
similarity index 100%
rename from src/client/src/routes/signup/+page.ts
rename to src/client/src/routes/lecturer/activities/+page.ts
diff --git a/src/client/src/routes/lecturer/classroom/+page.svelte b/src/client/src/routes/lecturer/classroom/+page.svelte
new file mode 100644
index 00000000..b617f4a7
--- /dev/null
+++ b/src/client/src/routes/lecturer/classroom/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/students/+page.ts b/src/client/src/routes/lecturer/classroom/+page.ts
similarity index 100%
rename from src/client/src/routes/students/+page.ts
rename to src/client/src/routes/lecturer/classroom/+page.ts
diff --git a/src/client/src/routes/lessons/[id]/+page.server.ts b/src/client/src/routes/lecturer/classroom/[id]/+page.server.ts
similarity index 94%
rename from src/client/src/routes/lessons/[id]/+page.server.ts
rename to src/client/src/routes/lecturer/classroom/[id]/+page.server.ts
index e213eccb..abff8514 100644
--- a/src/client/src/routes/lessons/[id]/+page.server.ts
+++ b/src/client/src/routes/lecturer/classroom/[id]/+page.server.ts
@@ -1,4 +1,4 @@
-import { username } from '$lib/stores/store';
+import { username } from '$lib/store';
import { StreamClient } from '@stream-io/node-sdk';
import { STREAM_API_KEY, STREAM_SECRET_KEY } from '$env/static/private';
diff --git a/src/client/src/routes/lessons/[id]/+page.svelte b/src/client/src/routes/lecturer/classroom/[id]/+page.svelte
similarity index 95%
rename from src/client/src/routes/lessons/[id]/+page.svelte
rename to src/client/src/routes/lecturer/classroom/[id]/+page.svelte
index db77b271..dd1ee8ac 100644
--- a/src/client/src/routes/lessons/[id]/+page.svelte
+++ b/src/client/src/routes/lecturer/classroom/[id]/+page.svelte
@@ -3,7 +3,7 @@
import { onMount, onDestroy } from 'svelte';
import { StreamVideoClient, type Call } from '@stream-io/video-client';
- import { userInfo } from '$lib/stores/store';
+ import { userInfo } from '$lib/store';
import Container from '$lib/components/lesson/Container.svelte';
import ControlPanel from '$lib/components/lesson/ControlPanel.svelte';
diff --git a/src/client/src/routes/lecturer/dashboard/+page.server.ts b/src/client/src/routes/lecturer/dashboard/+page.server.ts
new file mode 100644
index 00000000..68c84e5c
--- /dev/null
+++ b/src/client/src/routes/lecturer/dashboard/+page.server.ts
@@ -0,0 +1,123 @@
+/** @type {import('./$types').Actions} */
+import axios from 'axios';
+import { webcrypto as crypto } from 'crypto';
+import { FILE_UPLOAD_API_KEY, FILE_UPLOAD_URL } from '$env/static/private';
+
+function generateFileName(originalFileName: string): string {
+ // Split the original filename to get the base name and extension
+ const lastDotIndex = originalFileName.lastIndexOf('.');
+ if (lastDotIndex === -1) {
+ throw new Error('Filename does not have an extension');
+ }
+
+ const extension = originalFileName.substring(lastDotIndex);
+
+ // 4-byte timestamp
+ const timestamp = Math.floor(Date.now() / 1000);
+ const timestampHex = timestamp.toString(16).padStart(8, '0');
+
+ // 5-byte random value
+ const randomValue = crypto.getRandomValues(new Uint8Array(5));
+ const randomValueHex = Array.from(randomValue)
+ .map((b) => b.toString(16).padStart(2, '0'))
+ .join('');
+
+ // 3-byte counter, initialized to a random value
+ const counter = Math.floor(Math.random() * 0xffffff);
+ const counterHex = counter.toString(16).padStart(6, '0');
+
+ // Combine to form the ObjectId
+ const objectId = timestampHex + randomValueHex + counterHex;
+
+ // Combine objectId and extension to form the final filename
+ return `${objectId}${extension}`;
+}
+
+async function fileToBase64(file: File): Promise {
+ const buffer = await file.arrayBuffer();
+ const base64 = Buffer.from(buffer).toString('base64');
+ return base64;
+}
+
+async function uploadfileToS3(file: File, filename: string, contentType: string) {
+ try {
+ const base64file: string = await fileToBase64(file);
+
+ const body = {
+ file: base64file,
+ filename: filename,
+ contentType: contentType
+ };
+
+ const headers = {
+ 'Content-Type': 'application/json',
+ 'x-api-key': FILE_UPLOAD_API_KEY
+ };
+
+ const response = await axios.post(FILE_UPLOAD_URL, body, { headers });
+
+ // Parse the response body JSON
+ const responseBody = JSON.parse(response.data.body);
+
+ // Check if response includes fileUrl
+ if (responseBody.fileUrl) {
+ console.log('File uploaded successfully');
+ return responseBody; // Return the entire response body if needed
+ } else {
+ throw new Error('File upload failed: No fileUrl in response');
+ }
+ } catch (error) {
+ console.log('Error during file upload:', error);
+ throw error;
+ }
+}
+
+export const actions = {
+ upload: async ({ request }) => {
+ try {
+ const formData = await request.formData();
+
+ // Get the form field values
+ const title = formData.get('title');
+ const description = formData.get('description');
+ let file_url;
+ const file = formData.get('file');
+
+ // Log the extracted data
+ console.log('Title:', title);
+ console.log('Description:', description);
+
+ // Ensure the file is present
+ if (!file) {
+ throw new Error('File is required');
+ }
+
+ if (file instanceof File) {
+ const filename = generateFileName(file.name);
+ const response_data = await uploadfileToS3(file, filename, file.type);
+ file_url = response_data.fileUrl;
+ console.log('File URL:', file_url);
+ } else {
+ console.log('No file received');
+ }
+ } catch (error) {
+ console.error('Error during file upload:', error);
+ return {
+ error: error
+ };
+ }
+ },
+
+ delete: async ({ request }) => {
+ try {
+ const formData = await request.formData();
+ //TODO: create the delete logic
+ return formData;
+ } catch (error) {
+ console.error('Error during file deletion:', error);
+ return {
+ error: error
+ };
+ }
+ }
+};
diff --git a/src/client/src/routes/lecturer/dashboard/+page.svelte b/src/client/src/routes/lecturer/dashboard/+page.svelte
new file mode 100644
index 00000000..ae0ee09e
--- /dev/null
+++ b/src/client/src/routes/lecturer/dashboard/+page.svelte
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/src/client/src/routes/lecturer/dashboard/+page.ts b/src/client/src/routes/lecturer/dashboard/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/lecturer/profile/+page.svelte b/src/client/src/routes/lecturer/profile/+page.svelte
new file mode 100644
index 00000000..160aface
--- /dev/null
+++ b/src/client/src/routes/lecturer/profile/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/lecturer/profile/+page.ts b/src/client/src/routes/lecturer/profile/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/lecturer/sandbox/+page.svelte b/src/client/src/routes/lecturer/sandbox/+page.svelte
new file mode 100644
index 00000000..78779247
--- /dev/null
+++ b/src/client/src/routes/lecturer/sandbox/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/lecturer/sandbox/+page.ts b/src/client/src/routes/lecturer/sandbox/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/lecturers/+page.svelte b/src/client/src/routes/lecturers/+page.svelte
deleted file mode 100644
index d79e9043..00000000
--- a/src/client/src/routes/lecturers/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/lessons/+page.svelte b/src/client/src/routes/lessons/+page.svelte
deleted file mode 100644
index 1eea4b75..00000000
--- a/src/client/src/routes/lessons/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/organisation/+page.svelte b/src/client/src/routes/organisation/+page.svelte
deleted file mode 100644
index 820bf428..00000000
--- a/src/client/src/routes/organisation/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/profile/+page.svelte b/src/client/src/routes/profile/+page.svelte
deleted file mode 100644
index 28f7e513..00000000
--- a/src/client/src/routes/profile/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/settings/+page.svelte b/src/client/src/routes/settings/+page.svelte
deleted file mode 100644
index 88aff789..00000000
--- a/src/client/src/routes/settings/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/routes/student/+page.svelte b/src/client/src/routes/student/+page.svelte
new file mode 100644
index 00000000..bc7de5a0
--- /dev/null
+++ b/src/client/src/routes/student/+page.svelte
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/src/client/src/routes/student/+page.ts b/src/client/src/routes/student/+page.ts
new file mode 100644
index 00000000..8078dd82
--- /dev/null
+++ b/src/client/src/routes/student/+page.ts
@@ -0,0 +1,24 @@
+/** @type {import('./$types').PageLoad} */
+import { get } from 'svelte/store';
+import { user_details } from '$lib/store';
+
+export function load() {
+ const details = get(user_details);
+ console.log('User details:', details);
+ return {
+ modules: [
+ {
+ module_name: 'Computer Networks',
+ module_id: '123456789'
+ },
+ {
+ module_name: 'Computer Graphics',
+ module_id: '789123456'
+ },
+ {
+ module_name: 'Programming Languages',
+ module_id: '789456123'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/student/activities/+page.svelte b/src/client/src/routes/student/activities/+page.svelte
new file mode 100644
index 00000000..59ab73a3
--- /dev/null
+++ b/src/client/src/routes/student/activities/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/activities/+page.ts b/src/client/src/routes/student/activities/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/student/grades/+page.svelte b/src/client/src/routes/student/grades/+page.svelte
new file mode 100644
index 00000000..59ab73a3
--- /dev/null
+++ b/src/client/src/routes/student/grades/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/grades/+page.ts b/src/client/src/routes/student/grades/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/student/module/+page.svelte b/src/client/src/routes/student/module/+page.svelte
new file mode 100644
index 00000000..bf536ec4
--- /dev/null
+++ b/src/client/src/routes/student/module/+page.svelte
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/src/client/src/routes/student/module/+page.ts b/src/client/src/routes/student/module/+page.ts
new file mode 100644
index 00000000..afb68e9c
--- /dev/null
+++ b/src/client/src/routes/student/module/+page.ts
@@ -0,0 +1,26 @@
+/** @type {import('./$types').PageLoad} */
+
+export function load() {
+ return {
+ announcements: [
+ {
+ date: '10 Oct',
+ heading: 'Campus Safety Drill',
+ announcement:
+ 'A campus-wide safety drill will be conducted on October 15th at 10 AM. All students and staff are required to participate. Please review the safety procedures and follow instructions during the drill.'
+ },
+ {
+ date: '12 Oct',
+ heading: 'New Library Hours',
+ announcement:
+ 'Starting October 20th, the university library will have extended hours. It will now be open from 8 AM to 12 AM, Monday through Friday, and 9 AM to 10 PM on weekends.'
+ },
+ {
+ date: '15 Oct',
+ heading: 'Guest Lecture Series',
+ announcement:
+ 'We are excited to announce a new guest lecture series starting October 25th. Prominent speakers from various fields will be sharing their insights. All students and faculty are encouraged to attend.'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/student/module/announcements/+page.svelte b/src/client/src/routes/student/module/announcements/+page.svelte
new file mode 100644
index 00000000..8b916ff1
--- /dev/null
+++ b/src/client/src/routes/student/module/announcements/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/module/announcements/+page.ts b/src/client/src/routes/student/module/announcements/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/student/module/classroom/+page.svelte b/src/client/src/routes/student/module/classroom/+page.svelte
new file mode 100644
index 00000000..29dd5cf9
--- /dev/null
+++ b/src/client/src/routes/student/module/classroom/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/module/classroom/+page.ts b/src/client/src/routes/student/module/classroom/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/student/module/classroom/[id]/+page.server.ts b/src/client/src/routes/student/module/classroom/[id]/+page.server.ts
new file mode 100644
index 00000000..abff8514
--- /dev/null
+++ b/src/client/src/routes/student/module/classroom/[id]/+page.server.ts
@@ -0,0 +1,23 @@
+import { username } from '$lib/store';
+import { StreamClient } from '@stream-io/node-sdk';
+
+import { STREAM_API_KEY, STREAM_SECRET_KEY } from '$env/static/private';
+
+export const load = async () => {
+ if (!username) throw new Error('User is not authenticated');
+ if (!STREAM_API_KEY) throw new Error('Stream API key secret is missing');
+ if (!STREAM_SECRET_KEY) throw new Error('Stream API secret is missing');
+
+ const streamClient = new StreamClient(STREAM_API_KEY, STREAM_SECRET_KEY);
+
+ const tokenProvider = async () => {
+ const expirationTime = Math.floor(Date.now() / 1000) + 3600;
+ const issuedAt = Math.floor(Date.now() / 1000) - 60;
+ const token = streamClient.createToken(username, expirationTime, issuedAt);
+ return token;
+ };
+
+ const token = await tokenProvider();
+
+ return { apiKey: STREAM_API_KEY, token };
+};
diff --git a/src/client/src/routes/student/module/classroom/[id]/+page.svelte b/src/client/src/routes/student/module/classroom/[id]/+page.svelte
new file mode 100644
index 00000000..dd1ee8ac
--- /dev/null
+++ b/src/client/src/routes/student/module/classroom/[id]/+page.svelte
@@ -0,0 +1,41 @@
+
+
+
+ {#if call}
+
diff --git a/src/client/src/routes/student/module/sandbox/+page.svelte b/src/client/src/routes/student/module/sandbox/+page.svelte
new file mode 100644
index 00000000..78779247
--- /dev/null
+++ b/src/client/src/routes/student/module/sandbox/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/module/sandbox/+page.ts b/src/client/src/routes/student/module/sandbox/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/student/module/study/+page.svelte b/src/client/src/routes/student/module/study/+page.svelte
new file mode 100644
index 00000000..8f1ce0de
--- /dev/null
+++ b/src/client/src/routes/student/module/study/+page.svelte
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/src/client/src/routes/student/module/study/+page.ts b/src/client/src/routes/student/module/study/+page.ts
new file mode 100644
index 00000000..e5cd084e
--- /dev/null
+++ b/src/client/src/routes/student/module/study/+page.ts
@@ -0,0 +1,29 @@
+/** @type {import('./$types').PageLoad} */
+import one from '$lib/files/study-notes-one.pdf';
+import two from '$lib/files/study-notes-two.pdf';
+import three from '$lib/files/study-notes-three.pdf';
+
+export function load() {
+ return {
+ materials: [
+ {
+ title: 'Introduction to Computer Networks',
+ description:
+ 'A foundational course covering the basics of computer networking, including network models, protocols, and architectures. (COS 332)',
+ link: one
+ },
+ {
+ title: 'Advanced Networking Concepts',
+ description:
+ 'An in-depth exploration of advanced networking topics such as routing algorithms, network security, and wireless networks. (COS 332)',
+ link: two
+ },
+ {
+ title: 'Practical Network Design',
+ description:
+ 'A hands-on course focusing on the design and implementation of network solutions for real-world applications. (COS 332)',
+ link: three
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/student/module/study/material/+page.svelte b/src/client/src/routes/student/module/study/material/+page.svelte
new file mode 100644
index 00000000..f8c88e95
--- /dev/null
+++ b/src/client/src/routes/student/module/study/material/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/module/study/material/+page.ts b/src/client/src/routes/student/module/study/material/+page.ts
new file mode 100644
index 00000000..5811cd0b
--- /dev/null
+++ b/src/client/src/routes/student/module/study/material/+page.ts
@@ -0,0 +1,23 @@
+/** @type {import('./$types').PageLoad} */
+
+export function load() {
+ return {
+ materials: [
+ {
+ title: 'Introduction to Computer Networks',
+ description:
+ 'A foundational course covering the basics of computer networking, including network models, protocols, and architectures. (COS 332)'
+ },
+ {
+ title: 'Advanced Networking Concepts',
+ description:
+ 'An in-depth exploration of advanced networking topics such as routing algorithms, network security, and wireless networks. (COS 332)'
+ },
+ {
+ title: 'Practical Network Design',
+ description:
+ 'A hands-on course focusing on the design and implementation of network solutions for real-world applications. (COS 332)'
+ }
+ ]
+ };
+}
diff --git a/src/client/src/routes/student/profile/+page.svelte b/src/client/src/routes/student/profile/+page.svelte
new file mode 100644
index 00000000..59ab73a3
--- /dev/null
+++ b/src/client/src/routes/student/profile/+page.svelte
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/src/client/src/routes/student/profile/+page.ts b/src/client/src/routes/student/profile/+page.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/client/src/routes/students/+page.svelte b/src/client/src/routes/students/+page.svelte
deleted file mode 100644
index 6bece31a..00000000
--- a/src/client/src/routes/students/+page.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/client/src/testing/Activities.test.ts b/src/client/src/testing/Activities.test.ts
index 329483d2..aac8c916 100644
--- a/src/client/src/testing/Activities.test.ts
+++ b/src/client/src/testing/Activities.test.ts
@@ -1,6 +1,6 @@
import { render } from '@testing-library/svelte';
import { expect, test } from 'vitest';
-import ActivityTimeline from '../lib/components/admin/+Activities.svelte';
+import ActivityTimeline from '../lib/components/universal/+Activities.svelte';
test('renders activities correctly', () => {
const { getByText } = render(ActivityTimeline);
diff --git a/src/client/static/models/cash_register_with_a_counting_machine.glb b/src/client/static/models/cash_register_with_a_counting_machine.glb
new file mode 100644
index 00000000..1ac6d62a
Binary files /dev/null and b/src/client/static/models/cash_register_with_a_counting_machine.glb differ
-
- Home
- Students
-
-
-
diff --git a/src/client/src/lib/components/admin/+Workspaces.svelte b/src/client/src/lib/components/admin/+Workspaces.svelte
index 9f697de9..28ebcd13 100644
--- a/src/client/src/lib/components/admin/+Workspaces.svelte
+++ b/src/client/src/lib/components/admin/+Workspaces.svelte
@@ -1,23 +1,85 @@
-
-
-
- {#each workspaces as workspace}
-
+
+
diff --git a/src/client/src/lib/components/modals/+AddAdmin.svelte b/src/client/src/lib/components/admin/modals/add/+AddAdmin.svelte
similarity index 94%
rename from src/client/src/lib/components/modals/+AddAdmin.svelte
rename to src/client/src/lib/components/admin/modals/add/+AddAdmin.svelte
index 518bb9fb..4c51877d 100644
--- a/src/client/src/lib/components/modals/+AddAdmin.svelte
+++ b/src/client/src/lib/components/admin/modals/add/+AddAdmin.svelte
@@ -1,7 +1,7 @@
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/modals/+AddLecturer.svelte b/src/client/src/lib/components/admin/modals/add/+AddLecturer.svelte
similarity index 92%
rename from src/client/src/lib/components/modals/+AddLecturer.svelte
rename to src/client/src/lib/components/admin/modals/add/+AddLecturer.svelte
index 11bb2a87..6d0a66c6 100644
--- a/src/client/src/lib/components/modals/+AddLecturer.svelte
+++ b/src/client/src/lib/components/admin/modals/add/+AddLecturer.svelte
@@ -1,8 +1,8 @@
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/modals/+AddStudent.svelte b/src/client/src/lib/components/admin/modals/add/+AddStudent.svelte
similarity index 94%
rename from src/client/src/lib/components/modals/+AddStudent.svelte
rename to src/client/src/lib/components/admin/modals/add/+AddStudent.svelte
index 340d1832..f38e6c65 100644
--- a/src/client/src/lib/components/modals/+AddStudent.svelte
+++ b/src/client/src/lib/components/admin/modals/add/+AddStudent.svelte
@@ -1,7 +1,7 @@
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/modals/+EditAdmin.svelte b/src/client/src/lib/components/admin/modals/edit/+EditAdmin.svelte
similarity index 95%
rename from src/client/src/lib/components/modals/+EditAdmin.svelte
rename to src/client/src/lib/components/admin/modals/edit/+EditAdmin.svelte
index 02d03ff0..67e0e6c4 100644
--- a/src/client/src/lib/components/modals/+EditAdmin.svelte
+++ b/src/client/src/lib/components/admin/modals/edit/+EditAdmin.svelte
@@ -2,8 +2,8 @@
export let adminID = '';
import { Button, Modal, Label, Input } from 'flowbite-svelte';
- import { updateUser } from '../../../services/users';
- import { admChange } from '../../stores/store';
+ import { updateUser } from '$lib/services/users';
+ import { admChange } from '$lib/store';
let formModal = false;
diff --git a/src/client/src/lib/components/modals/+EditLecturer.svelte b/src/client/src/lib/components/admin/modals/edit/+EditLecturer.svelte
similarity index 95%
rename from src/client/src/lib/components/modals/+EditLecturer.svelte
rename to src/client/src/lib/components/admin/modals/edit/+EditLecturer.svelte
index 774f8626..4d1d00e2 100644
--- a/src/client/src/lib/components/modals/+EditLecturer.svelte
+++ b/src/client/src/lib/components/admin/modals/edit/+EditLecturer.svelte
@@ -1,7 +1,7 @@
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/modals/+Remove.svelte b/src/client/src/lib/components/admin/modals/remove/+Remove.svelte
similarity index 90%
rename from src/client/src/lib/components/modals/+Remove.svelte
rename to src/client/src/lib/components/admin/modals/remove/+Remove.svelte
index 11e819e0..42c3f01c 100644
--- a/src/client/src/lib/components/modals/+Remove.svelte
+++ b/src/client/src/lib/components/admin/modals/remove/+Remove.svelte
@@ -3,9 +3,9 @@
import { Button, Modal } from 'flowbite-svelte';
import { ExclamationCircleOutline } from 'flowbite-svelte-icons';
- import { deleteUser } from '../../../services/users';
+ import { deleteUser } from '$lib/services/users';
import IconTrash from '@tabler/icons-svelte/IconTrash.svelte';
- import { lecChange, stuChange, admChange } from '../../stores/store';
+ import { lecChange, stuChange, admChange } from '$lib/store';
let popupModal = false;
async function handleRemove(event: Event) {
diff --git a/src/client/src/lib/components/modals/+RemoveOrg.svelte b/src/client/src/lib/components/admin/modals/remove/+RemoveOrg.svelte
similarity index 90%
rename from src/client/src/lib/components/modals/+RemoveOrg.svelte
rename to src/client/src/lib/components/admin/modals/remove/+RemoveOrg.svelte
index fa9fbbb3..95e800b7 100644
--- a/src/client/src/lib/components/modals/+RemoveOrg.svelte
+++ b/src/client/src/lib/components/admin/modals/remove/+RemoveOrg.svelte
@@ -2,8 +2,8 @@
import { goto } from '$app/navigation';
import { Button, Modal } from 'flowbite-svelte';
import { ExclamationCircleOutline } from 'flowbite-svelte-icons';
- import { deleteOrganization } from '../../../services/orgs';
- import { organisationName } from '$lib/stores/store';
+ import { deleteOrganization } from '$lib/services/orgs';
+ import { organisationName } from '$lib/store';
let popupModal = false;
async function handleRemove() {
diff --git a/src/client/src/lib/components/authentication/+Landing.svelte b/src/client/src/lib/components/authentication/+Landing.svelte
deleted file mode 100644
index eb289e0b..00000000
--- a/src/client/src/lib/components/authentication/+Landing.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- {
- opacity.set(1);
- y.set(0);
- }}
- on:mouseleave={() => {
- opacity.set(0);
- y.set(40);
- }}
- >
-
-
diff --git a/src/client/src/lib/components/envirmonment/+Scene.svelte b/src/client/src/lib/components/envirmonment/+Scene.svelte
new file mode 100644
index 00000000..229cffc4
--- /dev/null
+++ b/src/client/src/lib/components/envirmonment/+Scene.svelte
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/envirmonment/models/Cash_Register.svelte b/src/client/src/lib/components/envirmonment/models/Cash_Register.svelte
new file mode 100644
index 00000000..50ab438f
--- /dev/null
+++ b/src/client/src/lib/components/envirmonment/models/Cash_Register.svelte
@@ -0,0 +1,42 @@
+
+
+
+
+
+ {#await gltf}
+
+
+
+
+
+
+ {:catch error}
+
diff --git a/src/client/src/lib/components/lecturer/+Dashboard.svelte b/src/client/src/lib/components/lecturer/+Dashboard.svelte
new file mode 100644
index 00000000..d0c52c1a
--- /dev/null
+++ b/src/client/src/lib/components/lecturer/+Dashboard.svelte
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/admin/+Lessons.svelte b/src/client/src/lib/components/lecturer/+Lessons.svelte
similarity index 79%
rename from src/client/src/lib/components/admin/+Lessons.svelte
rename to src/client/src/lib/components/lecturer/+Lessons.svelte
index ace70c8b..d5f951ef 100644
--- a/src/client/src/lib/components/admin/+Lessons.svelte
+++ b/src/client/src/lib/components/lecturer/+Lessons.svelte
@@ -1,6 +1,12 @@
+
+
@@ -39,9 +53,11 @@
-
+
+
+
-
-
-
+- {workspace.title} -
-- {workspace.description} -
-
+
-
+
+
+
+
- {/each}
+ Workspaces
+ + + {workspaces.length} + {' '} workspaces +
+
+
+
+
+
Overview
+
+
+ Study Material Upload
+
+
+ + Study Material: + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. +
+3D Material Upload
+
+
+ + 3D Material: + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. +
+
-
+ {#if $showButtonReactive}
+
+
+ {/if}
diff --git a/src/client/src/lib/components/lecturer/+Overview.svelte b/src/client/src/lib/components/lecturer/+Overview.svelte new file mode 100644 index 00000000..eee5ec5b --- /dev/null +++ b/src/client/src/lib/components/lecturer/+Overview.svelte @@ -0,0 +1,47 @@ + + +
+ {#each stats as stat}
+
+
+
+
+ {/each}
+
+
+
+
+
+
+ + {stat.title} +
+
+
+ + + {stat.stat} + +
+
+
diff --git a/src/client/src/lib/components/modals/+ScheduleLesson.svelte b/src/client/src/lib/components/lecturer/modals/+ScheduleLesson.svelte
similarity index 100%
rename from src/client/src/lib/components/modals/+ScheduleLesson.svelte
rename to src/client/src/lib/components/lecturer/modals/+ScheduleLesson.svelte
diff --git a/src/client/src/lib/components/lecturer/modals/+UploadStudy.svelte b/src/client/src/lib/components/lecturer/modals/+UploadStudy.svelte
new file mode 100644
index 00000000..5c9418a1
--- /dev/null
+++ b/src/client/src/lib/components/lecturer/modals/+UploadStudy.svelte
@@ -0,0 +1,40 @@
+
+
+
+
+
+
diff --git a/src/client/src/lib/components/student/+Material.svelte b/src/client/src/lib/components/student/+Material.svelte
new file mode 100644
index 00000000..d02bc980
--- /dev/null
+++ b/src/client/src/lib/components/student/+Material.svelte
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/src/client/src/lib/components/admin/+Navigation.svelte b/src/client/src/lib/components/student/+Module.svelte
similarity index 100%
rename from src/client/src/lib/components/admin/+Navigation.svelte
rename to src/client/src/lib/components/student/+Module.svelte
diff --git a/src/client/src/lib/components/student/+Study.svelte b/src/client/src/lib/components/student/+Study.svelte
new file mode 100644
index 00000000..677cb8f7
--- /dev/null
+++ b/src/client/src/lib/components/student/+Study.svelte
@@ -0,0 +1,16 @@
+
+
+University of Pretoria
+Computer Science
+
+
+
+ {#each modules as module}
+
+
+
diff --git a/src/client/src/lib/components/admin/+Activities.svelte b/src/client/src/lib/components/universal/+Activities.svelte
similarity index 100%
rename from src/client/src/lib/components/admin/+Activities.svelte
rename to src/client/src/lib/components/universal/+Activities.svelte
diff --git a/src/client/src/lib/components/universal/+Announcements.svelte b/src/client/src/lib/components/universal/+Announcements.svelte
new file mode 100644
index 00000000..9f799669
--- /dev/null
+++ b/src/client/src/lib/components/universal/+Announcements.svelte
@@ -0,0 +1,19 @@
+
+
+Computer Science
+Computer Networks
+
+
+
+ {#each materials as material}
+
+
+
diff --git a/src/client/src/lib/components/universal/+Construction.svelte b/src/client/src/lib/components/universal/+Construction.svelte
new file mode 100644
index 00000000..c492aed1
--- /dev/null
+++ b/src/client/src/lib/components/universal/+Construction.svelte
@@ -0,0 +1,16 @@
+
+
+
+
+
+ {#each announcements as announcement}
+ + Announcements +
+
+ 
+
+
diff --git a/src/client/src/lib/components/universal/+SandBox.svelte b/src/client/src/lib/components/universal/+SandBox.svelte
new file mode 100644
index 00000000..f528555e
--- /dev/null
+++ b/src/client/src/lib/components/universal/+SandBox.svelte
@@ -0,0 +1,56 @@
+
+
+
+ + Site is under contruction +
++ We're working hard to improve the user experience. Stay tuned! +
+
+
+
+
+
+
+Sandbox
+
+
+
+
+
+
+
+
+
+
+
+ Eugene Mpande
+ u21573558
+
+
diff --git a/src/client/src/lib/components/utils/lecturer/+ObjectCard.svelte b/src/client/src/lib/components/utils/lecturer/+ObjectCard.svelte
new file mode 100644
index 00000000..2359097b
--- /dev/null
+++ b/src/client/src/lib/components/utils/lecturer/+ObjectCard.svelte
@@ -0,0 +1,32 @@
+
+
+Study Material Uploads
+ {#each files as file} +
+
+ {/each}
+ {file.name}
+
+
+
+
diff --git a/src/client/src/lib/components/utils/lecturer/+SideBar.svelte b/src/client/src/lib/components/utils/lecturer/+SideBar.svelte
new file mode 100644
index 00000000..54332a5d
--- /dev/null
+++ b/src/client/src/lib/components/utils/lecturer/+SideBar.svelte
@@ -0,0 +1,68 @@
+
+
+
diff --git a/src/client/src/lib/components/utils/student/+HomeCard.svelte b/src/client/src/lib/components/utils/student/+HomeCard.svelte
new file mode 100644
index 00000000..5769433a
--- /dev/null
+++ b/src/client/src/lib/components/utils/student/+HomeCard.svelte
@@ -0,0 +1,24 @@
+
+
+Object Uploads
+ {#each files as file} +
+
+ {/each}
+ {file.name}
+
+
++ {module_name} +
+ +
+
+
diff --git a/src/client/src/lib/components/utils/universal/cards/+StudyCard.svelte b/src/client/src/lib/components/utils/universal/cards/+StudyCard.svelte
new file mode 100644
index 00000000..c58d14d1
--- /dev/null
+++ b/src/client/src/lib/components/utils/universal/cards/+StudyCard.svelte
@@ -0,0 +1,34 @@
+
+
+{announcement}
+
+
+
+
+
+ {date}
+
+
+ 
+
diff --git a/src/client/src/lib/files/study-notes-one.pdf b/src/client/src/lib/files/study-notes-one.pdf
new file mode 100644
index 00000000..e40f7e4d
Binary files /dev/null and b/src/client/src/lib/files/study-notes-one.pdf differ
diff --git a/src/client/src/lib/files/study-notes-three.pdf b/src/client/src/lib/files/study-notes-three.pdf
new file mode 100644
index 00000000..725a073b
Binary files /dev/null and b/src/client/src/lib/files/study-notes-three.pdf differ
diff --git a/src/client/src/lib/files/study-notes-two.pdf b/src/client/src/lib/files/study-notes-two.pdf
new file mode 100644
index 00000000..94d94779
Binary files /dev/null and b/src/client/src/lib/files/study-notes-two.pdf differ
diff --git a/src/client/src/lib/images/pdf-cover.svg b/src/client/src/lib/images/pdf-cover.svg
new file mode 100644
index 00000000..53e5d184
--- /dev/null
+++ b/src/client/src/lib/images/pdf-cover.svg
@@ -0,0 +1,45 @@
+
+
+
\ No newline at end of file
diff --git a/src/client/src/lib/images/random-image.avif b/src/client/src/lib/images/random-image.avif
new file mode 100644
index 00000000..eb7b253a
Binary files /dev/null and b/src/client/src/lib/images/random-image.avif differ
diff --git a/src/client/src/services/auth.ts b/src/client/src/lib/services/auth.ts
similarity index 96%
rename from src/client/src/services/auth.ts
rename to src/client/src/lib/services/auth.ts
index 9811e65d..7c31cef6 100644
--- a/src/client/src/services/auth.ts
+++ b/src/client/src/lib/services/auth.ts
@@ -9,6 +9,7 @@ export async function signIn(username: string, password: string): Promise
+
++ {title} +
++ {description} +
+ +
-
-
-
diff --git a/src/client/src/routes/+page.svelte b/src/client/src/routes/+page.svelte
index a6be6e4d..6e6cda37 100644
--- a/src/client/src/routes/+page.svelte
+++ b/src/client/src/routes/+page.svelte
@@ -1,49 +1,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
- Degree Dashboard
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- University of Pretoria
-Computer Science
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-