Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0-alpha

Browse Source
This commit is contained in:
Roman
2022-06-20 19:52:31 +02:00
parent b549af3166
commit ce647d4423
78 changed files with 2474 additions and 2083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminPanel/src/api.js
View File

@@ -92,7 +92,7 @@ export default class API {
}
async deleteGroup(id) {
return this.apiCall("groups/delete", { uid: id });
return this.apiCall("groups/delete", { id: id });
}
async getSettings(key = "") {

4
adminPanel/src/elements/header.js
View File

@@ -25,10 +25,10 @@ export default function Header(props) {
let notificationItems = [];
for (let i = 0; i < parent.notifications.length; i++) {
const notification = parent.notifications[i];
const uid = notification.uid;
const id = notification.id;
const createdAt = getPeriodString(notification["created_at"]);
notificationItems.push(
<Link to={"/admin/logs?notification=" + uid} className={"dropdown-item"} key={"notification-" + uid}>
<Link to={"/admin/logs?notification=" + id} className={"dropdown-item"} key={"notification-" + id}>
{mailIcon}
<span className={"ml-2"}>{notification.title}</span>
<span className={"float-right text-muted text-sm"}>{createdAt}</span>

2
adminPanel/src/views/logs.js
View File

@@ -83,7 +83,7 @@ export default class Logs extends React.Component {
for (let event of dates[date]) {
let timeString = moment(event.timestamp).fromNow();
elements.push(
<div key={"time-entry-" + event.uid}>
<div key={"time-entry-" + event.id}>
<Icon icon={event.icon} className={"bg-" + color}/>
<div className="timeline-item">
<span className="time"><Icon icon={"clock"}/> {timeString}</span>

24
adminPanel/src/views/users.js
View File

@@ -161,12 +161,12 @@ export default class UserOverview extends React.Component {
createUserCard() {
let userRows = [];
for (let uid in this.state.users.data) {
if (!this.state.users.data.hasOwnProperty(uid)) {
for (let id in this.state.users.data) {
if (!this.state.users.data.hasOwnProperty(id)) {
continue;
}
let user = this.state.users.data[uid];
let user = this.state.users.data[id];
let confirmedIcon = <Icon icon={user["confirmed"] ? "check" : "times"}/>;
let groups = [];
@@ -184,7 +184,7 @@ export default class UserOverview extends React.Component {
}
userRows.push(
<tr key={"user-" + uid}>
<tr key={"user-" + id}>
<td>{user.name}</td>
<td>{user.email}</td>
<td>{groups}</td>
@@ -197,7 +197,7 @@ export default class UserOverview extends React.Component {
</td>
<td className={"text-center"}>{confirmedIcon}</td>
<td>
<Link to={"/admin/user/edit/" + uid} className={"text-reset"}>
<Link to={"/admin/user/edit/" + id} className={"text-reset"}>
<Icon icon={"pencil-alt"} data-effect={"solid"}
data-tip={"Modify user details & group membership"}
data-type={"info"} data-place={"right"}/>
@@ -291,15 +291,15 @@ export default class UserOverview extends React.Component {
createGroupCard() {
let groupRows = [];
for (let uid in this.state.groups.data) {
if (!this.state.groups.data.hasOwnProperty(uid)) {
for (let id in this.state.groups.data) {
if (!this.state.groups.data.hasOwnProperty(id)) {
continue;
}
let group = this.state.groups.data[uid];
let group = this.state.groups.data[id];
groupRows.push(
<tr key={"group-" + uid}>
<tr key={"group-" + id}>
<td>{group.name}</td>
<td className={"text-center"}>{group["memberCount"]}</td>
<td>
@@ -309,7 +309,7 @@ export default class UserOverview extends React.Component {
</td>
<td>
<Icon icon={"trash"} style={{color: "red", cursor: "pointer"}}
onClick={(e) => this.onDeleteGroup(e, uid)} data-effect={"solid"}
onClick={(e) => this.onDeleteGroup(e, id)} data-effect={"solid"}
data-tip={"Delete"} data-type={"error"}
data-place={"bottom"}/>
</td>
@@ -395,11 +395,11 @@ export default class UserOverview extends React.Component {
</div>;
}
onDeleteGroup(e, uid) {
onDeleteGroup(e, id) {
e.stopPropagation();
this.parent.showDialog("Are you really sure you want to delete this group?", "Delete Group?", ["Yes", "No"], (btn) => {
if (btn === "Yes") {
this.parent.api.deleteGroup(uid).then((res) => {
this.parent.api.deleteGroup(id).then((res) => {
if (!res.success) {
let errors = this.state.errors.slice();
errors.push({title: "Error deleting group", message: res.msg});