ulivargas/classroomio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLASSROOMIO-T-82: Attendance Page Redesign

Browse Source 
CLASSROOMIO-T-82: Fix sidebar navs

CLASSROOMIO-T-82: Dark Mode Icon Fix

CLASSROOMIO-T-82: Icon Dark Mode Final fix

CLASSROOMIO-T-82: Dark mode icon fix

CLASSROOMIO-T-82: Icon Dark Mode fix

Merge branch 'CLASSROOMIO-T-82' of https://gitlab.com/thenextgreat/classroomio into CLASSROOMIO-T-82

CLASSROOMIO-T-82:
- Impliment Search Functionality
- Dark Mode Fix

Merge branch 'main' into CLASSROOMIO-T-82

CLASSROOMIO-T-82: Saving fix and dark mode button bug

Merge branch 'main' into CLASSROOMIO-T-82

CLASSROOMIO-T-82: Attendance Redesign

CLASSROOMIO-T-82: Redesign Attendance Page


Co-authored-by: Rotimi Best <rotimiibitoyeemma@gmail.com>
Co-authored-by: tunny17 <tvnji17@gmail.com>


Merge-request: CLASSROOMIO-MR-34
Merged-by: Best Admin <best@digdippa.com>
This commit is contained in:
tunny17
2023-08-07 09:53:07 +00:00
committed by Space Cloud
co-authored by Rotimi Best
parent a9c8fbb1fd
commit 8465ba5371
8 changed files with 123 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/components/Course/components/Navigation/NavExpandable.svelte
+2 -2
View File
@@ -12,7 +12,7 @@
export let total = 0;
// export let subMenuItems = [];
let activeClass = 'bg-gray-200 dark:bg-gray-500';
let activeClass = 'bg-gray-200 dark:bg-gray-800';
function onClick() {
handleClick();
@@ -25,7 +25,7 @@
<div class="">
<button
class="item relative flex items-center py-3 px-4 ml-2 mb-1 rounded hover:bg-gray-200 dark:hover:bg-gray-500 {isGroupActive &&
class="item relative flex items-center py-3 px-4 ml-2 mb-1 rounded hover:bg-gray-200 dark:hover:bg-gray-800 {isGroupActive &&
activeClass} w-[95%]"
tabindex="0"
on:click={onClick}
src/lib/components/Course/components/Navigation/index.svelte
+2 -2
View File
@@ -32,7 +32,7 @@
export let isStudent = null;
let show = null;
let activeClass = 'bg-gray-200 dark:bg-gray-500';
let activeClass = 'bg-gray-200 dark:bg-gray-800';
let isLessonActive = false;
function handleMainGroupClick(href) {
@@ -200,7 +200,7 @@
aria-disabled={!item.is_unlocked}
>
<div
class="flex items-center py-3 px-4 rounded hover:bg-gray-200 dark:hover:bg-gray-500 w-full {(
class="flex items-center py-3 px-4 rounded hover:bg-gray-200 dark:hover:bg-gray-800 w-full {(
path || $page.url.pathname
).includes(item.id) && activeClass}"
>
src/lib/components/LMS/SideBar.svelte
+6 -6
View File
@@ -11,7 +11,7 @@
import { currentOrg } from '$lib/utils/store/org';
import { profile } from '$lib/utils/store/user';
let activeClass = 'bg-gray-200 dark:bg-gray-500';
let activeClass = 'bg-gray-200 dark:bg-gray-800';
function isActive(pagePath, itemPath) {
const pageLinkItems = pagePath.split('/');
@@ -45,7 +45,7 @@
<ul class="my-5">
<a href="/lms" class="text-black">
<li
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-500 {isActive(
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-800 {isActive(
$page.url.pathname,
`/lms`
) && activeClass}"
@@ -56,7 +56,7 @@
</a>
<a href="/lms/mylearning" class="text-black">
<li
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-500 {isActive(
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-800 {isActive(
$page.url.pathname,
`/lms/mylearning`
) && activeClass}"
@@ -67,7 +67,7 @@
</a>
<a href="/lms/exercises" class="text-black">
<li
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-500 {isActive(
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-800 {isActive(
$page.url.pathname,
`/lms/exercises`
) && activeClass}"
@@ -82,7 +82,7 @@
<ul class="my-5 pb-5 px-4">
<a href="/lms" class="text-black">
<li
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-500"
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-800"
>
<HelpIcon size={20} class="carbon-icon dark:text-white" />
<p class="dark:text-white ml-2">Help</p>
@@ -90,7 +90,7 @@
</a>
<a href="/lms/settings" class="text-black">
<li
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-500 {isActive(
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-800 {isActive(
$page.url.pathname,
`/lms/settings`
) && activeClass}"
src/lib/components/Org/SideBar.svelte
+2 -2
View File
@@ -14,7 +14,7 @@
import { currentOrg, currentOrgPath } from '$lib/utils/store/org';
import { profile } from '$lib/utils/store/user';
let activeClass = 'bg-gray-200 dark:bg-gray-700';
let activeClass = 'bg-gray-200 dark:bg-gray-800';
const menuItems = [
{
@@ -76,7 +76,7 @@
{#each menuItems as menuItem}
<a href="{$currentOrgPath}{menuItem.path}" class="text-black no-underline">
<li
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-500 {isActive(
class="flex items-center py-3 px-4 mb-2 rounded hover:bg-gray-200 dark:hover:bg-gray-800 {isActive(
$page.url.pathname,
`${$currentOrgPath}${menuItem.path}`
) && activeClass}"
src/lib/components/PrimaryButton/constants.js
+1 -1
View File
@@ -18,7 +18,7 @@ export const VARIANTS_CLASS = {
[VARIANTS.CONTAINED_SUCCESS]: 'bg-green-700 hover:bg-green-900 text-white',
[VARIANTS.CONTAINED_DANGER]: 'bg-red-700 hover:bg-red-900 text-white',
[VARIANTS.OUTLINED]:
'border border-blue-700 hover:border-black-300 hover:bg-blue-700 text-black hover:text-white',
'border border-blue-700 hover:border-black-300 hover:bg-blue-700 text-black hover:text-white dark:text-white',
[VARIANTS.NONE]:
'border-none hover:border-black-300 hover:bg-gray-200 dark:hover:bg-gray-500 text-black',
[VARIANTS.TEXT]: 'text-black hover:underline',
src/lib/utils/services/attendance/index.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { supabase } from '$lib/utils/functions/supabase';
export async function takeAttendance(update) {
return supabase.from('group_attendance').upsert(update);
return supabase.from('group_attendance').upsert(update).select();
}