implemented user-adding
This commit is contained in:
@@ -150,3 +150,9 @@ func UserPending(userName string) (int, error) {
|
||||
return result.Count, nil
|
||||
}
|
||||
}
|
||||
|
||||
func Delete(eventId int) error {
|
||||
_, err := db.DB.Exec("DELETE FROM EVENTS WHERE id = ?", eventId)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -4,8 +4,10 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
cache "github.com/jfarleyx/go-simple-cache"
|
||||
"github.com/johannesbuehl/golunteer/backend/pkg/db"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
@@ -17,6 +19,16 @@ type User struct {
|
||||
|
||||
var c *cache.Cache
|
||||
|
||||
// hashes a password
|
||||
func hashPassword(password string) ([]byte, error) {
|
||||
return bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||
}
|
||||
|
||||
// validates a password against the password-rules
|
||||
func ValidatePassword(password string) bool {
|
||||
return len(password) >= 12 && len(password) <= 64
|
||||
}
|
||||
|
||||
func Get() (map[string]User, error) {
|
||||
if users, hit := c.Get("users"); !hit {
|
||||
refresh()
|
||||
@@ -27,6 +39,37 @@ func Get() (map[string]User, error) {
|
||||
}
|
||||
}
|
||||
|
||||
type UserAdd struct {
|
||||
UserName string `json:"userName" validate:"required" db:"userName"`
|
||||
Password string `json:"password" validate:"required,min=8"`
|
||||
Admin bool `json:"admin" db:"admin"`
|
||||
}
|
||||
|
||||
func Add(user UserAdd) error {
|
||||
// try to hash the password
|
||||
if hash, err := hashPassword(user.Password); err != nil {
|
||||
return err
|
||||
} else {
|
||||
insertUser := struct {
|
||||
UserAdd
|
||||
Password []byte `db:"password"`
|
||||
TokenID string `db:"tokenID"`
|
||||
}{
|
||||
UserAdd: user,
|
||||
Password: hash,
|
||||
TokenID: uuid.NewString(),
|
||||
}
|
||||
|
||||
if _, err := db.DB.NamedExec("INSERT INTO USERS (name, password, admin, tokenID) VALUES (:userName, :password, :admin, :tokenID)", insertUser); err != nil {
|
||||
return err
|
||||
} else {
|
||||
refresh()
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func refresh() {
|
||||
// get the usersRaw from the database
|
||||
var usersRaw []User
|
||||
|
||||
@@ -88,3 +88,20 @@ func getEventsUserPending(args HandlerArgs) responseMessage {
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
func deleteEvent(args HandlerArgs) responseMessage {
|
||||
response := responseMessage{}
|
||||
|
||||
// check for admin
|
||||
if !args.User.Admin {
|
||||
response.Status = fiber.StatusForbidden
|
||||
|
||||
// -1 can't be valid
|
||||
} else if eventId := args.C.QueryInt("id", -1); eventId == -1 {
|
||||
response.Status = fiber.StatusBadRequest
|
||||
} else if err := events.Delete(eventId); err != nil {
|
||||
response.Status = fiber.StatusInternalServerError
|
||||
}
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
@@ -80,9 +80,14 @@ func init() {
|
||||
"events/user/pending": getEventsUserPending,
|
||||
"tasks": getTasks,
|
||||
},
|
||||
"POST": {"events": postEvent},
|
||||
"POST": {
|
||||
"events": postEvent,
|
||||
"users": postUser,
|
||||
},
|
||||
"PATCH": {},
|
||||
"DELETE": {},
|
||||
"DELETE": {
|
||||
"event": deleteEvent,
|
||||
},
|
||||
}
|
||||
|
||||
// handle specific requests special
|
||||
|
||||
@@ -1,13 +1,36 @@
|
||||
package router
|
||||
|
||||
import "golang.org/x/crypto/bcrypt"
|
||||
import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/johannesbuehl/golunteer/backend/pkg/db/users"
|
||||
)
|
||||
|
||||
// hashes a password
|
||||
func hashPassword(password string) ([]byte, error) {
|
||||
return bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||
func postUser(args HandlerArgs) responseMessage {
|
||||
response := responseMessage{}
|
||||
|
||||
// check admin
|
||||
if !args.User.Admin {
|
||||
response.Status = fiber.StatusForbidden
|
||||
} else {
|
||||
// parse the body
|
||||
var body users.UserAdd
|
||||
|
||||
if err := args.C.BodyParser(&body); err != nil {
|
||||
response.Status = fiber.StatusBadRequest
|
||||
|
||||
logger.Warn().Msgf("can't parse body: %v", err)
|
||||
|
||||
// validate the body
|
||||
} else if err := validate.Struct(body); err != nil {
|
||||
response.Status = fiber.StatusBadRequest
|
||||
|
||||
logger.Warn().Msgf("invalid body: %v", err)
|
||||
} else if err := users.Add(body); err != nil {
|
||||
response.Status = fiber.StatusInternalServerError
|
||||
|
||||
logger.Warn().Msgf("can't add user: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// validates a password against the password-rules
|
||||
func validatePassword(password string) bool {
|
||||
return len(password) >= 12 && len(password) <= 64
|
||||
return response
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client";
|
||||
|
||||
import { DateFormatter as IntlDateFormatter } from "@internationalized/date";
|
||||
import { create } from "zustand";
|
||||
import { persist } from "zustand/middleware";
|
||||
import { apiCall } from "./lib";
|
||||
@@ -18,16 +17,18 @@ export interface EventData {
|
||||
description: string;
|
||||
}
|
||||
|
||||
export interface User {
|
||||
userName: string;
|
||||
admin: boolean;
|
||||
}
|
||||
|
||||
interface Zustand {
|
||||
events: EventData[];
|
||||
pendingEvents: number;
|
||||
user: {
|
||||
userName: string;
|
||||
admin: boolean;
|
||||
} | null;
|
||||
user: User | null;
|
||||
setEvents: (events: EventData[]) => void;
|
||||
reset: (zustand?: Partial<Zustand>) => void;
|
||||
setPendingEvents: (c: number) => void;
|
||||
getPendingEvents: () => Promise<void>;
|
||||
}
|
||||
|
||||
const initialState = {
|
||||
@@ -46,7 +47,18 @@ const zustand = create<Zustand>()(
|
||||
...initialState,
|
||||
...newZustand,
|
||||
}),
|
||||
setPendingEvents: (c) => set(() => ({ pendingEvents: c })),
|
||||
getPendingEvents: async () => {
|
||||
const result = await apiCall<{ pendingEvents: number }>(
|
||||
"GET",
|
||||
"events/user/pending",
|
||||
);
|
||||
|
||||
if (result.ok) {
|
||||
const resultData = await result.json();
|
||||
|
||||
set(() => ({ pendingEvents: resultData }));
|
||||
}
|
||||
},
|
||||
}),
|
||||
{
|
||||
name: "golunteer-storage",
|
||||
@@ -75,16 +87,4 @@ export async function getTasks(): Promise<
|
||||
}
|
||||
}
|
||||
|
||||
export class DateFormatter {
|
||||
private formatter;
|
||||
|
||||
constructor(locale: string, options?: Intl.DateTimeFormatOptions) {
|
||||
this.formatter = new IntlDateFormatter(locale, options);
|
||||
}
|
||||
|
||||
format(dt: Date) {
|
||||
return this.formatter.format(dt);
|
||||
}
|
||||
}
|
||||
|
||||
export default zustand;
|
||||
|
||||
@@ -14,13 +14,14 @@ import {
|
||||
Navbar,
|
||||
NavbarBrand,
|
||||
NavbarContent,
|
||||
NavbarItem,
|
||||
NavbarMenu,
|
||||
NavbarMenuToggle,
|
||||
Tab,
|
||||
Tabs,
|
||||
} from "@nextui-org/react";
|
||||
import zustand from "@/Zustand";
|
||||
import { SiteLink } from "./layout";
|
||||
import React, { useEffect } from "react";
|
||||
import React from "react";
|
||||
|
||||
export default function Header({ sites }: { sites: SiteLink[] }) {
|
||||
const router = useRouter();
|
||||
@@ -68,21 +69,6 @@ export default function Header({ sites }: { sites: SiteLink[] }) {
|
||||
}
|
||||
}
|
||||
|
||||
// get the pending events for the counter
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
const result = await apiCall<{ pendingEvents: number }>(
|
||||
"GET",
|
||||
"events/user/pending",
|
||||
);
|
||||
|
||||
if (result.ok) {
|
||||
const resultJson = await result.json();
|
||||
zustand.getState().setPendingEvents(resultJson);
|
||||
}
|
||||
})();
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div>
|
||||
<Navbar maxWidth="full">
|
||||
@@ -110,19 +96,13 @@ export default function Header({ sites }: { sites: SiteLink[] }) {
|
||||
</NavbarMenu>
|
||||
|
||||
<NavbarContent justify="center" className="hidden sm:flex">
|
||||
<Tabs selectedKey={pathname} color="default" variant="light">
|
||||
{sites.map((s) =>
|
||||
// if the site is no admin-site or the user is an admin, render it
|
||||
!s.admin || user.admin ? (
|
||||
<NavbarItem key={s.href} isActive={pathname === s.href}>
|
||||
<Link
|
||||
href={s.href}
|
||||
color={pathname === s.href ? "primary" : "foreground"}
|
||||
>
|
||||
{s.text}
|
||||
</Link>
|
||||
</NavbarItem>
|
||||
<Tab key={s.href} title={s.text} href={s.href} />
|
||||
) : null,
|
||||
)}
|
||||
</Tabs>
|
||||
</NavbarContent>
|
||||
|
||||
<NavbarContent justify="end">
|
||||
|
||||
@@ -34,6 +34,8 @@ export default function Main({ children }: { children: React.ReactNode }) {
|
||||
const response = await welcomeResult.json();
|
||||
|
||||
if (response.userName !== undefined && response.userName !== "") {
|
||||
void zustand.getState().getPendingEvents();
|
||||
|
||||
zustand.getState().reset({ user: response });
|
||||
|
||||
loggedIn = true;
|
||||
|
||||
80
client/src/app/admin/AddUser.tsx
Normal file
80
client/src/app/admin/AddUser.tsx
Normal file
@@ -0,0 +1,80 @@
|
||||
import { AddLarge, Copy } from "@carbon/icons-react";
|
||||
import {
|
||||
Button,
|
||||
Checkbox,
|
||||
Form,
|
||||
Input,
|
||||
Modal,
|
||||
ModalBody,
|
||||
ModalContent,
|
||||
ModalFooter,
|
||||
ModalHeader,
|
||||
} from "@nextui-org/react";
|
||||
import { FormEvent, useState } from "react";
|
||||
|
||||
export default function AddUser(props: {
|
||||
isOpen: boolean;
|
||||
onOpenChange?: (isOpen: boolean) => void;
|
||||
onSubmit?: (e: FormEvent<HTMLFormElement>) => void;
|
||||
}) {
|
||||
const [password, setPassword] = useState("");
|
||||
|
||||
return (
|
||||
<Modal
|
||||
isOpen={props.isOpen}
|
||||
onOpenChange={props.onOpenChange}
|
||||
shadow={"none" as "sm"}
|
||||
backdrop="blur"
|
||||
className="bg-accent-5"
|
||||
>
|
||||
<ModalContent>
|
||||
<ModalHeader>
|
||||
<h1 className="text-2xl">Add User</h1>
|
||||
</ModalHeader>
|
||||
|
||||
<Form
|
||||
validationBehavior="native"
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
props.onSubmit?.(e);
|
||||
}}
|
||||
>
|
||||
<ModalBody className="w-full">
|
||||
<Input
|
||||
isRequired
|
||||
type="user"
|
||||
label="Name"
|
||||
name="userName"
|
||||
variant="bordered"
|
||||
/>
|
||||
<Input
|
||||
isRequired
|
||||
label="Password"
|
||||
name="password"
|
||||
variant="bordered"
|
||||
endContent={
|
||||
<Button
|
||||
isIconOnly
|
||||
variant="light"
|
||||
onPress={() => navigator.clipboard.writeText(password)}
|
||||
>
|
||||
<Copy />
|
||||
</Button>
|
||||
}
|
||||
value={password}
|
||||
onValueChange={setPassword}
|
||||
/>
|
||||
<Checkbox value="admin" name="admin">
|
||||
Admin
|
||||
</Checkbox>
|
||||
</ModalBody>
|
||||
<ModalFooter>
|
||||
<Button type="submit" color="primary" startContent={<AddLarge />}>
|
||||
Add User
|
||||
</Button>
|
||||
</ModalFooter>
|
||||
</Form>
|
||||
</ModalContent>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
113
client/src/app/admin/Users.tsx
Normal file
113
client/src/app/admin/Users.tsx
Normal file
@@ -0,0 +1,113 @@
|
||||
import { apiCall } from "@/lib";
|
||||
import { User } from "@/Zustand";
|
||||
import {
|
||||
Button,
|
||||
Checkbox,
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableColumn,
|
||||
TableHeader,
|
||||
TableRow,
|
||||
} from "@nextui-org/react";
|
||||
import { useAsyncList } from "@react-stately/data";
|
||||
import { FormEvent, useState } from "react";
|
||||
import AddUser from "./AddUser";
|
||||
|
||||
export default function Users() {
|
||||
const [showAddUser, setShowAddUser] = useState(false);
|
||||
const users = useAsyncList<User>({
|
||||
async load() {
|
||||
return {
|
||||
items: [
|
||||
{ userName: "admin", admin: true },
|
||||
{ userName: "foo", admin: false },
|
||||
{ userName: "bar", admin: true },
|
||||
],
|
||||
};
|
||||
},
|
||||
async sort({ items, sortDescriptor }) {
|
||||
return {
|
||||
items: items.sort((a, b) => {
|
||||
let cmp = 0;
|
||||
|
||||
switch (sortDescriptor.column) {
|
||||
case "admin":
|
||||
if (a.admin && !b.admin) {
|
||||
cmp = -1;
|
||||
} else if (!a.admin && b.admin) {
|
||||
cmp = 1;
|
||||
}
|
||||
break;
|
||||
case "userName":
|
||||
cmp = a.userName.localeCompare(b.userName);
|
||||
}
|
||||
|
||||
if (sortDescriptor.direction === "descending") {
|
||||
cmp *= -1;
|
||||
}
|
||||
|
||||
return cmp;
|
||||
}),
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
// send an addUser request to the backend then reload the table
|
||||
async function addUser(e: FormEvent<HTMLFormElement>) {
|
||||
const data = Object.fromEntries(new FormData(e.currentTarget));
|
||||
|
||||
const result = await apiCall("POST", "users", undefined, {
|
||||
...data,
|
||||
admin: data.admin === "admin",
|
||||
});
|
||||
|
||||
if (result.ok) {
|
||||
users.reload();
|
||||
}
|
||||
}
|
||||
|
||||
const topContent = (
|
||||
<>
|
||||
<Button onPress={() => setShowAddUser(true)}>Add User</Button>
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<div>
|
||||
<Table
|
||||
aria-label="Table with all users"
|
||||
shadow="none"
|
||||
isHeaderSticky
|
||||
topContent={topContent}
|
||||
sortDescriptor={users.sortDescriptor}
|
||||
onSortChange={users.sort}
|
||||
>
|
||||
<TableHeader>
|
||||
<TableColumn allowsSorting key="userName">
|
||||
Username
|
||||
</TableColumn>
|
||||
<TableColumn allowsSorting key="admin">
|
||||
Admin
|
||||
</TableColumn>
|
||||
</TableHeader>
|
||||
<TableBody items={users.items}>
|
||||
{(user) => (
|
||||
<TableRow key={user.userName}>
|
||||
<TableCell>{user.userName}</TableCell>
|
||||
<TableCell>
|
||||
<Checkbox isSelected={user.admin} />
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
|
||||
<AddUser
|
||||
isOpen={showAddUser}
|
||||
onOpenChange={setShowAddUser}
|
||||
onSubmit={(e) => void addUser(e)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,280 +1,18 @@
|
||||
"use client";
|
||||
|
||||
import AddEvent from "@/components/Event/AddEvent";
|
||||
import LocalDate from "@/components/LocalDate";
|
||||
import { apiCall } from "@/lib";
|
||||
import { Availability, EventData, getTasks, Task } from "@/Zustand";
|
||||
import { Add, Copy, Edit, TrashCan } from "@carbon/icons-react";
|
||||
import {
|
||||
Button,
|
||||
ButtonGroup,
|
||||
Modal,
|
||||
ModalBody,
|
||||
ModalContent,
|
||||
ModalFooter,
|
||||
ModalHeader,
|
||||
Select,
|
||||
SelectItem,
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableColumn,
|
||||
TableHeader,
|
||||
TableRow,
|
||||
Tooltip,
|
||||
} from "@nextui-org/react";
|
||||
import { useAsyncList } from "@react-stately/data";
|
||||
import React, { Key, useState } from "react";
|
||||
import { Tab, Tabs } from "@nextui-org/react";
|
||||
import Users from "./Users";
|
||||
|
||||
type EventWithAvailabilities = EventData & { availabilities: string[] };
|
||||
|
||||
function availability2Tailwind(availability?: Availability) {
|
||||
switch (availability) {
|
||||
case "yes":
|
||||
return "";
|
||||
default:
|
||||
return "italic";
|
||||
}
|
||||
}
|
||||
|
||||
function availability2Color(availability?: Availability) {
|
||||
switch (availability) {
|
||||
case "yes":
|
||||
return "default";
|
||||
case "maybe":
|
||||
return "warning";
|
||||
default:
|
||||
return "danger";
|
||||
}
|
||||
}
|
||||
|
||||
export default function AdminPanel() {
|
||||
// get the available tasks and craft them into the headers
|
||||
const headers = useAsyncList({
|
||||
async load() {
|
||||
const tasks = await getTasks();
|
||||
|
||||
return {
|
||||
items: [
|
||||
{ key: "date", label: "Date" },
|
||||
{ key: "description", label: "Description" },
|
||||
...Object.entries(tasks)
|
||||
.filter(([, task]) => !task.disabled)
|
||||
.map(([id, task]) => ({ label: task.text, key: id })),
|
||||
{ key: "actions", label: "Action" },
|
||||
],
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
// get the individual events
|
||||
const events = useAsyncList<EventWithAvailabilities>({
|
||||
async load() {
|
||||
const result = await apiCall<EventWithAvailabilities[]>(
|
||||
"GET",
|
||||
"events/availabilities",
|
||||
);
|
||||
|
||||
if (result.ok) {
|
||||
return { items: await result.json() };
|
||||
} else {
|
||||
return { items: [] };
|
||||
}
|
||||
},
|
||||
async sort({ items, sortDescriptor }) {
|
||||
return {
|
||||
items: items.sort((a, b) => {
|
||||
let cmp = 0;
|
||||
|
||||
// if it is the date-column, convert to a date
|
||||
if (sortDescriptor.column === "date") {
|
||||
const first = a[sortDescriptor.column];
|
||||
const second = b[sortDescriptor.column];
|
||||
|
||||
cmp = first < second ? -1 : 1;
|
||||
}
|
||||
|
||||
if (sortDescriptor.direction === "descending") {
|
||||
cmp *= -1;
|
||||
}
|
||||
|
||||
return cmp;
|
||||
}),
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
function getKeyValue(
|
||||
event: EventWithAvailabilities,
|
||||
key: Key,
|
||||
): React.ReactNode {
|
||||
switch (key) {
|
||||
case "date":
|
||||
export default function AdminDashboard() {
|
||||
return (
|
||||
<LocalDate
|
||||
options={{ dateStyle: "medium", timeStyle: "short" }}
|
||||
className="font-bold"
|
||||
>
|
||||
{event[key]}
|
||||
</LocalDate>
|
||||
);
|
||||
case "description":
|
||||
return <span className="italic">{event[key]}</span>;
|
||||
case "actions":
|
||||
return (
|
||||
<div className="flex justify-end">
|
||||
<ButtonGroup isIconOnly variant="light" size="sm">
|
||||
<Button>
|
||||
<Tooltip content="Edit event">
|
||||
<Edit />
|
||||
</Tooltip>
|
||||
</Button>
|
||||
<Button>
|
||||
<Tooltip content="Duplicate event">
|
||||
<Copy />
|
||||
</Tooltip>
|
||||
</Button>
|
||||
<Button
|
||||
color="danger"
|
||||
onPress={() => {
|
||||
setActiveEvent(event);
|
||||
setShowDeleteConfirm(true);
|
||||
}}
|
||||
>
|
||||
<Tooltip content="Delete event">
|
||||
<TrashCan />
|
||||
</Tooltip>
|
||||
</Button>
|
||||
</ButtonGroup>
|
||||
</div>
|
||||
);
|
||||
default:
|
||||
return (
|
||||
<Select
|
||||
variant="underlined"
|
||||
fullWidth
|
||||
selectedKeys={new Set([event.tasks[key as Task] ?? ""])}
|
||||
classNames={{
|
||||
popoverContent: "w-fit",
|
||||
value: "mr-6",
|
||||
label: "mr-6",
|
||||
}}
|
||||
className="[&_*]:overflow-visible"
|
||||
>
|
||||
{Object.entries(event.availabilities).map(
|
||||
([volunteer, availability]) => (
|
||||
<SelectItem
|
||||
key={volunteer}
|
||||
// color={availability2Color(availability)}
|
||||
className={[
|
||||
// "text-" + availability2Color(availability),
|
||||
// availability2Tailwind(availability),
|
||||
].join(" ")}
|
||||
>
|
||||
{volunteer} ({availability})
|
||||
</SelectItem>
|
||||
),
|
||||
)}
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const [showAddEvent, setShowAddEvent] = useState(false);
|
||||
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
|
||||
const [activeEvent, setActiveEvent] = useState<EventData | undefined>();
|
||||
|
||||
const topContent = (
|
||||
<div>
|
||||
<Button
|
||||
color="primary"
|
||||
startContent={<Add size={32} />}
|
||||
onPress={() => setShowAddEvent(true)}
|
||||
>
|
||||
Add
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="relative flex flex-col items-center">
|
||||
<h2 className="mb-4 text-center text-4xl">Event Managment</h2>
|
||||
|
||||
<Table
|
||||
aria-label="Table with all the events"
|
||||
shadow="none"
|
||||
topContent={topContent}
|
||||
topContentPlacement="outside"
|
||||
isHeaderSticky
|
||||
sortDescriptor={events.sortDescriptor}
|
||||
onSortChange={events.sort}
|
||||
classNames={{
|
||||
wrapper: "bg-accent-4",
|
||||
tr: "even:bg-accent-5 ",
|
||||
th: "font-subheadline text-xl text-accent-1 bg-transparent ",
|
||||
thead: "[&>tr]:first:!shadow-border",
|
||||
}}
|
||||
className="w-fit"
|
||||
>
|
||||
<TableHeader columns={headers.items}>
|
||||
{(task) => (
|
||||
<TableColumn
|
||||
allowsSorting={task.key === "date"}
|
||||
key={task.key}
|
||||
className=""
|
||||
>
|
||||
{task.label}
|
||||
</TableColumn>
|
||||
)}
|
||||
</TableHeader>
|
||||
<TableBody items={events.items} emptyContent={"No events scheduled"}>
|
||||
{(event) => (
|
||||
<TableRow key={event.id}>
|
||||
{(columnKey) => (
|
||||
<TableCell>{getKeyValue(event, columnKey)}</TableCell>
|
||||
)}
|
||||
</TableRow>
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
|
||||
<AddEvent isOpen={showAddEvent} onOpenChange={setShowAddEvent} />
|
||||
|
||||
{activeEvent !== undefined ? (
|
||||
<Modal
|
||||
isOpen={showDeleteConfirm}
|
||||
onOpenChange={setShowDeleteConfirm}
|
||||
shadow={"none" as "sm"}
|
||||
backdrop="blur"
|
||||
className="bg-accent-5"
|
||||
>
|
||||
<ModalContent>
|
||||
<ModalHeader>
|
||||
<h1 className="text-2xl">Confirm event deletion</h1>
|
||||
</ModalHeader>
|
||||
<ModalBody>
|
||||
The event{" "}
|
||||
<span className="font-numbers text-accent-1">
|
||||
<LocalDate options={{ dateStyle: "long", timeStyle: "short" }}>
|
||||
{activeEvent.date}
|
||||
</LocalDate>
|
||||
</span>{" "}
|
||||
will be deleted.
|
||||
</ModalBody>
|
||||
<ModalFooter>
|
||||
<Button startContent={<TrashCan />} color="danger">
|
||||
Delete event
|
||||
</Button>
|
||||
<Button
|
||||
variant="bordered"
|
||||
onPress={() => setShowDeleteConfirm(false)}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
</ModalFooter>
|
||||
</ModalContent>
|
||||
</Modal>
|
||||
) : null}
|
||||
<div className="flex flex-col items-center">
|
||||
<Tabs color="primary">
|
||||
<Tab title="Users">
|
||||
<Users />
|
||||
</Tab>
|
||||
<Tab title="Tasks">Tasks</Tab>
|
||||
<Tab title="Availabilities">Availabilities</Tab>
|
||||
</Tabs>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
299
client/src/app/assignments/page.tsx
Normal file
299
client/src/app/assignments/page.tsx
Normal file
@@ -0,0 +1,299 @@
|
||||
"use client";
|
||||
|
||||
import AddEvent from "@/components/Event/AddEvent";
|
||||
import LocalDate from "@/components/LocalDate";
|
||||
import { apiCall } from "@/lib";
|
||||
import { Availability, EventData, getTasks, Task } from "@/Zustand";
|
||||
import { Add, Copy, Edit, TrashCan } from "@carbon/icons-react";
|
||||
import {
|
||||
Button,
|
||||
ButtonGroup,
|
||||
Modal,
|
||||
ModalBody,
|
||||
ModalContent,
|
||||
ModalFooter,
|
||||
ModalHeader,
|
||||
Select,
|
||||
SelectItem,
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableColumn,
|
||||
TableHeader,
|
||||
TableRow,
|
||||
Tooltip,
|
||||
} from "@nextui-org/react";
|
||||
import { useAsyncList } from "@react-stately/data";
|
||||
import React, { Key, useState } from "react";
|
||||
|
||||
type EventWithAvailabilities = EventData & { availabilities: string[] };
|
||||
|
||||
function availability2Tailwind(availability?: Availability) {
|
||||
switch (availability) {
|
||||
case "yes":
|
||||
return "";
|
||||
default:
|
||||
return "italic";
|
||||
}
|
||||
}
|
||||
|
||||
function availability2Color(availability?: Availability) {
|
||||
switch (availability) {
|
||||
case "yes":
|
||||
return "default";
|
||||
case "maybe":
|
||||
return "warning";
|
||||
default:
|
||||
return "danger";
|
||||
}
|
||||
}
|
||||
|
||||
export default function AdminPanel() {
|
||||
// get the available tasks and craft them into the headers
|
||||
const headers = useAsyncList({
|
||||
async load() {
|
||||
const tasks = await getTasks();
|
||||
|
||||
return {
|
||||
items: [
|
||||
{ key: "date", label: "Date" },
|
||||
{ key: "description", label: "Description" },
|
||||
...Object.values(tasks)
|
||||
.filter((task) => !task.disabled)
|
||||
.map((task) => ({ label: task.text, key: task.text })),
|
||||
{ key: "actions", label: "Action" },
|
||||
],
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
// get the individual events
|
||||
const events = useAsyncList<EventWithAvailabilities>({
|
||||
async load() {
|
||||
const result = await apiCall<EventWithAvailabilities[]>(
|
||||
"GET",
|
||||
"events/availabilities",
|
||||
);
|
||||
|
||||
if (result.ok) {
|
||||
return { items: await result.json() };
|
||||
} else {
|
||||
return { items: [] };
|
||||
}
|
||||
},
|
||||
async sort({ items, sortDescriptor }) {
|
||||
return {
|
||||
items: items.sort((a, b) => {
|
||||
let cmp = 0;
|
||||
|
||||
// if it is the date-column, convert to a date
|
||||
if (sortDescriptor.column === "date") {
|
||||
const first = a[sortDescriptor.column];
|
||||
const second = b[sortDescriptor.column];
|
||||
|
||||
cmp = first < second ? -1 : 1;
|
||||
}
|
||||
|
||||
if (sortDescriptor.direction === "descending") {
|
||||
cmp *= -1;
|
||||
}
|
||||
|
||||
return cmp;
|
||||
}),
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
// send a delete request to the backend and close the popup on success
|
||||
async function deleteEvent(eventId: number) {
|
||||
const result = await apiCall("DELETE", "event", { id: eventId });
|
||||
|
||||
if (result.ok) {
|
||||
// store the received events
|
||||
events.reload();
|
||||
|
||||
setShowDeleteConfirm(false);
|
||||
}
|
||||
}
|
||||
|
||||
function getKeyValue(
|
||||
event: EventWithAvailabilities,
|
||||
key: Key,
|
||||
): React.ReactNode {
|
||||
switch (key) {
|
||||
case "date":
|
||||
return (
|
||||
<LocalDate
|
||||
options={{ dateStyle: "medium", timeStyle: "short" }}
|
||||
className="font-bold"
|
||||
>
|
||||
{event[key]}
|
||||
</LocalDate>
|
||||
);
|
||||
case "description":
|
||||
return <span className="italic">{event[key]}</span>;
|
||||
case "actions":
|
||||
return (
|
||||
<div className="flex justify-end">
|
||||
<ButtonGroup isIconOnly variant="light" size="sm">
|
||||
<Button>
|
||||
<Tooltip content="Edit event">
|
||||
<Edit />
|
||||
</Tooltip>
|
||||
</Button>
|
||||
<Button>
|
||||
<Tooltip content="Duplicate event">
|
||||
<Copy />
|
||||
</Tooltip>
|
||||
</Button>
|
||||
<Button
|
||||
color="danger"
|
||||
onPress={() => {
|
||||
setActiveEvent(event);
|
||||
setShowDeleteConfirm(true);
|
||||
}}
|
||||
>
|
||||
<Tooltip content="Delete event">
|
||||
<TrashCan />
|
||||
</Tooltip>
|
||||
</Button>
|
||||
</ButtonGroup>
|
||||
</div>
|
||||
);
|
||||
default:
|
||||
// only show the selector, if the task is needed for the event
|
||||
if (Object.keys(event.tasks).includes(key as string)) {
|
||||
return (
|
||||
<Select
|
||||
variant="underlined"
|
||||
fullWidth
|
||||
selectedKeys={new Set([event.tasks[key as Task] ?? ""])}
|
||||
classNames={{
|
||||
popoverContent: "w-fit",
|
||||
value: "mr-6",
|
||||
label: "mr-6",
|
||||
}}
|
||||
className="[&_*]:overflow-visible"
|
||||
>
|
||||
{Object.entries(event.availabilities).map(
|
||||
([volunteer, availability]) => (
|
||||
<SelectItem
|
||||
key={volunteer}
|
||||
// color={availability2Color(availability)}
|
||||
className={[
|
||||
// "text-" + availability2Color(availability),
|
||||
// availability2Tailwind(availability),
|
||||
].join(" ")}
|
||||
>
|
||||
{volunteer} ({availability})
|
||||
</SelectItem>
|
||||
),
|
||||
)}
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const [showAddEvent, setShowAddEvent] = useState(false);
|
||||
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
|
||||
const [activeEvent, setActiveEvent] = useState<EventData | undefined>();
|
||||
|
||||
const topContent = (
|
||||
<div>
|
||||
<Button
|
||||
color="primary"
|
||||
startContent={<Add size={32} />}
|
||||
onPress={() => setShowAddEvent(true)}
|
||||
>
|
||||
Add
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="relative flex flex-col items-center">
|
||||
<h2 className="mb-4 text-center text-4xl">Event Managment</h2>
|
||||
|
||||
<Table
|
||||
aria-label="Table with all the events"
|
||||
shadow="none"
|
||||
topContent={topContent}
|
||||
topContentPlacement="outside"
|
||||
isHeaderSticky
|
||||
sortDescriptor={events.sortDescriptor}
|
||||
onSortChange={events.sort}
|
||||
classNames={{
|
||||
wrapper: "bg-accent-4",
|
||||
tr: "even:bg-accent-5 ",
|
||||
th: "font-subheadline text-xl text-accent-1 bg-transparent ",
|
||||
thead: "[&>tr]:first:!shadow-border",
|
||||
}}
|
||||
className="w-fit"
|
||||
>
|
||||
<TableHeader columns={headers.items}>
|
||||
{(task) => (
|
||||
<TableColumn
|
||||
allowsSorting={task.key === "date"}
|
||||
key={task.key}
|
||||
className=""
|
||||
>
|
||||
{task.label}
|
||||
</TableColumn>
|
||||
)}
|
||||
</TableHeader>
|
||||
<TableBody items={events.items} emptyContent={"No events scheduled"}>
|
||||
{(event) => (
|
||||
<TableRow key={event.id}>
|
||||
{(columnKey) => (
|
||||
<TableCell>{getKeyValue(event, columnKey)}</TableCell>
|
||||
)}
|
||||
</TableRow>
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
|
||||
<AddEvent isOpen={showAddEvent} onOpenChange={setShowAddEvent} />
|
||||
|
||||
{activeEvent !== undefined ? (
|
||||
<Modal
|
||||
isOpen={showDeleteConfirm}
|
||||
onOpenChange={setShowDeleteConfirm}
|
||||
shadow={"none" as "sm"}
|
||||
backdrop="blur"
|
||||
className="bg-accent-5"
|
||||
>
|
||||
<ModalContent>
|
||||
<ModalHeader>
|
||||
<h1 className="text-2xl">Confirm event deletion</h1>
|
||||
</ModalHeader>
|
||||
<ModalBody>
|
||||
The event{" "}
|
||||
<span className="font-numbers text-accent-1">
|
||||
<LocalDate options={{ dateStyle: "long", timeStyle: "short" }}>
|
||||
{activeEvent.date}
|
||||
</LocalDate>
|
||||
</span>{" "}
|
||||
will be deleted.
|
||||
</ModalBody>
|
||||
<ModalFooter>
|
||||
<Button
|
||||
startContent={<TrashCan />}
|
||||
color="danger"
|
||||
onPress={() => deleteEvent(activeEvent.id)}
|
||||
>
|
||||
Delete event
|
||||
</Button>
|
||||
<Button
|
||||
variant="bordered"
|
||||
onPress={() => setShowDeleteConfirm(false)}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
</ModalFooter>
|
||||
</ModalContent>
|
||||
</Modal>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -34,6 +34,7 @@ export default function RootLayout({
|
||||
{
|
||||
text: "Assignments",
|
||||
href: "/assignments",
|
||||
admin: true,
|
||||
},
|
||||
{
|
||||
text: "Admin",
|
||||
|
||||
@@ -27,6 +27,9 @@ export default function Login() {
|
||||
// add the user-info to the zustand
|
||||
zustand.getState().reset({ user: await result.json() });
|
||||
|
||||
// retrieve the notifications
|
||||
await zustand.getState().getPendingEvents();
|
||||
|
||||
// redirect to the home-page
|
||||
router.push("/");
|
||||
} else {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use local";
|
||||
|
||||
import { DateFormatter } from "@/Zustand";
|
||||
import { DateFormatter } from "@/lib";
|
||||
import { getLocalTimeZone, parseDateTime } from "@internationalized/date";
|
||||
import { useLocale } from "@react-aria/i18n";
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { DateFormatter as IntlDateFormatter } from "@internationalized/date";
|
||||
|
||||
type QueryParams = Record<string, string | { toString(): string }>;
|
||||
|
||||
export type APICallResult<T extends object> = Response & {
|
||||
@@ -66,3 +68,15 @@ export function classNames(classNames: Record<string, boolean>): string {
|
||||
})
|
||||
.join(" ");
|
||||
}
|
||||
|
||||
export class DateFormatter {
|
||||
private formatter;
|
||||
|
||||
constructor(locale: string, options?: Intl.DateTimeFormatOptions) {
|
||||
this.formatter = new IntlDateFormatter(locale, options);
|
||||
}
|
||||
|
||||
format(dt: Date) {
|
||||
return this.formatter.format(dt);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user