godzhigella/void.cat
1
0
Fork 0
forked from Kieran/void.cat
Code Pull Requests Activity

Use logo as default avatar

Browse Source
This commit is contained in:
Kieran 2023-12-25 18:56:26 +00:00
parent 9837d917b9
commit 097f97edc1
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
9 changed files with 217 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
VoidCat/spa/src/app/src/App.tsx
View File

@ -34,7 +34,12 @@ const router = createBrowserRouter([
path: "/u/:id", path: "/u/:id",
loader: async ({ params }: LoaderFunctionArgs) => { loader: async ({ params }: LoaderFunctionArgs) => {
const state = store.getState(); const state = store.getState();
const api = new VoidApi(import.meta.env.VITE_API_HOST, state.login.jwt ? () => Promise.resolve(`Bearer ${state.login.jwt}`) : undefined); const api = new VoidApi(
import.meta.env.VITE_API_HOST,
state.login.jwt
? () => Promise.resolve(`Bearer ${state.login.jwt}`)
: undefined,
);
if (params.id) { if (params.id) {
try { try {
return await api.getUser(params.id); return await api.getUser(params.id);

6
VoidCat/spa/src/app/src/Components/Shared/InlineProfile.tsx
View File

@ -3,8 +3,6 @@ import { CSSProperties } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { Profile } from "@void-cat/api"; import { Profile } from "@void-cat/api";
import { DefaultAvatar } from "@/Const";
const DefaultSize = 64; const DefaultSize = 64;
interface InlineProfileProps { interface InlineProfileProps {
@ -24,8 +22,8 @@ export function InlineProfile({ profile, options }: InlineProfileProps) {
...options, ...options,
}; };
let avatarUrl = profile.avatar ?? DefaultAvatar; let avatarUrl = profile.avatar ?? "/logo_256.jpg";
if (!avatarUrl.startsWith("http")) { if (profile.avatar && !avatarUrl.startsWith("http")) {
avatarUrl = `/d/${avatarUrl}`; avatarUrl = `/d/${avatarUrl}`;
} }
let avatarStyles = { let avatarStyles = {

2
VoidCat/spa/src/app/src/Const.ts
View File

@ -1,5 +1,3 @@
export const DefaultAvatar = "https://i.imgur.com/8A5Fu65.jpeg";
/** /**
* @constant {number} - Size of 1 kiB * @constant {number} - Size of 1 kiB
*/ */

5
VoidCat/spa/src/app/src/Hooks/UseApi.tsx
View File

@ -5,5 +5,8 @@ import { RootState } from "@/Store";
export default function useApi() { export default function useApi() {
const auth = useSelector((s: RootState) => s.login.jwt); const auth = useSelector((s: RootState) => s.login.jwt);
return new VoidApi(import.meta.env.VITE_API_HOST, auth ? () => Promise.resolve(`Bearer ${auth}`) : undefined); return new VoidApi(
import.meta.env.VITE_API_HOST,
auth ? () => Promise.resolve(`Bearer ${auth}`) : undefined,
);
} }

4
VoidCat/spa/src/app/src/Pages/FilePreview.tsx
View File

@ -248,7 +248,9 @@ export function FilePreview() {
useEffect(() => { useEffect(() => {
if (info) { if (info) {
const fileLink = info.metadata?.url ?? `${import.meta.env.VITE_API_HOST ?? ""}/d/${info.id}`; const fileLink =
info.metadata?.url ??
`${import.meta.env.VITE_API_HOST ?? ""}/d/${info.id}`;
setFileSize(info.metadata?.size ?? 0); setFileSize(info.metadata?.size ?? 0);
const order = window.localStorage.getItem(`payment-${info.id}`); const order = window.localStorage.getItem(`payment-${info.id}`);

6
VoidCat/spa/src/app/src/Pages/Profile.tsx
View File

@ -7,7 +7,6 @@ import { Profile } from "@void-cat/api";
import useApi from "@/Hooks/UseApi"; import useApi from "@/Hooks/UseApi";
import { RootState } from "@/Store"; import { RootState } from "@/Store";
import { DefaultAvatar } from "@/Const";
import { logout, setProfile as setGlobalProfile } from "@/LoginState"; import { logout, setProfile as setGlobalProfile } from "@/LoginState";
import { FileList } from "@/Components/Shared/FileList"; import { FileList } from "@/Components/Shared/FileList";
@ -173,9 +172,8 @@ export function ProfilePage() {
} }
if (profile) { if (profile) {
let avatarUrl = profile.avatar ?? DefaultAvatar; let avatarUrl = profile.avatar ?? "/logo_256.jpg";
if (!avatarUrl.startsWith("http")) { if (profile.avatar && !avatarUrl.startsWith("http")) {
// assume void-cat hosted avatar
avatarUrl = `/d/${avatarUrl}`; avatarUrl = `/d/${avatarUrl}`;
} }
let avatarStyles = { let avatarStyles = {

5
VoidCat/spa/src/app/vite.config.ts
View File

@ -20,7 +20,7 @@ export default defineConfig({
], ],
assetsInclude: [], assetsInclude: [],
build: { build: {
outDir: "build" outDir: "build",
}, },
base: "/", base: "/",
clearScreen: false, clearScreen: false,
@ -29,6 +29,5 @@ export default defineConfig({
"@": "/src", "@": "/src",
}, },
}, },
define: {} define: {},
}); });