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.

Sign up for GitHub

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/darkmode #32

Merged
merged 7 commits into from
Jun 3, 2024
Merged

Feature/darkmode #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb7fd58
initial implementaion of darkmode
Lunga-Ntando-Ndlovu Jun 2, 2024
1a5052d
Merge branch 'develop' into feature/darkmode
Lunga-Ntando-Ndlovu Jun 2, 2024
2623186
completion of darkmode for sign in and sign up and sidebar
Lunga-Ntando-Ndlovu Jun 2, 2024
e63b8a6
completion of darkmode
Lunga-Ntando-Ndlovu Jun 3, 2024
d3a13b8
fixed issue with linter for files
Lunga-Ntando-Ndlovu Jun 3, 2024
ac1f96a
addition of jest test coverage
Lunga-Ntando-Ndlovu Jun 3, 2024
0233339
addition of relevant links and removal of non-relevant info
Lunga-Ntando-Ndlovu Jun 3, 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 .github/workflows/backend-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: bun install
working-directory: src/server/workspace
- name: Run Backend Tests
run: bun run test
run: bun run test:cov
working-directory: src/server/workspace
- name: Upload coverage reports to Codecov
uses: codecov/[email protected]
Expand Down
12 changes: 2 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,14 @@ is revolutionising education by making learning more immersive and engaging.

#### Main Documentation

- [SRS Documentation](#)
- [Software Architectures](#)
- [SRS Documentation](https://drive.google.com/file/d/1wYVm633sFN6IBOVznN6bsqExY96VErcM/view?usp=sharing)

#### Extra Documentation

- [Coding Standards](#)
- [Testing Policy](#)
- [Development Diagram](#)
- [Installation Manual](#)
- [User Manuals](#)

### Demos

#### Demo 1

- [Demo 1 Slides](#)
- [Demo 1 Slides](https://docs.google.com/presentation/d/1L8ZY2dsLOlN_DjLjXGGN0u27xAqYxq00/edit?usp=sharing&ouid=106314516968758648353&rtpof=true&sd=true)
- [Demo 1 Video](#)

### Technologies
Expand Down
2 changes: 1 addition & 1 deletion src/client/src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<body data-sveltekit-preload-data="hover" class="bg-white dark:bg-gray-700">
<div style="display: contents">%sveltekit.body%</div>
</body>
</html>
2 changes: 1 addition & 1 deletion src/client/src/lib/components/admin/+Activities.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
];
</script>

<div class="w-full">
<div class="w-full dark:bg-gray-800">
<div class="text-center">
<h1 class="text-4xl font-semibold capitalize text-gray-800 dark:text-white lg:text-3xl">
Activities
Expand Down
16 changes: 8 additions & 8 deletions src/client/src/lib/components/admin/+Announcements.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@
];
</script>

<div class="bg-lightBgColor">
<div class="bg-lightBgColor dark:bg-gray-800">
<div class="text-center">
<h1 class="text-4xl font-semibold capitalize text-gray-800 dark:text-white lg:text-3xl">
Announcements
</h1>
</div>
{#each announcements as announcement}
<article class="flex bg-lightBgColor py-2 transition hover:shadow-xl">
<div class="rotate-180 p-2 [writing-mode:_vertical-lr]">
<article class="flex bg-lightBgColor py-2 transition hover:shadow-xl dark:bg-gray-800">
<div class="rotate-180 p-2 [writing-mode:_vertical-lr] dark:text-gray-300">
<time
datetime="2022-10-10"
class="flex items-center justify-between gap-4 text-xs font-bold uppercase text-gray-900"
class="flex items-center justify-between gap-4 text-xs font-bold uppercase text-gray-900 dark:text-gray-300"
>
<span class="w-px flex-1 bg-gray-900/10"></span>
<span class="w-px flex-1 bg-gray-900/10 dark:bg-gray-400"></span>
<span>{announcement.date}</span>
</time>
</div>

<div class="flex flex-1 flex-col justify-between">
<div class="flex flex-1 flex-col justify-between dark:bg-gray-800">
<div class="border-s border-gray-900/10 p-4 sm:border-l-transparent sm:p-6">
<a href="/">
<h3 class="font-bold uppercase text-gray-900">
<h3 class="font-bold uppercase text-gray-900 dark:text-gray-300">
{announcement.heading}
</h3>
</a>

<p class="mt-2 line-clamp-3 text-sm/relaxed text-gray-700">
<p class="mt-2 line-clamp-3 text-sm/relaxed text-gray-700 dark:text-gray-300">
{announcement.announcement}
</p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/client/src/lib/components/admin/+Organisation.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
scope="col"
class="px-4 py-3.5 text-left text-sm font-normal text-gray-500 dark:text-gray-400 rtl:text-right"
>
<button class="flex items-center gap-x-3 focus:outline-none"> Feild </button>
<button class="flex items-center gap-x-3 focus:outline-none"> Field </button>
</th>

<th
Expand All @@ -84,10 +84,10 @@
<tr>
<td class="whitespace-nowrap px-4 py-4 text-sm font-medium">
<div>
<h2 class="font-medium text-gray-800 dark:text-white">Orgnisation Name</h2>
<h2 class="font-medium text-gray-800 dark:text-gray-300">Orgnisation Name</h2>
</div>
</td>
<td class="whitespace-nowrap px-12 py-4 text-sm font-medium">
<td class="whitespace-nowrap px-12 py-4 text-sm font-medium dark:text-gray-300">
{$organisationName}
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions src/client/src/lib/components/authentication/+SignInForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</div>

<form on:submit={handleSubmit}>
<Label for="username" class="mb-2 mt-2">Username</Label>
<Label for="username" class="mb-2 mt-2 dark:text-gray-800">Username</Label>
<Input
type="text"
id="username"
Expand All @@ -62,7 +62,7 @@
required
/>

<Label for="password" class="mb-2 mt-2">Password</Label>
<Label for="password" class="mb-2 mt-2 dark:text-gray-800">Password</Label>
<Input
type="password"
id="password"
Expand Down
14 changes: 7 additions & 7 deletions src/client/src/lib/components/authentication/+SignUpForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@
<h1 class="roboto text-center text-3xl font-bold">Get Started Now</h1>

<form on:submit={handleSubmit} enctype="multipart/form-data">
<Label for="name" class="mb-2 mt-2">Name</Label>
<Label for="name" class="mb-2 mt-2 dark:text-gray-800">Name</Label>
<Input type="text" id="name" name="name" placeholder="John" size="md" required />

<Label for="surname" class="mb-2 mt-2">Surname</Label>
<Label for="surname" class="mb-2 mt-2 dark:text-gray-800">Surname</Label>
<Input type="text" id="surname" name="surname" placeholder="Doe" size="md" required />

<Label for="email" class="mb-2 mt-2">Email</Label>
<Label for="email" class="mb-2 mt-2 dark:text-gray-800">Email</Label>
<Input type="email" id="email" name="email" placeholder="[email protected]" required />

<Label for="password" class="mb-2 mt-2">Password</Label>
<Label for="password" class="mb-2 mt-2 dark:text-gray-800">Password</Label>
<Input type="password" id="password" name="password" placeholder="•••••••••" required />

<Label for="confirm_password" class="mb-2 mt-2">Confirm password</Label>
<Label for="confirm_password" class="mb-2 mt-2 dark:text-gray-800">Confirm password</Label>
<Input
type="password"
id="confirm_password"
Expand All @@ -71,10 +71,10 @@
required
/>

<Label for="upload_image" class="mb-2 mt-2">Upload profile photo:</Label>
<Label for="upload_image" class="mb-2 mt-2 dark:text-gray-800">Upload profile photo:</Label>
<Input type="text" id="image" name="image" required />

<Checkbox class="p-2" id="terms" name="terms" required>
<Checkbox class="p-2 dark:text-gray-800" id="terms" name="terms" required>
I agree to the &nbsp;<A href="#" class="text-blue-600">terms and conditions</A>
</Checkbox>

Expand Down
6 changes: 3 additions & 3 deletions src/client/src/lib/components/utils/+SideBar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<a href="/" class="mx-auto">
<div class="flex items-center">
<img class="mr-2 h-20 w-auto" src={Logo} alt="Class Connect owl logo" />
<div class="roboto text-xl">Class Connect</div>
<div class="roboto text-xl dark:text-gray-300">Class Connect</div>
</div>
</a>

Expand All @@ -82,10 +82,10 @@
<nav>
{#each nav_links as { icon, name, href }}
<a
class="mt-5 flex transform items-center rounded-lg px-4 py-2 text-gray-600 transition-colors duration-300 hover:bg-primary-300 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-gray-200"
class="mt-5 flex transform items-center rounded-lg px-4 py-2 text-gray-600 transition-colors duration-300 hover:bg-primary-300 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-green-400 dark:hover:text-gray-800"
{href}
>
<img class="h-5 w-5" src={icon} alt={name} />
<img class="h-5 w-5 dark:text-gray-300" src={icon} alt={name} />
<span class="mx-4 font-medium">{name}</span>
</a>
{/each}
Expand Down
4 changes: 3 additions & 1 deletion src/client/src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<script>
import '../app.css';
import { DarkMode } from 'flowbite-svelte';
</script>

<div class="app bg-lightBgColor">
<div class="app bg-lightBgColor dark:bg-gray-700">
<DarkMode />
<main>
<slot />
</main>
Expand Down
2 changes: 1 addition & 1 deletion src/client/src/routes/activities/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<SideBar />
</div>
<div class="w-full bg-lightBgColor px-4">
<div class="w-full bg-lightBgColor px-4 dark:bg-gray-800">
<Activities />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/client/src/routes/announcements/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<SideBar />
</div>
<div class=" bg-lightBgColor">
<div class=" bg-lightBgColor dark:bg-gray-800">
<Announcements />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/client/src/routes/organisation/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<SideBar />
</div>
<div class=" w-full bg-lightBgColor">
<div class=" w-full bg-lightBgColor dark:bg-gray-700">
<Organisation />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/client/src/routes/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<SideBar />
</div>
<div class=" bg-lightBgColor">
<div class=" bg-lightBgColor dark:bg-gray-800">
<Announcements />
</div>
</div>
Expand Down
Loading