gender mandatory

.env.example

@@ -1,3 +1,8 @@
 VITE_BASE_URL=
 SECRET_KEY="tg07Cp0daCpcbeeFw+lI4RG2lEuT8oq5xOwB5ETs9YaJTylG1euC4ogjTK4zym/d"
-ACCESS_TOKEN_EXPIRE_MINUTES = 30
+ACCESS_TOKEN_EXPIRE_MINUTES=30
+DB_HOST=db
+DB_NAME=cutt
+DB_USER=postgres
+DB_PASS=password
+DB_PORT=5432

Dockerfile

@@ -12,6 +12,5 @@ COPY pyproject.toml .python-version /app
 RUN uv sync
 
 COPY . /app
-VOLUME ["/app"]
 
 CMD uv run fastapi run cutt/main.py

compose.yml

@@ -27,7 +27,7 @@ services:
       - 8000:8000
 
   db:
-    image: postgres:17
+    image: postgres:18
     container_name: cutt-db
     restart: unless-stopped
     volumes:

cutt/analysis.py

@@ -344,6 +344,7 @@ def last_submissions(
                     times[r.time.date()] = {}
                 times[r.time.date()][r.user] = (
                     times[r.time.date()].get(r.user, "")
+                    + " "
                     + translate_tablename[survey.__tablename__]
                 )
         return times

cutt/player.py

@@ -110,7 +110,7 @@ class DisablePlayerRequest(BaseModel):
     player_id: int
 
 
-def disable_player(
+def remove_player_from_team(
     r: DisablePlayerRequest,
     request: Annotated[TeamScopedRequest, Depends(verify_team_scope)],
 ):
@@ -123,6 +123,47 @@ def disable_player(
             .join(Team)
             .where(Team.id == request.team_id, P.id == r.player_id)
         ).one_or_none()
+        if player:
+            team = session.exec(select(Team).where(Team.id == request.team_id)).one()
+            player.teams.remove(team)
+            session.add(team)
+            session.commit()
+            return PlainTextResponse(f"removed {player.display_name} from {team.name}.")
+        else:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="no such player found in your team",
+            )
+
+
+def disable_player_team(
+    r: DisablePlayerRequest,
+    request: Annotated[TeamScopedRequest, Depends(verify_team_scope)],
+):
+    if request.team_id == 42:
+        raise DEMO_TEAM_REQUEST
+    with Session(engine) as session:
+        player = session.exec(
+            select(P)
+            .join(PlayerTeamLink)
+            .join(Team)
+            .where(Team.id == request.team_id, P.id == r.player_id)
+        ).one_or_none()
+        if player:
+            player.disabled = True
+            session.add(player)
+            session.commit()
+            return PlainTextResponse(f"disabled {player.display_name}")
+        else:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="no such player found in your team",
+            )
+
+
+def disable_player(r: DisablePlayerRequest):
+    with Session(engine) as session:
+        player = session.exec(select(P).where(P.id == r.player_id)).one_or_none()
         if player:
             player.disabled = True
             session.add(player)
@@ -170,6 +211,8 @@ async def list_players(
             )
         ] + demo_players
 
+    allowed_scopes = set(user.scopes.split())
+
     with Session(engine) as session:
         current_user = session.exec(
             select(P)
@@ -177,7 +220,7 @@ async def list_players(
             .join(Team)
             .where(Team.id == team_id, P.disabled == False, P.id == user.id)
         ).one_or_none()
-        if not current_user:
+        if not current_user and f"team:{team_id}" not in allowed_scopes:
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
                 detail="you're not in this team",
@@ -208,10 +251,28 @@ async def list_players(
 
 
 def read_teams_me(user: Annotated[P, Depends(get_current_active_user)]):
+    allowed_scopes = set(user.scopes.split())
+    team_ids = {
+        int(scope.split(":")[1])
+        for scope in allowed_scopes
+        if scope.startswith("team:")
+    }
     with Session(engine) as session:
-        return [p.teams for p in session.exec(select(P).where(P.id == user.id))][0] + [
+        member_in = [p.teams for p in session.exec(select(P).where(P.id == user.id))][0]
-            {"country": "nowhere", "id": 42, "location": "everywhere", "name": "DEMO"}
+        team_ids -= {team.id for team in member_in}
-        ]
+        team_manager_in = session.exec(select(Team).where(Team.id.in_(team_ids))).all()
+        return (
+            member_in
+            + list(team_manager_in)
+            + [
+                {
+                    "country": "nowhere",
+                    "id": 42,
+                    "location": "everywhere",
+                    "name": "DEMO",
+                }
+            ]
+        )
 
 
 player_router.add_api_route(
@@ -226,7 +287,7 @@ player_router.add_api_route(
 )
 player_router.add_api_route(
     "/{team_id}",
-    endpoint=disable_player,
+    endpoint=remove_player_from_team,
     methods=["DELETE"],
 )
 player_router.add_api_route(
@@ -246,6 +307,12 @@ player_router.add_api_route(
     methods=["GET"],
     dependencies=[Security(get_current_active_user, scopes=["admin"])],
 )
+player_router.add_api_route(
+    "/disable",
+    endpoint=disable_player,
+    methods=["DELETE"],
+    dependencies=[Security(get_current_active_user, scopes=["admin"])],
+)
 player_router.add_api_route("/me", endpoint=read_player_me, methods=["GET"])
 player_router.add_api_route("/me/teams", endpoint=read_teams_me, methods=["GET"])
 player_router.add_api_route(

cutt/security.py

@@ -337,6 +337,7 @@ class RegisterRequest(BaseModel):
     team_id: int
     display_name: str
     username: str
+    gender: str | None
     password: str
     email: str | None
     number: str | None
@@ -379,6 +380,7 @@ async def register(req: RegisterRequest):
             hashed_password=get_password_hash(req.password),
             display_name=req.display_name,
             email=req.email if req.email else None,
+            gender=req.gender,
             number=req.number,
             disabled=False,
             teams=[team],

forgotten_password.py

@@ -0,0 +1,17 @@
+import sys
+from sqlmodel import Session, select
+from cutt.security import set_password_token
+from cutt.db import Player, TokenDB, engine
+
+
+if len(sys.argv) > 1:
+    with Session(engine) as session:
+        for p in session.exec(
+            select(Player.username).where(Player.username == sys.argv[1].strip())
+        ):
+            print(p)
+            token = set_password_token(p)
+            if token:
+                session.add(TokenDB(token=token))
+            print(f"https://cutt.0124816.xyz/setpassword?token={token}")
+            session.commit()

frontend/package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "bulma": "^1.0.4",
     "jwt-decode": "^4.0.0",
+    "lucide-react": "^0.562.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-sortablejs": "^6.1.4",

frontend/src/CUTT.tsx

@@ -7,6 +7,8 @@ import Rankings from "./Form";
 import TeamPanel from "./TeamPanel";
 import { GraphComponent } from "./Network";
 import MVPChart from "./MVPChart";
+import { SetPassword } from "./SetPassword";
+import { Register } from "./Register";
 
 const Maintenance = () => {
   return (
@@ -24,6 +26,8 @@ function App() {
   return (
     <BrowserRouter>
       <Routes>
+        <Route path="/register" element={<Register />} />
+        <Route path="/setpassword" element={<SetPassword />} />
         <Route
           path="/*"
           element={

frontend/src/Calendar.tsx

@@ -55,16 +55,35 @@ const Calendar = ({ playerId }: { playerId: number }) => {
   // Render month navigation
   const renderMonthNavigation = () => {
     return (
-      <div className="month-navigation">
+      <div className="field has-addons">
-        <button onClick={handlePrevMonth}>&lt;</button>
+        <p className="control">
-        <span>
+          <button
-          <button onClick={() => setSelectedDate(new Date())}>📅</button>
+            className="button is-light is-size-7-mobile"
-          {selectedDate.toLocaleString("default", {
+            onClick={handlePrevMonth}
-            month: "long",
+          >
-            year: "numeric",
+            &lt;
-          })}
+          </button>
-        </span>
+        </p>
-        <button onClick={handleNextMonth}>&gt;</button>
+        <p className="control">
+          <button
+            className="button is-light is-size-7-mobile"
+            onClick={() => setSelectedDate(new Date())}
+          >
+            📅{" "}
+            {selectedDate.toLocaleString("default", {
+              month: "long",
+              year: "numeric",
+            })}
+          </button>
+        </p>
+        <p className="control">
+          <button
+            className="button is-light is-size-7-mobile"
+            onClick={handleNextMonth}
+          >
+            &gt;
+          </button>
+        </p>
       </div>
     );
   };
@@ -89,11 +108,14 @@ const Calendar = ({ playerId }: { playerId: number }) => {
       const date = new Date(0);
       date.setDate(i + 5);
       days.push(
-        <div key={"weekday_" + i} className="weekday">
+        <button
+          key={"weekday_" + i}
+          className="button is-size-7-mobile is-white is-static"
+        >
           {date.toLocaleString("default", {
             weekday: "narrow",
           })}
-        </div>
+        </button>
       );
     }
 
@@ -109,34 +131,34 @@ const Calendar = ({ playerId }: { playerId: number }) => {
       const todaysEvents = getEventsForDay(date);
 
       days.push(
-        <div
+        <button
           key={date.getDate()}
           className={
-            "day" +
+            "cell button is-size-7-mobile" +
             (date.toDateString() === selectedDate.toDateString()
-              ? " selected-day"
+              ? " is-focused is-active is-primary is-light"
+              : " is-white") +
+            (date.toDateString() === new Date().toDateString()
+              ? " is-danger has-text-weight-extrabold"
+              : "") +
+            (todaysEvents ? " is-warning is-light" : "") +
+            (todaysEvents && playerId in todaysEvents
+              ? " is-hovered has-text-weight-semibold"
               : "")
           }
           onClick={() => handleDayClick(date)}
         >
-          <div
+          {day}
-            className={
+        </button>
-              "day-circle" +
-              (date.toDateString() === new Date().toDateString()
-                ? " today"
-                : "") +
-              (todaysEvents ? " has-event" : "") +
-              (todaysEvents && playerId in todaysEvents ? " active-player" : "")
-            }
-          >
-            {day}
-          </div>
-        </div>
       );
       day++;
     }
 
-    return <div className="calendar">{days}</div>;
+    return (
+      <div className="fixed-grid has-7-cols">
+        <div className="grid is-gap-0.5">{days}</div>
+      </div>
+    );
   };
 
   // Render events for the selected day
@@ -144,29 +166,38 @@ const Calendar = ({ playerId }: { playerId: number }) => {
     const eventsForDay = getEventsForDay(selectedDate);
     return (
       <div className="events">
-        {eventsForDay && (
+        {eventsForDay &&
-          <ul>
+          Object.entries(eventsForDay).map(([id, sub]) => {
-            {Object.entries(eventsForDay).map(([id, sub]) => {
+            const name = players?.find((p) => p.id === Number(id));
-              const name = players?.find((p) => p.id === Number(id));
+            return (
-              return (
+              <p className="field">
-                <li key={id}>
+                <div className="control" key={id}>
-                  {name !== undefined ? name.display_name : ""}:{" "}
+                  <div className="tags are-medium has-addons">
-                  <span style={{ letterSpacing: 8 }}>{sub}</span>
+                    <span className="tag is-warning is-size-7-mobile">
-                </li>
+                      {name !== undefined ? name.display_name : ""}
-              );
+                    </span>
-            })}
+                    <span className="tag is-primary is-light is-size-7-mobile">
-          </ul>
+                      {sub}
-        )}
+                    </span>
+                  </div>
+                </div>
+              </p>
+            );
+          })}
       </div>
     );
   };
 
   return (
-    <div className="calendar-container">
+    <div className="block is-size-7-mobile">
-      <h2>Latest Submissions</h2>
+      <h2 className="title is-4">Latest Submissions</h2>
-      {renderMonthNavigation()}
+      <div className="columns is-6">
-      {renderCalendar()}
+        <div className="column" style={{ maxWidth: 600 }}>
-      {renderEvents()}
+          {renderMonthNavigation()}
+          {renderCalendar()}
+        </div>
+        <div className="column is-narrow">{renderEvents()}</div>
+      </div>
     </div>
   );
 };

frontend/src/Footer.tsx

@@ -1,10 +1,4 @@
-import { useLocation } from "react-router";
-import { Link } from "react-router";
-import { useSession } from "./Session";
-
 export default function Footer() {
-  const location = useLocation();
-  const { user, teams } = useSession();
   return (
     <footer className="footer">
       <div className="content has-text-centered">

frontend/src/Form.tsx

@@ -300,7 +300,9 @@ function MVPDnD({ user, teams, players }: PlayerInfoProps) {
         onSubmit={handleSubmit}
       />
       {loading ? (
-        <progress className="progress is-primary" max="100"></progress>
+        <div className="container">
+          <progress className="progress is-primary" max="100"></progress>
+        </div>
       ) : (
         <div className="columns container is-mobile is-1-mobile">
           <div className="column">
@@ -420,7 +422,9 @@ function ChemistryDnDMobile({ user, teams, players }: PlayerInfoProps) {
         onSubmit={handleSubmit}
       />
       {loading ? (
-        <progress className="progress is-primary" max="100"></progress>
+        <div className="container">
+          <progress className="progress is-primary" max="100"></progress>
+        </div>
       ) : (
         <div className="columns container is-multiline is-mobile is-1-mobile">
           <div className="column is-full is-flex is-justify-content-center">
@@ -521,7 +525,9 @@ export default function Rankings() {
           <TypeDnD {...{ user, teams, players }} />
         </TabController>
       ) : (
-        <progress className="progress is-primary" max="100"></progress>
+        <div className="container">
+          <progress className="progress is-primary" max="100"></progress>
+        </div>
       )}
     </div>
   );

frontend/src/Header.tsx

@@ -38,13 +38,25 @@ export default function Header() {
       >
         {user?.scopes.includes(`team:${teams?.activeTeam}`) && (
           <div className="navbar-start">
-            <Link className="navbar-item" to="/network">
+            <Link
+              onClick={() => setBurgerActive(false)}
+              className="navbar-item"
+              to="/network"
+            >
               <span>Sociogram</span>
             </Link>
-            <Link className="navbar-item" to="/mvp">
+            <Link
+              onClick={() => setBurgerActive(false)}
+              className="navbar-item"
+              to="/mvp"
+            >
               <span>MVP</span>
             </Link>
-            <Link className="navbar-item" to="/team">
+            <Link
+              onClick={() => setBurgerActive(false)}
+              className="navbar-item"
+              to="/team"
+            >
               <span>Team</span>
             </Link>
           </div>

frontend/src/Register.tsx

@@ -0,0 +1,245 @@
+import { jwtDecode, JwtPayload } from "jwt-decode";
+import { FormEvent, useEffect, useState } from "react";
+import { baseUrl, Gender } from "./api";
+import { useNavigate } from "react-router";
+
+interface PassToken extends JwtPayload {
+  username: string;
+  name: string;
+  team_id: number;
+}
+
+export const Register = () => {
+  const [name, setName] = useState("");
+  const [username, setUsername] = useState("");
+  const [gender, setGender] = useState<Gender>();
+  const [number, setNumber] = useState("");
+  const [email, setEmail] = useState("");
+  const [teamName, setTeamName] = useState("");
+  const [teamID, setTeamID] = useState<number>();
+  const [password, setPassword] = useState("");
+  const [passwordr, setPasswordr] = useState("");
+  const [passwordHint, setPasswordHint] = useState("");
+  const [token, setToken] = useState("");
+  const [error, setError] = useState("");
+  const [loading, setLoading] = useState(false);
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const token = params.get("token");
+    if (token) {
+      setToken(token);
+      try {
+        const payload = jwtDecode<PassToken>(token);
+        if (payload.sub === "register") {
+          if (payload.team_id) setTeamID(payload.team_id);
+        } else {
+          setError("not a valid token for registration");
+        }
+        if (payload.name) setTeamName(payload.name);
+      } catch (InvalidTokenError) {
+        setError("not a valid token");
+      }
+    } else setError("no token found");
+  }, []);
+
+  function passwordCheck() {
+    if (password === passwordr) {
+      setPasswordHint("");
+    } else setPasswordHint("passwords do not match");
+  }
+  useEffect(() => passwordCheck(), [passwordr]);
+
+  async function handleSubmit(e: FormEvent) {
+    e.preventDefault();
+    if (password === passwordr) {
+      const req = new Request(`${baseUrl}api/register`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          display_name: name,
+          username: username,
+          email: email,
+          number: number,
+          gender: gender,
+          team_id: teamID,
+          token: token,
+          password: password,
+        }),
+      });
+      let resp: Response;
+      try {
+        resp = await fetch(req);
+      } catch (e) {
+        throw new Error(`request failed: ${e}`);
+      }
+      setLoading(false);
+
+      if (resp.ok) {
+        console.log(resp);
+        navigate("/", {
+          replace: true,
+          state: { username: username, password: password },
+        });
+      }
+
+      if (!resp.ok) {
+        const { detail } = await resp.json();
+        if (detail) setError(detail);
+        else setError("unauthorized");
+        throw new Error("Unauthorized");
+      }
+    } else setError("the passwords did not match");
+  }
+
+  return (
+    <section className="section is-medium">
+      <div className="container is-max-tablet">
+        <div className="block">
+          <p className="level-item has-text-centered">
+            <img
+              className="image"
+              alt="cool ultimate team tool"
+              src="cutt.svg"
+              style={{ width: 200 }}
+            />
+          </p>
+        </div>
+        <h1 className="title">
+          Register {teamName && `in team "${teamName}"`}
+        </h1>
+        <form onSubmit={handleSubmit}>
+          <div className="field">
+            <div className="field">
+              <label className="label">name</label>
+              <div className="control">
+                <input
+                  className="input"
+                  type="text"
+                  required
+                  value={name}
+                  onChange={(e) => {
+                    setName(e.target.value);
+                    setError("");
+                  }}
+                />
+              </div>
+            </div>
+            <div className="field">
+              <label className="label">username</label>
+              <div className="control">
+                <input
+                  className="input"
+                  type="text"
+                  required
+                  value={username}
+                  onChange={(e) => {
+                    setUsername(e.target.value);
+                    setError("");
+                  }}
+                />
+              </div>
+            </div>
+            <div className="field">
+              <label className="label">password</label>
+              <input
+                className="input"
+                type={"password"}
+                id="password"
+                name="password"
+                placeholder="password"
+                minLength={8}
+                value={password}
+                required
+                onChange={(evt) => {
+                  setError("");
+                  setPassword(evt.target.value);
+                }}
+              />
+            </div>
+            <div className="field">
+              <input
+                className={"input" + (passwordHint ? " is-danger" : "")}
+                type={"password"}
+                id="password-repeat"
+                name="password-repeat"
+                placeholder="repeat password"
+                minLength={8}
+                value={passwordr}
+                required
+                onChange={(evt) => {
+                  setError("");
+                  setPasswordr(evt.target.value);
+                }}
+              />
+              <p className={"help is-danger"}>{passwordHint}</p>
+            </div>
+            <hr />
+            <div className="field">
+              <label className="label">gender</label>
+              <div className="control">
+                <div className="select">
+                  <select
+                    name="gender"
+                    value={gender}
+                    required
+                    onChange={(e) => {
+                      setGender(e.target.value as Gender);
+                      setError("");
+                    }}
+                  >
+                    <option value={undefined}></option>
+                    <option value="fmp">FMP</option>
+                    <option value="mmp">MMP</option>
+                  </select>
+                </div>
+              </div>
+            </div>
+            <div className="field">
+              <label className="label">
+                number <small>(optional)</small>
+              </label>
+              <div className="control">
+                <input
+                  className="input"
+                  type="text"
+                  value={number}
+                  onChange={(e) => {
+                    setNumber(e.target.value);
+                    setError("");
+                  }}
+                />
+              </div>
+            </div>
+            <div className="field">
+              <label className="label">
+                email <small>(optional)</small>
+              </label>
+              <div className="control">
+                <input
+                  className="input"
+                  type="email"
+                  value={email}
+                  onChange={(e) => {
+                    setEmail(e.target.value);
+                    setError("");
+                  }}
+                />
+              </div>
+              <p className="help">helpful in case of a forgotten password</p>
+            </div>
+          </div>
+          <p className={"help" + (error ? " is-danger" : " is-success")}>
+            {error}
+          </p>
+          <div className="field is-grouped is-grouped-centered">
+            <button className="button is-light is-success">register</button>
+          </div>
+        </form>
+      </div>
+    </section>
+  );
+};

frontend/src/SetPassword.tsx

@@ -1,11 +1,7 @@
 import { jwtDecode, JwtPayload } from "jwt-decode";
-import { ReactNode, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
-import { apiAuth, baseUrl, Gender, User } from "./api";
+import { baseUrl } from "./api";
 import { useNavigate } from "react-router";
-import { Eye, EyeSlash } from "./Icons";
-import { useSession } from "./Session";
-import { relative } from "path";
-import Header from "./Header";
 
 interface PassToken extends JwtPayload {
   username: string;
@@ -13,115 +9,71 @@ interface PassToken extends JwtPayload {
   team_id: number;
 }
 
-enum Mode {
-  register = "register",
-  set = "set password",
-  change = "change password",
-}
-
 export const SetPassword = () => {
-  const [mode, setMode] = useState<Mode>();
+  const [name, setName] = useState("");
-  const [name, setName] = useState("after getting your token.");
   const [username, setUsername] = useState("");
-  const [teamID, setTeamID] = useState<number>();
-  const [currentPassword, setCurrentPassword] = useState("");
   const [password, setPassword] = useState("");
   const [passwordr, setPasswordr] = useState("");
+  const [passwordHint, setPasswordHint] = useState("");
   const [token, setToken] = useState("");
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
-  const [visible, setVisible] = useState(false);
-  const newPlayerTemplate = {
-    username: "",
-    display_name: "",
-    number: "",
-    email: "",
-  } as User;
-  const [player, setPlayer] = useState(newPlayerTemplate);
   const navigate = useNavigate();
-  const { user } = useSession();
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const token = params.get("token");
+    if (token) {
+      setToken(token);
+      try {
+        const payload = jwtDecode<PassToken>(token);
+        if (payload.sub === "set password") {
+          if (payload.name) setName(payload.name);
+          if (payload.username) setUsername(payload.username);
+        } else {
+          setError("not a valid token for setting your password");
+        }
+      } catch (InvalidTokenError) {
+        setError("not a valid token");
+      }
+    } else setError("no token found");
+  }, []);
+
+  function passwordCheck() {
+    if (password === passwordr) {
+      setPasswordHint("");
+    } else setPasswordHint("passwords do not match");
+  }
+  useEffect(() => passwordCheck(), [passwordr]);
 
   async function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
     if (password === passwordr) {
-      setLoading(true);
+      const req = new Request(`${baseUrl}api/set_password`, {
-      if (mode === Mode.change) {
+        method: "POST",
-        //====CHANGING PASSWORD====
+        headers: {
-        const resp = await apiAuth(
+          "Content-Type": "application/json",
-          "player/change_password",
+        },
-          { current_password: currentPassword, new_password: password },
+        body: JSON.stringify({ token: token, password: password }),
-          "POST"
+      });
-        );
+      let resp: Response;
-        setLoading(false);
+      try {
-        if (resp.detail) setError(resp.detail);
+        resp = await fetch(req);
-        else {
+      } catch (e) {
-          setError(resp);
+        throw new Error(`request failed: ${e}`);
-          setTimeout(() => navigate("/"), 2000);
+      }
-        }
+      setLoading(false);
-      } else if (mode === Mode.set) {
+
-        //====SETTING PASSWORD====
+      if (resp.ok) {
-        const req = new Request(`${baseUrl}api/set_password`, {
+        console.log(resp);
-          method: "POST",
+        navigate("/", {
-          headers: {
+          replace: true,
-            "Content-Type": "application/json",
+          state: { username: username, password: password },
-          },
-          body: JSON.stringify({ token: token, password: password }),
         });
-        let resp: Response;
+      }
-        try {
-          resp = await fetch(req);
-        } catch (e) {
-          throw new Error(`request failed: ${e}`);
-        }
-        setLoading(false);
 
-        if (resp.ok) {
+      if (!resp.ok) {
-          console.log(resp);
+        if (resp.status === 401) {
-          navigate("/", {
-            replace: true,
-            state: { username: username, password: password },
-          });
-        }
-
-        if (!resp.ok) {
-          if (resp.status === 401) {
-            const { detail } = await resp.json();
-            if (detail) setError(detail);
-            else setError("unauthorized");
-            throw new Error("Unauthorized");
-          }
-        }
-      } else if (mode === Mode.register) {
-        //====REGISTER NEW USER====
-        const req = new Request(`${baseUrl}api/register`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({
-            ...player,
-            team_id: teamID,
-            token: token,
-            password: password,
-          }),
-        });
-        let resp: Response;
-        try {
-          resp = await fetch(req);
-        } catch (e) {
-          throw new Error(`request failed: ${e}`);
-        }
-        setLoading(false);
-
-        if (resp.ok) {
-          console.log(resp);
-          navigate("/", {
-            replace: true,
-            state: { username: player.username, password: password },
-          });
-        }
-
-        if (!resp.ok) {
           const { detail } = await resp.json();
           if (detail) setError(detail);
           else setError("unauthorized");
@@ -131,225 +83,68 @@ export const SetPassword = () => {
     } else setError("passwords are not the same");
   }
 
-  useEffect(() => {
+  return (
-    if (user) {
+    <section className="section is-medium">
-      setUsername(user.username);
+      <div className="container is-max-tablet">
-      setName(user.display_name);
+        <div className="block">
-      setMode(Mode.change);
+          <p className="level-item has-text-centered">
-    } else {
+            <img
-      const params = new URLSearchParams(window.location.search);
+              className="image"
-      const token = params.get("token");
+              alt="cool ultimate team tool"
-      if (token) {
+              src="cutt.svg"
-        setToken(token);
+              style={{ width: 200 }}
-        try {
+            />
-          const payload = jwtDecode<PassToken>(token);
+          </p>
-          console.log(payload);
-          switch (payload.sub) {
-            case "register":
-              setMode(Mode.register);
-              if (payload.team_id) setTeamID(payload.team_id);
-              break;
-            case "set password":
-              setMode(Mode.set);
-              if (payload.username) setUsername(payload.username);
-              break;
-          }
-          if (payload.name) setName(payload.name);
-        } catch (InvalidTokenError) {
-          setName("Mr. I-have-no-valid Token");
-        }
-      }
-    }
-  }, []);
-
-  let header: ReactNode;
-  switch (mode) {
-    case Mode.change:
-      header = <h2>change your password, {name}</h2>;
-      break;
-    case Mode.set:
-      header = (
-        <>
-          <Header />
-          <h2>set your password, {name}</h2>
-        </>
-      );
-      break;
-    case Mode.register:
-      header = (
-        <>
-          <Header />
-          <h2>
-            register as a member of <i>{name}</i>
-          </h2>
-        </>
-      );
-  }
-
-  let textInputs: ReactNode;
-  switch (mode) {
-    case Mode.change:
-      textInputs = (
-        <div>
-          <input
-            type={visible ? "text" : "password"}
-            id="password"
-            name="password"
-            placeholder="current password"
-            minLength={8}
-            value={currentPassword}
-            required
-            onChange={(evt) => {
-              setError("");
-              setCurrentPassword(evt.target.value);
-            }}
-          />
-          <hr style={{ margin: "8px" }} />
         </div>
-      );
+        <h1 className="title">
-      break;
+          Set password for {name && username && `${name} (${username})`}
-    case Mode.register:
+        </h1>
-      textInputs = (
+        <form onSubmit={handleSubmit}>
-        <div className="new-player-inputs">
+          <div className="field">
-          <div>
+            <div className="field">
-            <label>name</label>
+              <label className="label">password</label>
-            <input
+              <input
-              type="text"
+                className="input"
-              required
+                type={"password"}
-              value={player.display_name}
+                id="password"
-              onChange={(e) => {
+                name="password"
-                setPlayer({
+                placeholder="password"
-                  ...player,
+                minLength={8}
-                  display_name: e.target.value,
+                value={password}
-                  username: e.target.value.toLowerCase().replace(/\W/g, ""),
+                required
-                });
+                onChange={(evt) => {
-              }}
+                  setError("");
-            />
+                  setPassword(evt.target.value);
+                }}
+              />
+            </div>
+            <div className="field">
+              <input
+                className={"input" + (passwordHint ? " is-danger" : "")}
+                type={"password"}
+                id="password-repeat"
+                name="password-repeat"
+                placeholder="repeat password"
+                minLength={8}
+                value={passwordr}
+                required
+                onChange={(evt) => {
+                  setError("");
+                  setPasswordr(evt.target.value);
+                }}
+              />
+              <p className={"help is-danger"}>{passwordHint}</p>
+            </div>
+            <hr />
           </div>
-          <div>
+          <p className={"help" + (error ? " is-danger" : " is-success")}>
-            <label>username</label>
+            {error}
-            <input
+          </p>
-              type="text"
+          <div className="field is-grouped is-grouped-centered">
-              required
+            <button className="button is-light is-link">change password</button>
-              value={player.username}
-              onChange={(e) => {
-                setPlayer({ ...player, username: e.target.value });
-              }}
-            />
           </div>
-          <div>
+        </form>
-            <label>gender</label>
-            <select
-              name="gender"
-              required
-              value={player.gender}
-              onChange={(e) => {
-                setPlayer({ ...player, gender: e.target.value as Gender });
-              }}
-            >
-              <option value={undefined}></option>
-              <option value="fmp">FMP</option>
-              <option value="mmp">MMP</option>
-            </select>
-          </div>
-          <div>
-            <label>number (optional)</label>
-            <input
-              type="text"
-              value={player.number || ""}
-              onChange={(e) => {
-                setPlayer({ ...player, number: e.target.value });
-              }}
-            />
-          </div>
-          <div>
-            <label>email (optional)</label>
-            <input
-              type="email"
-              value={player.email || ""}
-              onChange={(e) => {
-                setPlayer({ ...player, email: e.target.value });
-              }}
-            />
-          </div>
-          <hr style={{ margin: "8px" }} />
-        </div>
-      );
-      break;
-  }
-
-  let passwordInputs = (
-    <>
-      <div>
-        <input
-          type={visible ? "text" : "password"}
-          id="password"
-          name="password"
-          placeholder="password"
-          minLength={8}
-          value={password}
-          required
-          onChange={(evt) => {
-            setError("");
-            setPassword(evt.target.value);
-          }}
-        />
       </div>
-      <div>
+    </section>
-        <input
-          type={visible ? "text" : "password"}
-          id="password-repeat"
-          name="password-repeat"
-          placeholder="repeat password"
-          minLength={8}
-          value={passwordr}
-          required
-          onChange={(evt) => {
-            setError("");
-            setPasswordr(evt.target.value);
-          }}
-        />
-      </div>
-    </>
-  );
-
-  return mode ? (
-    <>
-      {header}
-      <hr style={{ width: "100%" }} />
-      <form onSubmit={handleSubmit}>
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            flexDirection: "column",
-          }}
-        >
-          {textInputs}
-          {passwordInputs}
-          <div
-            style={{
-              background: "unset",
-              fontSize: "medium",
-              cursor: "pointer",
-              display: "flex",
-              alignItems: "center",
-              gap: "8px",
-            }}
-            onClick={() => setVisible(!visible)}
-          >
-            {visible ? <Eye /> : <EyeSlash />} show passwords
-          </div>
-        </div>
-        <div>{error && <span style={{ color: "red" }}>{error}</span>}</div>
-        <button type="submit" value="login" style={{ fontSize: "small" }}>
-          submit
-        </button>
-        {loading && <span className="loader" />}
-      </form>
-    </>
-  ) : (
-    <span className="loader" />
   );
 };

frontend/src/TeamPanel.tsx

@@ -70,154 +70,185 @@ const TeamPanel = () => {
       (team) => team.id == teams?.activeTeam
     )[0];
     return (
-      <div className="team-panel">
+      <>
-        <h1>{activeTeam.name}</h1>
+        <section className="section">
-        <div>
+          <div className="container">
-          <input type="text" value={activeTeam.location || ""} disabled />
+            <h1 className="title">{activeTeam.name}</h1>
-          <br />
+            <h2 className="subtitle">
-          <input type="text" value={activeTeam.country || ""} disabled />
+              {activeTeam.location}, {activeTeam.country}
-          <hr style={{ width: "100%" }} />
+            </h2>
-
+            <div className="panel">
-          <h2>players</h2>
+              <h2 className="panel-heading is-4">Players</h2>
-          {players ? (
+              <div className="panel-block">
-            <div
+                {players ? (
-              style={{
+                  <div className="buttons">
-                display: "flex",
+                    {players.map((p) => (
-                flexWrap: "wrap",
+                      <button
-                justifyContent: "center",
+                        className={
-              }}
+                          "button is-primary is-light " +
-            >
+                          p.gender +
-              {players.map((p) => (
+                          (p.id === player.id ? " is-focused is-active" : "")
-                <button
+                        }
-                  className={
+                        key={p.id}
-                    "team-player " +
+                        onClick={() => {
-                    p.gender +
+                          setPlayer(p);
-                    (p.id === player.id ? " active-player" : "")
+                          setError({ ok: true, message: "" });
-                  }
+                        }}
-                  key={p.id}
+                      >
-                  onClick={() => {
+                        {p.display_name}
-                    setPlayer(p);
+                      </button>
-                    setError({ ok: true, message: "" });
+                    ))}
-                  }}
+                    <button
-                >
+                      className="button is-success is-light new-player"
-                  {p.display_name}
+                      key="add-player"
-                </button>
+                      onClick={() => {
-              ))}
+                        setPlayer(newPlayerTemplate);
-              <button
+                        setError({ ok: true, message: "" });
-                className="team-player new-player"
+                      }}
-                key="add-player"
+                    >
-                onClick={() => {
+                      +
-                  setPlayer(newPlayerTemplate);
+                    </button>
-                  setError({ ok: true, message: "" });
+                  </div>
-                }}
+                ) : (
-              >
+                  <span className="loader" />
-                +
+                )}
-              </button>
-            </div>
-          ) : (
-            <span className="loader" />
-          )}
-          <hr style={{ width: "100%" }} />
-
-          <form className="new-player-inputs" onSubmit={handleSubmit}>
-            <div>
-              <label>name</label>
-              <input
-                type="text"
-                required
-                value={player.display_name}
-                onChange={(e) => {
-                  setPlayer({
-                    ...player,
-                    ...(player.id === 0 && {
-                      username: e.target.value.toLowerCase().replace(/\W/g, ""),
-                    }),
-                    display_name: e.target.value,
-                  });
-                  setError({ ok: true, message: "" });
-                }}
-              />
-            </div>
-            <div>
-              <label>username</label>
-              <input
-                type="text"
-                required
-                disabled={player.id !== 0}
-                value={player.username}
-                onChange={(e) => {
-                  setPlayer({ ...player, username: e.target.value });
-                  setError({ ok: true, message: "" });
-                }}
-              />
-            </div>
-            <div>
-              <label>gender</label>
-              <select
-                name="gender"
-                value={player.gender}
-                onChange={(e) => {
-                  setPlayer({ ...player, gender: e.target.value as Gender });
-                  setError({ ok: true, message: "" });
-                }}
-              >
-                <option value={undefined}></option>
-                <option value="fmp">FMP</option>
-                <option value="mmp">MMP</option>
-              </select>
-            </div>
-            <div>
-              <label>number (optional)</label>
-              <input
-                type="text"
-                value={player.number || ""}
-                onChange={(e) => {
-                  setPlayer({ ...player, number: e.target.value });
-                  setError({ ok: true, message: "" });
-                }}
-              />
-            </div>
-            <div>
-              <label>email (optional)</label>
-              <input
-                type="email"
-                value={player.email || ""}
-                onChange={(e) => {
-                  setPlayer({ ...player, email: e.target.value });
-                  setError({ ok: true, message: "" });
-                }}
-              />
-            </div>
-            <div style={{ margin: "auto" }}>
-              {error?.message && (
-                <span
-                  style={{
-                    color: error.ok ? "green" : "red",
-                  }}
-                >
-                  {error.message}
-                </span>
-              )}
-            </div>
-            <div style={{ margin: "auto" }}>
-              <button className="team-player new-player">
-                {player.id === 0 ? "add player" : "modify player"}
-              </button>
-            </div>
-            {player.id !== 0 && (
-              <div style={{ margin: "auto" }}>
-                <button
-                  className="team-player disable-player"
-                  onClick={handleDisable}
-                >
-                  remove player
-                </button>
               </div>
-            )}
+
-          </form>
+              <div className="panel-block">
-        </div>
+                <form onSubmit={handleSubmit}>
-        <Calendar playerId={player.id} />
+                  <div className="field is-grouped is-grouped-multiline">
-      </div>
+                    <div className="field">
+                      <label className="label">name</label>
+                      <div className="control">
+                        <input
+                          className="input"
+                          type="text"
+                          required
+                          value={player.display_name}
+                          onChange={(e) => {
+                            setPlayer({
+                              ...player,
+                              ...(player.id === 0 && {
+                                username: e.target.value
+                                  .toLowerCase()
+                                  .replace(/\W/g, ""),
+                              }),
+                              display_name: e.target.value,
+                            });
+                            setError({ ok: true, message: "" });
+                          }}
+                        />
+                      </div>
+                    </div>
+                    <div className="field">
+                      <label className="label">username</label>
+                      <div className="control">
+                        <input
+                          className="input"
+                          type="text"
+                          required
+                          disabled={player.id !== 0}
+                          value={player.username}
+                          onChange={(e) => {
+                            setPlayer({ ...player, username: e.target.value });
+                            setError({ ok: true, message: "" });
+                          }}
+                        />
+                      </div>
+                    </div>
+                    <div className="field">
+                      <label className="label">gender</label>
+                      <div className="control">
+                        <div className="select">
+                          <select
+                            name="gender"
+                            value={player.gender}
+                            onChange={(e) => {
+                              setPlayer({
+                                ...player,
+                                gender: e.target.value as Gender,
+                              });
+                              setError({ ok: true, message: "" });
+                            }}
+                          >
+                            <option value={undefined}></option>
+                            <option value="fmp">FMP</option>
+                            <option value="mmp">MMP</option>
+                          </select>
+                        </div>
+                      </div>
+                    </div>
+                    <div className="field">
+                      <label className="label">
+                        number <small>(optional)</small>
+                      </label>
+                      <div className="control">
+                        <input
+                          className="input"
+                          type="text"
+                          value={player.number || ""}
+                          onChange={(e) => {
+                            setPlayer({ ...player, number: e.target.value });
+                            setError({ ok: true, message: "" });
+                          }}
+                        />
+                      </div>
+                    </div>
+                    <div className="field">
+                      <label className="label">
+                        email <small>(optional)</small>
+                      </label>
+                      <div className="control">
+                        <input
+                          className="input"
+                          type="email"
+                          value={player.email || ""}
+                          onChange={(e) => {
+                            setPlayer({ ...player, email: e.target.value });
+                            setError({ ok: true, message: "" });
+                          }}
+                        />
+                      </div>
+                      {error?.message && (
+                        <p
+                          className={
+                            "help" + (error.ok ? " is-success" : " is-danger")
+                          }
+                        >
+                          {error.message}
+                        </p>
+                      )}
+                    </div>
+                  </div>
+                  <div className="field is-grouped is-grouped-centered">
+                    <button
+                      className={
+                        "button is-light" +
+                        (player.id === 0 ? " is-success" : " is-link")
+                      }
+                    >
+                      {player.id === 0 ? "add player" : "modify player"}
+                    </button>
+                    {player.id !== 0 && (
+                      <button
+                        className="button is-danger is-light"
+                        onClick={handleDisable}
+                      >
+                        remove player
+                      </button>
+                    )}
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+        </section>
+        <section className="section">
+          <div className="container">
+            <Calendar playerId={player.id} />
+          </div>
+        </section>
+      </>
     );
   } else <span className="loader" />;
 };

frontend/src/main.css

@@ -7,7 +7,6 @@
 }
 
 .navbar {
-  --bulma-navbar-burger-color: var(--bulma-white);
   --bulma-navbar-dropdown-border-color: var(--bulma-primary);
 }