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

Convert UserList #575

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions frontend/src/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Navigate, Route, Routes } from 'react-router-dom';
import ElementWrapper from './components/elementWrapper';

import AdminHome from './pages/admin/home';
import { UserList } from './pages/admin/user-list';
import UserList from './pages/admin/user-list';
import UserEdit from './pages/admin/user-edit';
import ProjectList from './pages/admin/project-list';
import ProjectEdit from './pages/admin/project-edit';
Expand Down Expand Up @@ -36,7 +36,7 @@ const Admin = () => {
element={<AdminPage/>}
>
<Route path="home" element={<AdminHome/>} />
<Route path="users" element={<ElementWrapper routeElement={UserList} />} />
<Route path="users" element={<UserList />} />
<Route path="users/:id" element={<ElementWrapper routeElement={UserEdit} />} />
<Route path="projects" element={<ProjectList/>} />
<Route path="projects/:id" element={<ProjectEdit/>} />
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/pages/admin/project-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ const COLUMNS = ['Title', 'Name', 'Owner', ''];

const ProjectList = () => {
const [filterText, setFilterText] = useState('');
const [filteredProjects, setFilteredProjects] = useState([]);
const [activeFilters, setActiveFilters] = useState({});

const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(20);
const [totalItems, setTotalItems] = useState(0);

const [projects, setProjects] = useState([]);
const [filteredProjects, setFilteredProjects] = useState([]);
const [selectedProject, setSelectedProject] = useState();

const [totalItems, setTotalItems] = useState(0);
const [isError, setIsError] = useState(false);
const [selectedProject, setSelectedProject] = useState();
const [isDeleting, setIsDeleting] = useState(false);
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);

Expand Down
Loading
Loading