ENCOA-316 ENCOA-317:
Refactor components to remove Layout wrapper and pass it in the App component , implemented a skeleton feedback while loading page and improved API calls related to Dashboard/User Profile
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
/* eslint-disable @next/next/no-img-element */
|
||||
import Layout from "@/components/High/Layout";
|
||||
import Table from "@/components/High/Table";
|
||||
import Checkbox from "@/components/Low/Checkbox";
|
||||
import Separator from "@/components/Low/Separator";
|
||||
@@ -8,16 +7,15 @@ import { Session } from "@/hooks/useSessions";
|
||||
import { Entity, EntityWithRoles } from "@/interfaces/entity";
|
||||
import { Exam } from "@/interfaces/exam";
|
||||
import { Assignment, AssignmentResult } from "@/interfaces/results";
|
||||
import { Group, Stat, StudentUser, User } from "@/interfaces/user";
|
||||
import { StudentUser, User } from "@/interfaces/user";
|
||||
import { sessionOptions } from "@/lib/session";
|
||||
import { filterBy, findBy, mapBy, redirect, serialize } from "@/utils";
|
||||
import { requestUser } from "@/utils/api";
|
||||
import { getEntitiesAssignments } from "@/utils/assignments.be";
|
||||
import { getEntitiesWithRoles } from "@/utils/entities.be";
|
||||
import { getExamsByIds } from "@/utils/exams.be";
|
||||
import { checkAccess, findAllowedEntities } from "@/utils/permissions";
|
||||
import { getSessionsByAssignments, getSessionsByUser } from "@/utils/sessions.be";
|
||||
import { getStatsByUsers } from "@/utils/stats.be";
|
||||
import { findAllowedEntities } from "@/utils/permissions";
|
||||
import { getSessionsByAssignments } from "@/utils/sessions.be";
|
||||
import { isAdmin } from "@/utils/users";
|
||||
import { getEntitiesUsers } from "@/utils/users.be";
|
||||
import { createColumnHelper } from "@tanstack/react-table";
|
||||
@@ -222,7 +220,7 @@ export default function Statistical({ user, students, entities, assignments, ses
|
||||
<link rel="icon" href="/favicon.ico" />
|
||||
</Head>
|
||||
|
||||
<Layout user={user}>
|
||||
<>
|
||||
<div className="flex flex-col gap-4">
|
||||
<div className="flex items-center justify-between w-full">
|
||||
<div className="flex items-center gap-2">
|
||||
@@ -301,7 +299,7 @@ export default function Statistical({ user, students, entities, assignments, ses
|
||||
isDownloadLoading={isDownloading}
|
||||
/>
|
||||
)}
|
||||
</Layout>
|
||||
</>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user