feat: start making EditMe functional

This commit is contained in:
Sam 2022-07-05 22:21:28 +02:00
parent 6cc4d4c41d
commit e31f96110b
4 changed files with 76 additions and 31 deletions

View File

@ -2,7 +2,7 @@ package main
import ( import (
"context" "context"
"fmt" "io/fs"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
@ -11,6 +11,7 @@ import (
"codeberg.org/u1f320/pronouns.cc/backend/log" "codeberg.org/u1f320/pronouns.cc/backend/log"
"codeberg.org/u1f320/pronouns.cc/backend/server" "codeberg.org/u1f320/pronouns.cc/backend/server"
"codeberg.org/u1f320/pronouns.cc/frontend" "codeberg.org/u1f320/pronouns.cc/frontend"
"emperror.dev/errors"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware" "github.com/go-chi/chi/v5/middleware"
@ -56,40 +57,39 @@ func main() {
func setupFrontend(r chi.Router, s *server.Server) { func setupFrontend(r chi.Router, s *server.Server) {
r.Use(middleware.Recoverer) r.Use(middleware.Recoverer)
r.Get("/@{user}", a) r.Get("/@{user}", nil)
r.Get("/@{user}/{member}", a) r.Get("/@{user}/{member}", nil)
r.Mount("/api", s.Router) r.Mount("/api", s.Router)
r.NotFound(func(w http.ResponseWriter, r *http.Request) { r.NotFound(func(w http.ResponseWriter, r *http.Request) {
var ( data, err := frontend.Data.ReadFile("dist" + r.URL.Path)
data []byte if err != nil {
err error if errors.Is(err, fs.ErrNotExist) {
) data, err = frontend.Data.ReadFile("dist/index.html")
if err != nil && !errors.Is(err, fs.ErrNotExist) {
log.Errorf("serving frontend file: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
http.Error(w, "Not found", http.StatusNotFound)
return
}
log.Errorf("serving frontend file: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
if strings.HasSuffix(r.URL.Path, ".js") { if strings.HasSuffix(r.URL.Path, ".js") {
data, err = frontend.Data.ReadFile("dist" + r.URL.Path)
w.Header().Add("content-type", "application/javascript") w.Header().Add("content-type", "application/javascript")
} else if strings.HasSuffix(r.URL.Path, ".css") { } else if strings.HasSuffix(r.URL.Path, ".css") {
data, err = frontend.Data.ReadFile("dist" + r.URL.Path)
w.Header().Add("content-type", "text/css") w.Header().Add("content-type", "text/css")
} else if strings.HasSuffix(r.URL.Path, ".map") {
data, err = frontend.Data.ReadFile("dist" + r.URL.Path)
} else { } else {
data, err = frontend.Data.ReadFile("dist/index.html")
w.Header().Add("content-type", "text/html") w.Header().Add("content-type", "text/html")
} }
if err != nil {
panic(err)
}
w.Write(data) w.Write(data)
}) })
} }
func a(w http.ResponseWriter, r *http.Request) {
user := chi.URLParam(r, "user")
member := chi.URLParam(r, "member")
fmt.Fprintf(w, "user: %v, member: %v", user, member)
}

View File

@ -1,4 +1,4 @@
import React, { ReactNode, PropsWithChildren } from "react"; import React, { ReactNode } from "react";
export type Props = { export type Props = {
children?: ReactNode | undefined; children?: ReactNode | undefined;

View File

@ -4,7 +4,7 @@ import type { APIError } from "./types";
export default async function fetchAPI<T>( export default async function fetchAPI<T>(
path: string, path: string,
method = "GET", method = "GET",
body = null body: any = null
) { ) {
let headers = {}; let headers = {};
const token = localStorage.getItem("pronouns-token"); const token = localStorage.getItem("pronouns-token");

View File

@ -12,13 +12,13 @@ import {
People, People,
Trash3, Trash3,
} from "react-bootstrap-icons"; } from "react-bootstrap-icons";
import CreatableSelect from "react-select/creatable";
import { userState } from "../lib/store"; import { userState } from "../lib/store";
import { Field } from "../lib/types";
import Loading from "../lib/Loading"; import Loading from "../lib/Loading";
import Card from "../lib/Card"; import Card from "../lib/Card";
import TextInput from "../lib/TextInput"; import TextInput from "../lib/TextInput";
import fetchAPI from "../lib/fetch";
import { MeUser, Field } from "../lib/types";
interface EditField { interface EditField {
id: number; id: number;
@ -46,6 +46,51 @@ function fieldsEqual(arr1: EditField[], arr2: EditField[]) {
); );
} }
async function updateUser(args: {
displayName: string;
bio: string;
fields: EditField[];
}) {
const newFields = args.fields.map((editField) => {
const field: Field = {
name: editField.name,
favourite: [],
okay: [],
jokingly: [],
friends_only: [],
avoid: [],
};
Object.keys(editField).forEach((pronoun) => {
switch (editField.pronouns[pronoun]) {
case PronounChoice.favourite:
field.favourite?.push(pronoun);
break;
case PronounChoice.okay:
field.okay?.push(pronoun);
break;
case PronounChoice.jokingly:
field.jokingly?.push(pronoun);
break;
case PronounChoice.friendsOnly:
field.friends_only?.push(pronoun);
break;
case PronounChoice.avoid:
field.avoid?.push(pronoun);
break;
}
});
return field;
});
return await fetchAPI<MeUser>("/users/@me", "PATCH", {
display_name: args.displayName,
bio: args.bio,
fields: newFields,
});
}
export default function EditMe() { export default function EditMe() {
const navigate = useNavigate(); const navigate = useNavigate();
@ -69,19 +114,19 @@ export default function EditMe() {
pronouns: {}, pronouns: {},
}; };
f.favourite.forEach((val) => { f.favourite?.forEach((val) => {
field.pronouns[val] = PronounChoice.favourite; field.pronouns[val] = PronounChoice.favourite;
}); });
f.okay.forEach((val) => { f.okay?.forEach((val) => {
field.pronouns[val] = PronounChoice.okay; field.pronouns[val] = PronounChoice.okay;
}); });
f.jokingly.forEach((val) => { f.jokingly?.forEach((val) => {
field.pronouns[val] = PronounChoice.jokingly; field.pronouns[val] = PronounChoice.jokingly;
}); });
f.friends_only.forEach((val) => { f.friends_only?.forEach((val) => {
field.pronouns[val] = PronounChoice.friendsOnly; field.pronouns[val] = PronounChoice.friendsOnly;
}); });
f.avoid.forEach((val) => { f.avoid?.forEach((val) => {
field.pronouns[val] = PronounChoice.avoid; field.pronouns[val] = PronounChoice.avoid;
}); });