Compare commits
20 Commits
06fd18ef4c
...
feat/inter
Author | SHA1 | Date | |
---|---|---|---|
5405c3e12f
|
|||
1eab163e10
|
|||
7c054d6ba3
|
|||
4a46cd505d
|
|||
1fa91a7228
|
|||
8e91724462
|
|||
1a1b44743a
|
|||
827eceed2b | |||
96f04e6d90
|
|||
df94b151a6
|
|||
9647e890f6
|
|||
15c9a64de2
|
|||
fbe17479f7
|
|||
18e693bd2d
|
|||
c1ff2120ad
|
|||
8a9af450d4
|
|||
9c54eaf59b
|
|||
b1e5de086c
|
|||
eb4fa02327
|
|||
d37c6f7158
|
3
.env.example
Normal file
3
.env.example
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
VITE_BASE_URL=
|
||||||
|
SECRET_KEY="tg07Cp0daCpcbeeFw+lI4RG2lEuT8oq5xOwB5ETs9YaJTylG1euC4ogjTK4zym/d"
|
||||||
|
ACCESS_TOKEN_EXPIRE_MINUTES = 30
|
@@ -1,3 +1,3 @@
|
|||||||
# cutt
|
# cutt - cool ultimate team tool
|
||||||
|
|
||||||
cool ultimate team tool
|
app to survey the chemistry between the players in your team and determine the most valued players in your team
|
||||||
|
62
analysis.py
62
analysis.py
@@ -8,12 +8,12 @@ from sqlmodel import Session, func, select
|
|||||||
from sqlmodel.sql.expression import SelectOfScalar
|
from sqlmodel.sql.expression import SelectOfScalar
|
||||||
from db import Chemistry, Player, engine
|
from db import Chemistry, Player, engine
|
||||||
import networkx as nx
|
import networkx as nx
|
||||||
|
|
||||||
import matplotlib
|
import matplotlib
|
||||||
|
|
||||||
matplotlib.use("agg")
|
matplotlib.use("agg")
|
||||||
import matplotlib.pyplot as plt
|
import matplotlib.pyplot as plt
|
||||||
|
|
||||||
|
|
||||||
analysis_router = APIRouter(prefix="/analysis")
|
analysis_router = APIRouter(prefix="/analysis")
|
||||||
|
|
||||||
|
|
||||||
@@ -24,10 +24,10 @@ P = Player
|
|||||||
def sociogram_json():
|
def sociogram_json():
|
||||||
nodes = []
|
nodes = []
|
||||||
necessary_nodes = set()
|
necessary_nodes = set()
|
||||||
links = []
|
edges = []
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
for p in session.exec(select(P)).fetchall():
|
for p in session.exec(select(P)).fetchall():
|
||||||
nodes.append({"id": p.name, "appearance": 1})
|
nodes.append({"id": p.name, "label": p.name})
|
||||||
subquery = (
|
subquery = (
|
||||||
select(C.user, func.max(C.time).label("latest"))
|
select(C.user, func.max(C.time).label("latest"))
|
||||||
.where(C.time > datetime(2025, 2, 1, 10))
|
.where(C.time > datetime(2025, 2, 1, 10))
|
||||||
@@ -44,12 +44,52 @@ def sociogram_json():
|
|||||||
# G.add_edge(c.user, p)
|
# G.add_edge(c.user, p)
|
||||||
# p_id = session.exec(select(P.id).where(P.name == p)).one()
|
# p_id = session.exec(select(P.id).where(P.name == p)).one()
|
||||||
necessary_nodes.add(p)
|
necessary_nodes.add(p)
|
||||||
links.append({"source": c.user, "target": p})
|
edges.append({"from": c.user, "to": p, "relation": "likes"})
|
||||||
|
for p in c.hate:
|
||||||
|
edges.append({"from": c.user, "to": p, "relation": "dislikes"})
|
||||||
# nodes = [n for n in nodes if n["name"] in necessary_nodes]
|
# nodes = [n for n in nodes if n["name"] in necessary_nodes]
|
||||||
return JSONResponse({"nodes": nodes, "links": links})
|
return JSONResponse({"nodes": nodes, "edges": edges})
|
||||||
|
|
||||||
|
|
||||||
def sociogram_data(dislike: bool | None = False):
|
def graph_json():
|
||||||
|
nodes = []
|
||||||
|
edges = []
|
||||||
|
with Session(engine) as session:
|
||||||
|
for p in session.exec(select(P)).fetchall():
|
||||||
|
nodes.append({"id": p.name, "label": p.name})
|
||||||
|
subquery = (
|
||||||
|
select(C.user, func.max(C.time).label("latest"))
|
||||||
|
.where(C.time > datetime(2025, 2, 1, 10))
|
||||||
|
.group_by(C.user)
|
||||||
|
.subquery()
|
||||||
|
)
|
||||||
|
statement2 = select(C).join(
|
||||||
|
subquery, (C.user == subquery.c.user) & (C.time == subquery.c.latest)
|
||||||
|
)
|
||||||
|
for c in session.exec(statement2):
|
||||||
|
for p in c.love:
|
||||||
|
edges.append(
|
||||||
|
{
|
||||||
|
"id": f"{c.user}->{p}",
|
||||||
|
"source": c.user,
|
||||||
|
"target": p,
|
||||||
|
"relation": "likes",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
for p in c.hate:
|
||||||
|
edges.append(
|
||||||
|
{
|
||||||
|
id: f"{c.user}-x>{p}",
|
||||||
|
"source": c.user,
|
||||||
|
"target": p,
|
||||||
|
"relation": "dislikes",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return JSONResponse({"nodes": nodes, "edges": edges})
|
||||||
|
|
||||||
|
|
||||||
|
def sociogram_data(show: int | None = 2):
|
||||||
G = nx.DiGraph()
|
G = nx.DiGraph()
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
for p in session.exec(select(P)).fetchall():
|
for p in session.exec(select(P)).fetchall():
|
||||||
@@ -62,13 +102,14 @@ def sociogram_data(dislike: bool | None = False):
|
|||||||
)
|
)
|
||||||
statement2 = (
|
statement2 = (
|
||||||
select(C)
|
select(C)
|
||||||
.where(C.user.in_(["Kruse", "Franz", "ck"]))
|
# .where(C.user.in_(["Kruse", "Franz", "ck"]))
|
||||||
.join(subquery, (C.user == subquery.c.user) & (C.time == subquery.c.latest))
|
.join(subquery, (C.user == subquery.c.user) & (C.time == subquery.c.latest))
|
||||||
)
|
)
|
||||||
for c in session.exec(statement2):
|
for c in session.exec(statement2):
|
||||||
|
if show >= 1:
|
||||||
for i, p in enumerate(c.love):
|
for i, p in enumerate(c.love):
|
||||||
G.add_edge(c.user, p, group="love", rank=i, popularity=1 - 0.08 * i)
|
G.add_edge(c.user, p, group="love", rank=i, popularity=1 - 0.08 * i)
|
||||||
if dislike:
|
if show <= 1:
|
||||||
for i, p in enumerate(c.hate):
|
for i, p in enumerate(c.hate):
|
||||||
G.add_edge(c.user, p, group="hate", rank=8, popularity=-0.16)
|
G.add_edge(c.user, p, group="hate", rank=8, popularity=-0.16)
|
||||||
return G
|
return G
|
||||||
@@ -82,7 +123,7 @@ class Params(BaseModel):
|
|||||||
distance: float | None = 0.2
|
distance: float | None = 0.2
|
||||||
weighting: bool | None = True
|
weighting: bool | None = True
|
||||||
popularity: bool | None = True
|
popularity: bool | None = True
|
||||||
dislike: bool | None = False
|
show: int | None = 2
|
||||||
|
|
||||||
|
|
||||||
ARROWSTYLE = {"love": "-|>", "hate": "-|>"}
|
ARROWSTYLE = {"love": "-|>", "hate": "-|>"}
|
||||||
@@ -96,7 +137,7 @@ async def render_sociogram(params: Params):
|
|||||||
ax.set_facecolor("none") # Set the axis face color to none (transparent)
|
ax.set_facecolor("none") # Set the axis face color to none (transparent)
|
||||||
ax.axis("off") # Turn off axis ticks and frames
|
ax.axis("off") # Turn off axis ticks and frames
|
||||||
|
|
||||||
G = sociogram_data(params.dislike)
|
G = sociogram_data(show=params.show)
|
||||||
pos = nx.spring_layout(G, scale=2, k=params.distance, iterations=50, seed=None)
|
pos = nx.spring_layout(G, scale=2, k=params.distance, iterations=50, seed=None)
|
||||||
nodes = nx.draw_networkx_nodes(
|
nodes = nx.draw_networkx_nodes(
|
||||||
G,
|
G,
|
||||||
@@ -143,6 +184,7 @@ async def render_sociogram(params: Params):
|
|||||||
|
|
||||||
|
|
||||||
analysis_router.add_api_route("/json", endpoint=sociogram_json, methods=["GET"])
|
analysis_router.add_api_route("/json", endpoint=sociogram_json, methods=["GET"])
|
||||||
|
analysis_router.add_api_route("/graph_json", endpoint=graph_json, methods=["GET"])
|
||||||
analysis_router.add_api_route("/image", endpoint=render_sociogram, methods=["POST"])
|
analysis_router.add_api_route("/image", endpoint=render_sociogram, methods=["POST"])
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
21
db.py
21
db.py
@@ -1,10 +1,18 @@
|
|||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
from sqlmodel import ARRAY, Column, Relationship, SQLModel, Field, create_engine, String
|
from sqlmodel import (
|
||||||
|
ARRAY,
|
||||||
|
Column,
|
||||||
|
Relationship,
|
||||||
|
SQLModel,
|
||||||
|
Field,
|
||||||
|
create_engine,
|
||||||
|
String,
|
||||||
|
)
|
||||||
|
|
||||||
with open("db.secrets", "r") as f:
|
with open("db.secrets", "r") as f:
|
||||||
db_secrets = f.readline().strip()
|
db_secrets = f.readline().strip()
|
||||||
|
|
||||||
engine = create_engine(db_secrets)
|
engine = create_engine(db_secrets, connect_args={"connect_timeout": 8})
|
||||||
del db_secrets
|
del db_secrets
|
||||||
|
|
||||||
|
|
||||||
@@ -54,4 +62,13 @@ class MVPRanking(SQLModel, table=True):
|
|||||||
mvps: list[str] = Field(sa_column=Column(ARRAY(String)))
|
mvps: list[str] = Field(sa_column=Column(ARRAY(String)))
|
||||||
|
|
||||||
|
|
||||||
|
class User(SQLModel, table=True):
|
||||||
|
username: str = Field(default=None, primary_key=True)
|
||||||
|
email: str | None = None
|
||||||
|
full_name: str | None = None
|
||||||
|
disabled: bool | None = None
|
||||||
|
hashed_password: str | None = None
|
||||||
|
player_id: int | None = Field(default=None, foreign_key="player.id")
|
||||||
|
|
||||||
|
|
||||||
SQLModel.metadata.create_all(engine)
|
SQLModel.metadata.create_all(engine)
|
||||||
|
15
main.py
15
main.py
@@ -1,4 +1,4 @@
|
|||||||
from fastapi import APIRouter, FastAPI, status
|
from fastapi import APIRouter, Depends, FastAPI, status
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
from db import Player, Team, Chemistry, MVPRanking, engine
|
from db import Player, Team, Chemistry, MVPRanking, engine
|
||||||
from sqlmodel import (
|
from sqlmodel import (
|
||||||
@@ -7,6 +7,12 @@ from sqlmodel import (
|
|||||||
)
|
)
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
from analysis import analysis_router
|
from analysis import analysis_router
|
||||||
|
from security import (
|
||||||
|
get_current_active_user,
|
||||||
|
login_for_access_token,
|
||||||
|
read_users_me,
|
||||||
|
read_own_items,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
app = FastAPI(title="cutt")
|
app = FastAPI(title="cutt")
|
||||||
@@ -91,6 +97,11 @@ class SPAStaticFiles(StaticFiles):
|
|||||||
|
|
||||||
api_router.include_router(player_router)
|
api_router.include_router(player_router)
|
||||||
api_router.include_router(team_router)
|
api_router.include_router(team_router)
|
||||||
api_router.include_router(analysis_router)
|
api_router.include_router(
|
||||||
|
analysis_router, dependencies=[Depends(get_current_active_user)]
|
||||||
|
)
|
||||||
|
api_router.add_api_route("/token", endpoint=login_for_access_token, methods=["POST"])
|
||||||
|
api_router.add_api_route("/users/me/", endpoint=read_users_me, methods=["GET"])
|
||||||
|
api_router.add_api_route("/users/me/items/", endpoint=read_own_items, methods=["GET"])
|
||||||
app.include_router(api_router)
|
app.include_router(api_router)
|
||||||
app.mount("/", SPAStaticFiles(directory="dist", html=True), name="site")
|
app.mount("/", SPAStaticFiles(directory="dist", html=True), name="site")
|
||||||
|
@@ -10,15 +10,14 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"d3": "^7.9.0",
|
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
"react-dom": "^18.3.1",
|
"react-dom": "^18.3.1",
|
||||||
"react-sortablejs": "^6.1.4",
|
"react-sortablejs": "^6.1.4",
|
||||||
|
"reagraph": "^4.21.2",
|
||||||
"sortablejs": "^1.15.6"
|
"sortablejs": "^1.15.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.17.0",
|
"@eslint/js": "^9.17.0",
|
||||||
"@types/d3": "^7.4.3",
|
|
||||||
"@types/react": "^18.3.18",
|
"@types/react": "^18.3.18",
|
||||||
"@types/react-dom": "^18.3.5",
|
"@types/react-dom": "^18.3.5",
|
||||||
"@types/sortablejs": "^1.15.8",
|
"@types/sortablejs": "^1.15.8",
|
||||||
@@ -27,7 +26,7 @@
|
|||||||
"eslint-plugin-react-hooks": "^5.0.0",
|
"eslint-plugin-react-hooks": "^5.0.0",
|
||||||
"eslint-plugin-react-refresh": "^0.4.16",
|
"eslint-plugin-react-refresh": "^0.4.16",
|
||||||
"globals": "^15.14.0",
|
"globals": "^15.14.0",
|
||||||
"react-router-dom": "^7.1.5",
|
"react-router": "^7.1.5",
|
||||||
"typescript": "~5.6.2",
|
"typescript": "~5.6.2",
|
||||||
"typescript-eslint": "^8.18.2",
|
"typescript-eslint": "^8.18.2",
|
||||||
"vite": "^6.0.5"
|
"vite": "^6.0.5"
|
||||||
|
@@ -1,15 +1,19 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "cutt"
|
name = "cutt"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
description = "Add your description here"
|
description = "cool ultimate team tool"
|
||||||
author = "julius"
|
author = "julius"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.13"
|
requires-python = ">=3.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"argon2-cffi>=23.1.0",
|
||||||
"fastapi[standard]>=0.115.7",
|
"fastapi[standard]>=0.115.7",
|
||||||
"matplotlib>=3.10.0",
|
"matplotlib>=3.10.0",
|
||||||
"networkx>=3.4.2",
|
"networkx>=3.4.2",
|
||||||
|
"passlib>=1.7.4",
|
||||||
"psycopg>=3.2.4",
|
"psycopg>=3.2.4",
|
||||||
|
"pydantic-settings>=2.7.1",
|
||||||
|
"pyjwt>=2.10.1",
|
||||||
"pyqt6>=6.8.0",
|
"pyqt6>=6.8.0",
|
||||||
"sqlmodel>=0.0.22",
|
"sqlmodel>=0.0.22",
|
||||||
"uvicorn>=0.34.0",
|
"uvicorn>=0.34.0",
|
||||||
|
137
security.py
Normal file
137
security.py
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
from datetime import timedelta, timezone, datetime
|
||||||
|
from typing import Annotated
|
||||||
|
from fastapi import Depends, HTTPException, Response, status
|
||||||
|
from pydantic import BaseModel
|
||||||
|
import jwt
|
||||||
|
from jwt.exceptions import InvalidTokenError
|
||||||
|
from sqlmodel import Session, select
|
||||||
|
from db import engine, User
|
||||||
|
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
|
||||||
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
from passlib.context import CryptContext
|
||||||
|
from sqlalchemy.exc import OperationalError
|
||||||
|
|
||||||
|
|
||||||
|
class Config(BaseSettings):
|
||||||
|
secret_key: str = ""
|
||||||
|
access_token_expire_minutes: int = 30
|
||||||
|
model_config = SettingsConfigDict(
|
||||||
|
env_file=".env", env_file_encoding="utf-8", extra="ignore"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
config = Config()
|
||||||
|
|
||||||
|
|
||||||
|
class Token(BaseModel):
|
||||||
|
access_token: str
|
||||||
|
token_type: str
|
||||||
|
|
||||||
|
|
||||||
|
class TokenData(BaseModel):
|
||||||
|
username: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
pwd_context = CryptContext(schemes=["argon2"], deprecated="auto")
|
||||||
|
|
||||||
|
|
||||||
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/token")
|
||||||
|
|
||||||
|
|
||||||
|
def verify_password(plain_password, hashed_password):
|
||||||
|
return pwd_context.verify(plain_password, hashed_password)
|
||||||
|
|
||||||
|
|
||||||
|
def get_password_hash(password):
|
||||||
|
return pwd_context.hash(password)
|
||||||
|
|
||||||
|
|
||||||
|
def get_user(username: str | None):
|
||||||
|
if username:
|
||||||
|
try:
|
||||||
|
with Session(engine) as session:
|
||||||
|
return session.exec(
|
||||||
|
select(User).where(User.username == username)
|
||||||
|
).one_or_none()
|
||||||
|
except OperationalError:
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def authenticate_user(username: str, password: str):
|
||||||
|
user = get_user(username)
|
||||||
|
if not user:
|
||||||
|
return False
|
||||||
|
if not verify_password(password, user.hashed_password):
|
||||||
|
return False
|
||||||
|
return user
|
||||||
|
|
||||||
|
|
||||||
|
def create_access_token(data: dict, expires_delta: timedelta | None = None):
|
||||||
|
to_encode = data.copy()
|
||||||
|
if expires_delta:
|
||||||
|
expire = datetime.now(timezone.utc) + expires_delta
|
||||||
|
else:
|
||||||
|
expire = datetime.now(timezone.utc) + timedelta(minutes=15)
|
||||||
|
to_encode.update({"exp": expire})
|
||||||
|
encoded_jwt = jwt.encode(to_encode, config.secret_key, algorithm="HS256")
|
||||||
|
return encoded_jwt
|
||||||
|
|
||||||
|
|
||||||
|
async def get_current_user(token: Annotated[str, Depends(oauth2_scheme)]):
|
||||||
|
credentials_exception = HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Could not validate credentials",
|
||||||
|
headers={"WWW-Authenticate": "Bearer"},
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
payload = jwt.decode(token, config.secret_key, algorithms=["HS256"])
|
||||||
|
username: str = payload.get("sub")
|
||||||
|
if username is None:
|
||||||
|
raise credentials_exception
|
||||||
|
token_data = TokenData(username=username)
|
||||||
|
except InvalidTokenError:
|
||||||
|
raise credentials_exception
|
||||||
|
user = get_user(username=token_data.username)
|
||||||
|
if user is None:
|
||||||
|
raise credentials_exception
|
||||||
|
return user
|
||||||
|
|
||||||
|
|
||||||
|
async def get_current_active_user(
|
||||||
|
current_user: Annotated[User, Depends(get_current_user)],
|
||||||
|
):
|
||||||
|
if current_user.disabled:
|
||||||
|
raise HTTPException(status_code=400, detail="Inactive user")
|
||||||
|
return current_user
|
||||||
|
|
||||||
|
|
||||||
|
async def login_for_access_token(
|
||||||
|
form_data: Annotated[OAuth2PasswordRequestForm, Depends()], response: Response
|
||||||
|
) -> Token:
|
||||||
|
user = authenticate_user(form_data.username, form_data.password)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Incorrect username or password",
|
||||||
|
headers={"WWW-Authenticate": "Bearer"},
|
||||||
|
)
|
||||||
|
access_token_expires = timedelta(minutes=config.access_token_expire_minutes)
|
||||||
|
access_token = create_access_token(
|
||||||
|
data={"sub": user.username}, expires_delta=access_token_expires
|
||||||
|
)
|
||||||
|
response.set_cookie(
|
||||||
|
"Authorization", value=f"Bearer {access_token}", httponly=True, samesite="none"
|
||||||
|
)
|
||||||
|
return Token(access_token=access_token, token_type="bearer")
|
||||||
|
|
||||||
|
|
||||||
|
async def read_users_me(
|
||||||
|
current_user: Annotated[User, Depends(get_current_active_user)],
|
||||||
|
):
|
||||||
|
return current_user
|
||||||
|
|
||||||
|
|
||||||
|
async def read_own_items(
|
||||||
|
current_user: Annotated[User, Depends(get_current_active_user)],
|
||||||
|
):
|
||||||
|
return [{"item_id": "Foo", "owner": current_user.username}]
|
@@ -1,5 +1,5 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { baseUrl } from "./api";
|
import { apiAuth } from "./api";
|
||||||
|
|
||||||
//const debounce = <T extends (...args: any[]) => void>(
|
//const debounce = <T extends (...args: any[]) => void>(
|
||||||
// func: T,
|
// func: T,
|
||||||
@@ -33,7 +33,7 @@ interface Params {
|
|||||||
distance: number;
|
distance: number;
|
||||||
weighting: boolean;
|
weighting: boolean;
|
||||||
popularity: boolean;
|
popularity: boolean;
|
||||||
dislike: boolean;
|
show: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface DeferredProps {
|
interface DeferredProps {
|
||||||
@@ -53,26 +53,21 @@ export default function Analysis() {
|
|||||||
distance: 2,
|
distance: 2,
|
||||||
weighting: true,
|
weighting: true,
|
||||||
popularity: true,
|
popularity: true,
|
||||||
dislike: false,
|
show: 2,
|
||||||
});
|
});
|
||||||
const [showControlPanel, setShowControlPanel] = useState(false);
|
const [showControlPanel, setShowControlPanel] = useState(false);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
// Function to generate and fetch the graph image
|
// Function to generate and fetch the graph image
|
||||||
async function loadImage() {
|
async function loadImage() {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
await fetch(`${baseUrl}api/analysis/image`, {
|
await apiAuth("analysis/image", params, "POST")
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify(params)
|
|
||||||
})
|
|
||||||
.then((resp) => resp.json())
|
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
setImage(data.image);
|
setImage(data.image);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
});
|
}).catch((e) => {
|
||||||
|
console.log("best to just reload... ", e);
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -84,6 +79,14 @@ export default function Analysis() {
|
|||||||
}, 1000);
|
}, 1000);
|
||||||
}, [params]);
|
}, [params]);
|
||||||
|
|
||||||
|
function showLabel() {
|
||||||
|
switch (params.show) {
|
||||||
|
case 0: return "dislike";
|
||||||
|
case 1: return "both";
|
||||||
|
case 2: return "like";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="stack column dropdown">
|
<div className="stack column dropdown">
|
||||||
<button onClick={() => setShowControlPanel(!showControlPanel)}>
|
<button onClick={() => setShowControlPanel(!showControlPanel)}>
|
||||||
@@ -92,14 +95,27 @@ export default function Analysis() {
|
|||||||
<div id="control-panel" className={showControlPanel ? "opened" : ""}>
|
<div id="control-panel" className={showControlPanel ? "opened" : ""}>
|
||||||
|
|
||||||
<div className="control">
|
<div className="control">
|
||||||
<div className="checkBox">
|
<datalist id="markers">
|
||||||
|
<option value="0"></option>
|
||||||
|
<option value="1"></option>
|
||||||
|
<option value="2"></option>
|
||||||
|
</datalist>
|
||||||
|
<div id="three-slider">
|
||||||
|
<label>😬</label>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="range"
|
||||||
checked={params.dislike}
|
list="markers"
|
||||||
onChange={(evt) => setParams({ ...params, dislike: evt.target.checked })}
|
min="0"
|
||||||
|
max="2"
|
||||||
|
step="1"
|
||||||
|
width="16px"
|
||||||
|
onChange={(evt) => setParams({ ...params, show: Number(evt.target.value) })}
|
||||||
/>
|
/>
|
||||||
<label>show dislike</label>
|
<label>😍</label>
|
||||||
</div>
|
</div>
|
||||||
|
{showLabel()}
|
||||||
|
</div>
|
||||||
|
<div className="control">
|
||||||
<div className="checkBox">
|
<div className="checkBox">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
|
27
src/App.css
27
src/App.css
@@ -12,16 +12,18 @@ body {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
|
||||||
font-size: x-small;
|
|
||||||
}
|
|
||||||
|
|
||||||
#root {
|
#root {
|
||||||
max-width: 1280px;
|
max-width: 1280px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
footer {
|
||||||
|
margin-top: 24px;
|
||||||
|
font-size: x-small;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.grey {
|
.grey {
|
||||||
color: #444;
|
color: #444;
|
||||||
}
|
}
|
||||||
@@ -37,6 +39,11 @@ footer {
|
|||||||
z-index: -1;
|
z-index: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
padding: 0.2em 16px;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
h1,
|
h1,
|
||||||
h2,
|
h2,
|
||||||
h3 {
|
h3 {
|
||||||
@@ -120,7 +127,8 @@ h3 {
|
|||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
button {
|
button,
|
||||||
|
.button {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: large;
|
font-size: large;
|
||||||
color: aliceblue;
|
color: aliceblue;
|
||||||
@@ -151,6 +159,11 @@ button {
|
|||||||
padding: 8px 16px;
|
padding: 8px 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#three-slider input {
|
||||||
|
margin: 4px;
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 1000px) {
|
@media only screen and (max-width: 1000px) {
|
||||||
#control-panel {
|
#control-panel {
|
||||||
grid-template-columns: repeat(2, 1fr);
|
grid-template-columns: repeat(2, 1fr);
|
||||||
@@ -196,6 +209,10 @@ button {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.navbar {
|
.navbar {
|
||||||
|
span {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
font-size: medium;
|
font-size: medium;
|
||||||
margin: 4px 0.5%;
|
margin: 4px 0.5%;
|
||||||
|
21
src/App.tsx
21
src/App.tsx
@@ -3,21 +3,26 @@ import "./App.css";
|
|||||||
import Footer from "./Footer";
|
import Footer from "./Footer";
|
||||||
import Header from "./Header";
|
import Header from "./Header";
|
||||||
import Rankings from "./Rankings";
|
import Rankings from "./Rankings";
|
||||||
import { BrowserRouter, Routes, Route } from "react-router-dom";
|
import { BrowserRouter, Routes, Route } from "react-router";
|
||||||
|
import { SessionProvider } from "./Session";
|
||||||
|
import { GraphComponent } from "./Network";
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
//const [data, setData] = useState({ nodes: [], links: [] } as SociogramData);
|
|
||||||
//async function loadData() {
|
|
||||||
// await fetch(`${baseUrl}api/analysis/json`, { method: "GET" }).then(resp => resp.json() as unknown as SociogramData).then(json => { setData(json) })
|
|
||||||
//}
|
|
||||||
//useEffect(() => { loadData() }, [])
|
|
||||||
//
|
|
||||||
return (
|
return (
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<Header />
|
<Header />
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route index element={<Rankings />} />
|
<Route index element={<Rankings />} />
|
||||||
<Route path="/analysis" element={<Analysis />} />
|
<Route path="/network" element={
|
||||||
|
<SessionProvider>
|
||||||
|
<GraphComponent />
|
||||||
|
</SessionProvider>
|
||||||
|
} />
|
||||||
|
<Route path="/analysis" element={
|
||||||
|
<SessionProvider>
|
||||||
|
<Analysis />
|
||||||
|
</SessionProvider>
|
||||||
|
} />
|
||||||
</Routes>
|
</Routes>
|
||||||
<Footer />
|
<Footer />
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
|
@@ -1,6 +1,13 @@
|
|||||||
|
import { Link } from "react-router";
|
||||||
|
|
||||||
export default function Footer() {
|
export default function Footer() {
|
||||||
return <footer>
|
return <footer>
|
||||||
<p className="grey">
|
<div className="navbar">
|
||||||
|
<Link to="/" ><span>Form</span></Link>
|
||||||
|
<span>|</span>
|
||||||
|
<Link to="/network" ><span>Trainer Analysis</span></Link>
|
||||||
|
</div>
|
||||||
|
<p className="grey extra-margin">
|
||||||
something not working?
|
something not working?
|
||||||
<br />
|
<br />
|
||||||
message <a href="https://t.me/x0124816">me</a>.
|
message <a href="https://t.me/x0124816">me</a>.
|
||||||
|
@@ -2,7 +2,7 @@ import { baseUrl } from "./api";
|
|||||||
|
|
||||||
export default function Header() {
|
export default function Header() {
|
||||||
return <div className="logo">
|
return <div className="logo">
|
||||||
<a href={baseUrl}>
|
<a href={"/"}>
|
||||||
<img alt="logo" height="66%" src="logo.svg" />
|
<img alt="logo" height="66%" src="logo.svg" />
|
||||||
<h3 className="centered">cutt</h3>
|
<h3 className="centered">cutt</h3>
|
||||||
</a>
|
</a>
|
||||||
|
86
src/Login.tsx
Normal file
86
src/Login.tsx
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
import { FormEvent, useContext, useState } from "react";
|
||||||
|
import { useNavigate } from "react-router";
|
||||||
|
import { currentUser, login, LoginRequest, User } from "./api";
|
||||||
|
|
||||||
|
export interface LoginProps {
|
||||||
|
onLogin: (user: User) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Login = ({ onLogin }: LoginProps) => {
|
||||||
|
const [username, setUsername] = useState("");
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
const [error, setError] = useState<unknown>(null);
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
|
async function doLogin() {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
const timeout = new Promise((r) => setTimeout(r, 1500));
|
||||||
|
let user: User;
|
||||||
|
try {
|
||||||
|
login({ username, password });
|
||||||
|
user = await currentUser();
|
||||||
|
} catch (e) {
|
||||||
|
await timeout;
|
||||||
|
setError(e);
|
||||||
|
setLoading(false);
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
await timeout;
|
||||||
|
onLogin(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleClick() {
|
||||||
|
doLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSubmit(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
doLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form onSubmit={handleSubmit}>
|
||||||
|
<div>
|
||||||
|
<input type="text" id="username" name="username" placeholder="username" required value={username} onChange={evt => setUsername(evt.target.value)} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="password" id="password" name="password" placeholder="password" minLength={8} value={password} required onChange={evt => setPassword(evt.target.value)} />
|
||||||
|
</div>
|
||||||
|
<button type="submit" value="login" style={{ fontSize: "small" }} onClick={handleClick} >login</button>
|
||||||
|
{loading && <span className="loader" />}
|
||||||
|
</form>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
export default function Login(props: { onLogin: (user: User) => void }) {
|
||||||
|
const { onLogin } = props;
|
||||||
|
const [username, setUsername] = useState("");
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
|
||||||
|
async function handleLogin(e: FormEvent) {
|
||||||
|
e.preventDefault()
|
||||||
|
const timeout = new Promise((r) => setTimeout(r, 1500));
|
||||||
|
let user: User;
|
||||||
|
try {
|
||||||
|
login({ username, password })
|
||||||
|
user = await currentUser()
|
||||||
|
} catch (e) { await timeout; return }
|
||||||
|
await timeout;
|
||||||
|
onLogin(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
return <div>
|
||||||
|
<form onSubmit={handleLogin}>
|
||||||
|
<div>
|
||||||
|
<input type="text" id="username" name="username" placeholder="username" required value={username} onChange={evt => setUsername(evt.target.value)} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="password" id="password" name="password" placeholder="password" minLength={8} value={password} required onChange={evt => setPassword(evt.target.value)} />
|
||||||
|
</div>
|
||||||
|
<input className="button" type="submit" value="login" onSubmit={handleLogin} />
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
} */
|
46
src/Network.tsx
Normal file
46
src/Network.tsx
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { apiAuth } from "./api";
|
||||||
|
import { GraphCanvas, GraphCanvasRef, GraphEdge, GraphNode, useSelection } from "reagraph";
|
||||||
|
|
||||||
|
interface NetworkData {
|
||||||
|
nodes: GraphNode[],
|
||||||
|
edges: GraphEdge[],
|
||||||
|
}
|
||||||
|
|
||||||
|
export const GraphComponent = () => {
|
||||||
|
const [data, setData] = useState({ nodes: [], edges: [] } as NetworkData);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
|
async function loadData() {
|
||||||
|
setLoading(true);
|
||||||
|
await apiAuth("analysis/graph_json", null)
|
||||||
|
.then(json => json as Promise<NetworkData>).then(json => { setData(json) })
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => { loadData() }, [])
|
||||||
|
|
||||||
|
const graphRef = useRef<GraphCanvasRef | null>(null);
|
||||||
|
|
||||||
|
const { selections, actives, onNodeClick, onCanvasClick } = useSelection({
|
||||||
|
ref: graphRef,
|
||||||
|
nodes: data.nodes,
|
||||||
|
edges: data.edges,
|
||||||
|
pathSelectionType: 'out'
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<GraphCanvas
|
||||||
|
draggable
|
||||||
|
ref={graphRef}
|
||||||
|
nodes={data.nodes}
|
||||||
|
edges={data.edges}
|
||||||
|
selections={selections}
|
||||||
|
actives={actives}
|
||||||
|
onCanvasClick={onCanvasClick}
|
||||||
|
onNodeClick={onNodeClick}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@@ -334,6 +334,9 @@ export default function Rankings() {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<span className="grey">assign as many or as few players as you want<br />
|
||||||
|
and don't forget to <b>submit</b> (💾) when you're done :)</span>
|
||||||
|
|
||||||
<div id="Chemistry" className="tabcontent">
|
<div id="Chemistry" className="tabcontent">
|
||||||
<Chemistry {...{ user, players }} />
|
<Chemistry {...{ user, players }} />
|
||||||
</div>
|
</div>
|
||||||
|
40
src/Session.tsx
Normal file
40
src/Session.tsx
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { createContext, ReactNode, useContext, useLayoutEffect, useState } from "react";
|
||||||
|
import { currentUser, User } from "./api";
|
||||||
|
import { Login } from "./Login";
|
||||||
|
|
||||||
|
export interface SessionProviderProps {
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
const sessionContext = createContext<User | null>(null);
|
||||||
|
|
||||||
|
export function SessionProvider(props: SessionProviderProps) {
|
||||||
|
const { children } = props;
|
||||||
|
|
||||||
|
const [user, setUser] = useState<User | null>(null);
|
||||||
|
const [err, setErr] = useState<unknown>(null);
|
||||||
|
|
||||||
|
function loadUser() {
|
||||||
|
currentUser()
|
||||||
|
.then((user) => { setUser(user); setErr(null); })
|
||||||
|
.catch((err) => { setUser(null); setErr(err); });
|
||||||
|
}
|
||||||
|
|
||||||
|
useLayoutEffect(() => { loadUser(); }, [err]);
|
||||||
|
|
||||||
|
function onLogin(user: User) {
|
||||||
|
setUser(user);
|
||||||
|
setErr(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
let content: ReactNode;
|
||||||
|
if (!err && !user) content = <span className="loader" />;
|
||||||
|
else if (err) content = <Login onLogin={onLogin} />;
|
||||||
|
else content = <sessionContext.Provider value={user}>{children}</sessionContext.Provider>;
|
||||||
|
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useSession() {
|
||||||
|
return useContext(sessionContext);
|
||||||
|
}
|
79
src/api.ts
79
src/api.ts
@@ -1,4 +1,6 @@
|
|||||||
export const baseUrl = import.meta.env.VITE_BASE_URL as string;
|
export const baseUrl = import.meta.env.VITE_BASE_URL as string;
|
||||||
|
export const token = () => localStorage.getItem("access_token") as string;
|
||||||
|
|
||||||
export default async function api(path: string, data: any): Promise<any> {
|
export default async function api(path: string, data: any): Promise<any> {
|
||||||
const request = new Request(`${baseUrl}${path}/`, {
|
const request = new Request(`${baseUrl}${path}/`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@@ -15,3 +17,80 @@ export default async function api(path: string, data: any): Promise<any> {
|
|||||||
}
|
}
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function apiAuth(path: string, data: any, method: string = "GET"): Promise<any> {
|
||||||
|
|
||||||
|
const req = new Request(`${baseUrl}api/${path}`,
|
||||||
|
{
|
||||||
|
method: method,
|
||||||
|
headers: {
|
||||||
|
"Authorization": `Bearer ${token()} `,
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
...(data && { body: JSON.stringify(data) })
|
||||||
|
}
|
||||||
|
);
|
||||||
|
let resp: Response;
|
||||||
|
try {
|
||||||
|
resp = await fetch(req);
|
||||||
|
} catch (e) {
|
||||||
|
throw new Error(`request failed: ${e}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!resp.ok) {
|
||||||
|
if (resp.status === 401) {
|
||||||
|
logout()
|
||||||
|
throw new Error('Unauthorized');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return resp.json()
|
||||||
|
}
|
||||||
|
|
||||||
|
export type User = {
|
||||||
|
username: string;
|
||||||
|
fullName: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function currentUser(): Promise<User> {
|
||||||
|
if (!token()) throw new Error("you have no access token")
|
||||||
|
const req = new Request(`${baseUrl}api/users/me/`, {
|
||||||
|
method: "GET", headers: {
|
||||||
|
"Authorization": `Bearer ${token()} `,
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let resp: Response;
|
||||||
|
try {
|
||||||
|
resp = await fetch(req);
|
||||||
|
} catch (e) {
|
||||||
|
throw new Error(`request failed: ${e}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!resp.ok) {
|
||||||
|
if (resp.status === 401) {
|
||||||
|
logout()
|
||||||
|
throw new Error('Unauthorized');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return resp.json() as Promise<User>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type LoginRequest = {
|
||||||
|
username: string;
|
||||||
|
password: string;
|
||||||
|
};
|
||||||
|
export type Token = {
|
||||||
|
access_token: string;
|
||||||
|
token_type: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const login = (req: LoginRequest) => {
|
||||||
|
fetch(`${baseUrl}api/token`, {
|
||||||
|
method: "POST", headers: {
|
||||||
|
'Content-Type': 'application/x-www-form-urlencoded',
|
||||||
|
}, body: new URLSearchParams(req).toString()
|
||||||
|
}).then(resp => resp.json() as Promise<Token>).then(token => token ? localStorage.setItem("access_token", token.access_token) : console.log("token not acquired")).catch((e) => console.log("catch error " + e + " in login"));
|
||||||
|
return Promise<void>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const logout = () => localStorage.removeItem("access_token");
|
||||||
|
Reference in New Issue
Block a user