Fix routes
This commit is contained in:
parent
25355be9ff
commit
bd256e0f44
@ -70,8 +70,11 @@ function App() {
|
|||||||
<Route path="supervisor" element={<Supervisor />}>
|
<Route path="supervisor" element={<Supervisor />}>
|
||||||
<Route index element={<Navigate to="groups" />} />
|
<Route index element={<Navigate to="groups" />} />
|
||||||
<Route path="groups" element={<Groups />} />
|
<Route path="groups" element={<Groups />} />
|
||||||
|
<Route path="groups/:id" element={<Group />} />
|
||||||
|
<Route path="groups/:id/grade-card" element={<GradeCard />} />
|
||||||
<Route path="schedule" element={<SupervisorSchedules />} />
|
<Route path="schedule" element={<SupervisorSchedules />} />
|
||||||
<Route path="schedule/:id" element={<SupervisorSchedule />} />
|
<Route path="schedule/:id" element={<SupervisorSchedule />} />
|
||||||
|
<Route path="add-group" element={<AddGroup />} />
|
||||||
</Route>
|
</Route>
|
||||||
</Routes>
|
</Routes>
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
import { useQuery } from 'react-query'
|
import { useQuery } from 'react-query'
|
||||||
import { Link, useParams } from 'react-router-dom'
|
import { Link, useLocation, useParams } from 'react-router-dom'
|
||||||
import { getGroup } from '../../api/groups'
|
import { getGroup } from '../../api/groups'
|
||||||
|
|
||||||
const Group = () => {
|
const Group = () => {
|
||||||
const { id } = useParams<{ id: string }>()
|
const { id } = useParams<{ id: string }>()
|
||||||
|
const location = useLocation()
|
||||||
|
|
||||||
const { data: groups } = useQuery(['getGroup'], () => getGroup(Number(id)))
|
const { data: groups } = useQuery(['getGroup'], () => getGroup(Number(id)))
|
||||||
const { name, project_supervisor } = groups?.data || {}
|
const { name, project_supervisor } = groups?.data || {}
|
||||||
@ -15,7 +16,13 @@ const Group = () => {
|
|||||||
Opiekun: {project_supervisor?.first_name}{' '}
|
Opiekun: {project_supervisor?.first_name}{' '}
|
||||||
{project_supervisor?.last_name}
|
{project_supervisor?.last_name}
|
||||||
</h2>
|
</h2>
|
||||||
<Link to={`/coordinator/groups/${id}/grade-card`}>
|
<Link
|
||||||
|
to={`/${
|
||||||
|
location.pathname.includes('coordinator')
|
||||||
|
? 'coordinator'
|
||||||
|
: 'supervisor'
|
||||||
|
}/groups/${id}/grade-card`}
|
||||||
|
>
|
||||||
<button className="btn btn-success mt-2">KARTA OCENY</button>
|
<button className="btn btn-success mt-2">KARTA OCENY</button>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'classnames'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useMutation, useQuery } from 'react-query'
|
import { useMutation, useQuery } from 'react-query'
|
||||||
import { useNavigate } from 'react-router-dom'
|
import { useLocation, useNavigate } from 'react-router-dom'
|
||||||
import useLocalStorageState from 'use-local-storage-state'
|
import useLocalStorageState from 'use-local-storage-state'
|
||||||
import { deleteGroup, getGroups } from '../../api/groups'
|
import { deleteGroup, getGroups } from '../../api/groups'
|
||||||
import { ReactComponent as IconRemove } from '../../assets/svg/icon-remove.svg'
|
import { ReactComponent as IconRemove } from '../../assets/svg/icon-remove.svg'
|
||||||
@ -9,6 +9,8 @@ import { Link } from 'react-router-dom'
|
|||||||
|
|
||||||
const Groups = () => {
|
const Groups = () => {
|
||||||
let navigate = useNavigate()
|
let navigate = useNavigate()
|
||||||
|
const location = useLocation()
|
||||||
|
|
||||||
const [page, setPage] = useState(1)
|
const [page, setPage] = useState(1)
|
||||||
const [perPage, setPerPage] = useState(10)
|
const [perPage, setPerPage] = useState(10)
|
||||||
const [yearGroupId] = useLocalStorageState('yearGroupId')
|
const [yearGroupId] = useLocalStorageState('yearGroupId')
|
||||||
@ -60,7 +62,15 @@ const Groups = () => {
|
|||||||
<div className="flex items-center justify-between flex-col gap-3 md:flex-row md:gap-0">
|
<div className="flex items-center justify-between flex-col gap-3 md:flex-row md:gap-0">
|
||||||
<button
|
<button
|
||||||
className="btn btn-success"
|
className="btn btn-success"
|
||||||
onClick={() => navigate('/coordinator/add-group')}
|
onClick={() =>
|
||||||
|
navigate(
|
||||||
|
`/${
|
||||||
|
location.pathname.includes('coordinator')
|
||||||
|
? 'coordinator'
|
||||||
|
: 'supervisor'
|
||||||
|
}/add-group`,
|
||||||
|
)
|
||||||
|
}
|
||||||
>
|
>
|
||||||
Dodaj nową grupę
|
Dodaj nową grupę
|
||||||
</button>
|
</button>
|
||||||
@ -97,7 +107,11 @@ const Groups = () => {
|
|||||||
<tr key={id}>
|
<tr key={id}>
|
||||||
<td>
|
<td>
|
||||||
<Link
|
<Link
|
||||||
to={`/coordinator/groups/${id}`}
|
to={`/${
|
||||||
|
location.pathname.includes('coordinator')
|
||||||
|
? 'coordinator'
|
||||||
|
: 'supervisor'
|
||||||
|
}/groups/${id}`}
|
||||||
className="underline font-bold"
|
className="underline font-bold"
|
||||||
>
|
>
|
||||||
{name}
|
{name}
|
||||||
|
Loading…
Reference in New Issue
Block a user