frontend update
This commit is contained in:
@@ -1,15 +1,16 @@
|
||||
import React, {useCallback, useContext, useEffect, useMemo, useState} from 'react';
|
||||
import API from "shared/api";
|
||||
import Icon from "shared/elements/icon";
|
||||
import LoginForm from "./views/login";
|
||||
import LoginForm from "shared/views/login";
|
||||
import {Alert} from "@material-ui/lab";
|
||||
import {Button} from "@material-ui/core";
|
||||
import { LocaleContext } from "shared/locale";
|
||||
import {LocaleContext} from "shared/locale";
|
||||
import AdminDashboard from "./AdminDashboard";
|
||||
|
||||
export default function App() {
|
||||
|
||||
const api = useMemo(() => new API(), []);
|
||||
|
||||
const [user, setUser] = useState(null);
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [info, setInfo] = useState({});
|
||||
|
||||
@@ -32,7 +32,7 @@ export default function GroupListView(props) {
|
||||
|
||||
const actionColumn = (() => {
|
||||
let column = new DataColumn(L("general.actions"), null, false);
|
||||
column.renderData = (entry) => <>
|
||||
column.renderData = (L, entry) => <>
|
||||
<IconButton size={"small"} title={L("general.edit")} onClick={() => navigate("/admin/group/" + entry.id)}>
|
||||
<EditIcon />
|
||||
</IconButton>
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import * as React from "react";
|
||||
import {Link} from "react-router-dom";
|
||||
import {format, getDaysInMonth} from "date-fns";
|
||||
import {Collapse} from "react-collapse";
|
||||
import {Bar} from "react-chartjs-2";
|
||||
import {CircularProgress, Icon} from "@material-ui/core";
|
||||
import {useCallback, useEffect, useState} from "react";
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ export default function UserListView(props) {
|
||||
|
||||
const groupColumn = (() => {
|
||||
let column = new DataColumn(L("account.groups"), "groups");
|
||||
column.renderData = (entry) => {
|
||||
column.renderData = (L, entry) => {
|
||||
return Object.values(entry.groups).map(group => <Chip key={"group-" + group.id} label={group.name}/>)
|
||||
}
|
||||
return column;
|
||||
@@ -41,7 +41,7 @@ export default function UserListView(props) {
|
||||
|
||||
const actionColumn = (() => {
|
||||
let column = new DataColumn(L("general.actions"), null, false);
|
||||
column.renderData = (entry) => <>
|
||||
column.renderData = (L, entry) => <>
|
||||
<IconButton size={"small"} title={L("general.edit")} onClick={() => navigate("/admin/user/" + entry.id)}>
|
||||
<EditIcon />
|
||||
</IconButton>
|
||||
|
||||
Reference in New Issue
Block a user