Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/upload #66

Merged
merged 27 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
90b5148
addition of student route
bukhosi-eugene-mpande Jun 10, 2024
750e85b
intial student page
bukhosi-eugene-mpande Jun 10, 2024
32606a4
initial implementation of sandbox
Lunga-Ntando-Ndlovu Jun 11, 2024
31d4ca4
student implementation with the routes
bukhosi-eugene-mpande Jun 12, 2024
552e173
addition of study material and announcements page
bukhosi-eugene-mpande Jun 12, 2024
319eac9
addition of initial settings for object
Lunga-Ntando-Ndlovu Jun 12, 2024
7ff914a
updated folder struc with the addition of a lecturer route
bukhosi-eugene-mpande Jun 15, 2024
2619051
addition data fetching for modules
bukhosi-eugene-mpande Jun 15, 2024
4b9d50f
addition of study materials reading page
bukhosi-eugene-mpande Jun 15, 2024
52dcdda
addition of topbar to admin page and update to notifications styling
bukhosi-eugene-mpande Jun 16, 2024
98b51ac
addition of dyanamic study material handing and update to tests to en…
bukhosi-eugene-mpande Jun 16, 2024
11d835d
addition of HomeCard to capture the module id
bukhosi-eugene-mpande Jun 17, 2024
a96aa89
addition of user details capturing
bukhosi-eugene-mpande Jun 17, 2024
a57ca53
initial completion of styling of 3d window
Lunga-Ntando-Ndlovu Jun 17, 2024
a84a651
addition of starter lecturer route
bukhosi-eugene-mpande Jun 18, 2024
19ff395
addition of lecturer dashboard
bukhosi-eugene-mpande Jun 19, 2024
067cef2
cosolidation of uploads
bukhosi-eugene-mpande Jun 19, 2024
130d38b
formating fix
bukhosi-eugene-mpande Jun 20, 2024
2833367
Merge branch 'develop' into feature/student-home
bukhosi-eugene-mpande Jun 20, 2024
df2f95a
updates to store linking
bukhosi-eugene-mpande Jun 20, 2024
1ee2066
addition of form upload handler
bukhosi-eugene-mpande Jun 20, 2024
ff960c4
updated from data capturing
bukhosi-eugene-mpande Jun 20, 2024
78d1107
addition of upload backend
bukhosi-eugene-mpande Jun 21, 2024
c032627
addition of lessons for students and lecturers
bukhosi-eugene-mpande Jun 21, 2024
e6869d5
Merge branch 'feature/sandbox' into feature/upload
bukhosi-eugene-mpande Jun 21, 2024
fc1bf83
addition of sandbox for lecturer and student
bukhosi-eugene-mpande Jun 21, 2024
0d57c21
addition of workspaces frontend
bukhosi-eugene-mpande Jun 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/mongo.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sudo systemctl start mongod
sudo systemctl status mongo
sudo systemctl status mongod
Binary file modified src/client/bun.lockb
Binary file not shown.
4 changes: 2 additions & 2 deletions src/client/cypress/e2e/act.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Activities page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173/activities');
cy.visit('http://localhost:5173/admin/activities');
cy.get('h1').contains('Activities').should('be.visible');
});

Expand All @@ -15,7 +15,7 @@ describe('Activities page', () => {

activities.forEach((activity) => {
it(`displays the activity: ${activity}`, () => {
cy.visit('http://localhost:5173/activities');
cy.visit('http://localhost:5173/admin/activities');
cy.contains(activity).should('be.visible');
});
});
Expand Down
6 changes: 3 additions & 3 deletions src/client/cypress/e2e/adm.cy.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
describe('Admins page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173/admins');
cy.visit('http://localhost:5173/admin/admins');
cy.get('h2').contains('Admins').should('be.visible');
});

it('displays the button', () => {
cy.visit('http://localhost:5173/admins');
cy.visit('http://localhost:5173/admin/admins');
cy.get('button').should('be.visible');
});

it('displays the search input', () => {
cy.visit('http://localhost:5173/admins');
cy.visit('http://localhost:5173/admin/admins');
cy.get('input[type="text"]').should('be.visible');
});
});
4 changes: 2 additions & 2 deletions src/client/cypress/e2e/ann.cy.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
describe('Announcements page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173/announcements');
cy.visit('http://localhost:5173/admin/announcements');
cy.get('h1').contains('Announcements').should('be.visible');
});

const announcements = ['Campus Safety Drill', 'New Library Hours', 'Guest Lecture Series'];

announcements.forEach((announcement) => {
it(`displays the announcement: ${announcement}`, () => {
cy.visit('http://localhost:5173/announcements');
cy.visit('http://localhost:5173/admin/announcements');
cy.contains(announcement).should('be.visible');
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/client/cypress/e2e/hm.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Degree Dashboard page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173');
cy.visit('http://localhost:5173/admin');
cy.get('h1').contains('Degree Dashboard').should('be.visible');
});

Expand All @@ -21,7 +21,7 @@ describe('Degree Dashboard page', () => {

degrees.forEach((degree) => {
it(`displays the degree: ${degree}`, () => {
cy.visit('http://localhost:5173');
cy.visit('http://localhost:5173/admin');
cy.contains(degree).should('be.visible');
});
});
Expand Down
6 changes: 3 additions & 3 deletions src/client/cypress/e2e/lec.cy.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
describe('Lecturers page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173/lecturers');
cy.visit('http://localhost:5173/admin/lecturers');
cy.get('h2').contains('Lecturers').should('be.visible');
});

it('displays the button', () => {
cy.visit('http://localhost:5173/lecturers');
cy.visit('http://localhost:5173/admin/lecturers');
cy.get('button').should('be.visible');
});

it('displays the search input', () => {
cy.visit('http://localhost:5173/lecturers');
cy.visit('http://localhost:5173/admin/lecturers');
cy.get('input[type="text"]').should('be.visible');
});
});
4 changes: 2 additions & 2 deletions src/client/cypress/e2e/org.cy.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
describe('Organisation page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173/organisation');
cy.visit('http://localhost:5173/admin/organisation');
cy.get('h2').contains('Organisation').should('be.visible');
});

it('displays the button', () => {
cy.visit('http://localhost:5173/organisation');
cy.visit('http://localhost:5173/admin/organisation');
cy.get('button').should('be.visible');
});
});
6 changes: 3 additions & 3 deletions src/client/cypress/e2e/stu.cy.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
describe('Students page', () => {
it('displays the heading', () => {
cy.visit('http://localhost:5173/students');
cy.visit('http://localhost:5173/admin/students');
cy.get('h2').contains('Students').should('be.visible');
});

it('displays the button', () => {
cy.visit('http://localhost:5173/students');
cy.visit('http://localhost:5173/admin/students');
cy.get('button').should('be.visible');
});

it('displays the search input', () => {
cy.visit('http://localhost:5173/students');
cy.visit('http://localhost:5173/admin/students');
cy.get('input[type="text"]').should('be.visible');
});
});
Loading
Loading