comparing 9b74179b78e3d17c543d2f748b541f3a7f45063c and main on pdsls.dev/pdsls

+3 -1

src/views/settings.tsx

···

       1
       1
        
       import { createSignal } from "solid-js";

     

       2
       2
        
       import { TextInput } from "../components/text-input.jsx";

     

       3
       3
       +
       import { ThemeSelection } from "../components/theme.jsx";

     

       3
       4
        
       

     

       4
       5
        
       export const [hideMedia, setHideMedia] = createSignal(localStorage.hideMedia === "true");

     

       5
       6
        
       

     
···

       9
       10
        
             <div class="flex items-center gap-1 font-semibold">

     

       10
       11
        
               <span>Settings</span>

     

       11
       12
        
             </div>

     

       12
       12
       -
             <div class="flex flex-col gap-2">

     

       13
       13
       +
             <div class="flex flex-col gap-3">

     

       13
       14
        
               <div class="flex flex-col gap-0.5">

     

       14
       15
        
                 <label for="plcDirectory" class="select-none">

     

       15
       16
        
                   PLC Directory

     
···

       24
       25
        
                   }}

     

       25
       26
        
                 />

     

       26
       27
        
               </div>

     

       28
       28
       +
               <ThemeSelection />

     

       27
       29
        
               <div class="flex justify-between">

     

       28
       30
        
                 <div class="flex items-center gap-1">

     

       29
       31
        
                   <input

+7 -1

src/components/video-player.tsx

···

       22
       22
        
         });

     

       23
       23
        
       

     

       24
       24
        
         return (

     

       25
       25
       -
           <video ref={video} class="max-h-80 max-w-[20rem]" controls playsinline onLoadedData={props.onLoad}>

     

       25
       25
       +
           <video

     

       26
       26
       +
             ref={video}

     

       27
       27
       +
             class="max-h-80 max-w-[20rem]"

     

       28
       28
       +
             controls

     

       29
       29
       +
             playsinline

     

       30
       30
       +
             onLoadedData={props.onLoad}

     

       31
       31
       +
           >

     

       26
       32
        
             <source type="video/mp4" />

     

       27
       33
        
           </video>

     

       28
       34
        
         );

+15 -15

src/utils/hooks/debounced.ts

···

       1
       1
       -
       import { type Accessor, createEffect, createSignal, onCleanup } from 'solid-js';

     

       1
       1
       +
       import { type Accessor, createEffect, createSignal, onCleanup } from "solid-js";

     

       2
       2
        
       

     

       3
       3
        
       export const createDebouncedValue = <T>(

     

       4
       4
       -
       	accessor: Accessor<T>,

     

       5
       5
       -
       	delay: number,

     

       6
       6
       -
       	equals?: false | ((prev: T, next: T) => boolean),

     

       4
       4
       +
         accessor: Accessor<T>,

     

       5
       5
       +
         delay: number,

     

       6
       6
       +
         equals?: false | ((prev: T, next: T) => boolean),

     

       7
       7
        
       ): Accessor<T> => {

     

       8
       8
       -
       	const initial = accessor();

     

       9
       9
       -
       	const [state, setState] = createSignal(initial, { equals });

     

       8
       8
       +
         const initial = accessor();

     

       9
       9
       +
         const [state, setState] = createSignal(initial, { equals });

     

       10
       10
        
       

     

       11
       11
       -
       	createEffect((prev: T) => {

     

       12
       12
       -
       		const next = accessor();

     

       11
       11
       +
         createEffect((prev: T) => {

     

       12
       12
       +
           const next = accessor();

     

       13
       13
        
       

     

       14
       14
       -
       		if (prev !== next) {

     

       15
       15
       -
       			const timeout = setTimeout(() => setState(() => next), delay);

     

       16
       16
       -
       			onCleanup(() => clearTimeout(timeout));

     

       17
       17
       -
       		}

     

       14
       14
       +
           if (prev !== next) {

     

       15
       15
       +
             const timeout = setTimeout(() => setState(() => next), delay);

     

       16
       16
       +
             onCleanup(() => clearTimeout(timeout));

     

       17
       17
       +
           }

     

       18
       18
        
       

     

       19
       19
       -
       		return next;

     

       20
       20
       -
       	}, initial);

     

       19
       19
       +
           return next;

     

       20
       20
       +
         }, initial);

     

       21
       21
        
       

     

       22
       22
       -
       	return state;

     

       22
       22
       +
         return state;

     

       23
       23
        
       };

+30

src/utils/key.ts

···

       1
       1
       +
       import { parseDidKey, parsePublicMultikey } from "@atcute/crypto";

     

       2
       2
       +
       import { fromBase58Btc } from "@atcute/multibase";

     

       3
       3
       +
       

     

       4
       4
       +
       export const detectKeyType = (key: string): string => {

     

       5
       5
       +
         try {

     

       6
       6
       +
           return parsePublicMultikey(key).type;

     

       7
       7
       +
         } catch (e) {

     

       8
       8
       +
           try {

     

       9
       9
       +
             const bytes = fromBase58Btc(key.startsWith("z") ? key.slice(1) : key);

     

       10
       10
       +
             if (bytes.length >= 2) {

     

       11
       11
       +
               const type = (bytes[0] << 8) | bytes[1];

     

       12
       12
       +
               if (type === 0xed01) {

     

       13
       13
       +
                 return "ed25519";

     

       14
       14
       +
               }

     

       15
       15
       +
             }

     

       16
       16
       +
           } catch {}

     

       17
       17
       +
           return "unknown";

     

       18
       18
       +
         }

     

       19
       19
       +
       };

     

       20
       20
       +
       

     

       21
       21
       +
       export const detectDidKeyType = (key: string): string => {

     

       22
       22
       +
         try {

     

       23
       23
       +
           return parseDidKey(key).type;

     

       24
       24
       +
         } catch (e) {

     

       25
       25
       +
           if (key.startsWith("did:key:")) {

     

       26
       26
       +
             return detectKeyType(key.slice(8));

     

       27
       27
       +
           }

     

       28
       28
       +
           return "unknown";

     

       29
       29
       +
         }

     

       30
       30
       +
       };

+1 -1

public/oauth-client-metadata.json

···

       4
       4
        
         "client_uri": "https://pdsls.dev",

     

       5
       5
        
         "logo_uri": "https://pdsls.dev/favicon.ico",

     

       6
       6
        
         "redirect_uris": ["https://pdsls.dev/"],

     

       7
       7
       -
         "scope": "atproto transition:generic",

     

       7
       7
       +
         "scope": "atproto repo:*?action=create repo:*?action=update repo:*?action=delete blob:*/*",

     

       8
       8
        
         "grant_types": ["authorization_code", "refresh_token"],

     

       9
       9
        
         "response_types": ["code"],

     

       10
       10
        
         "token_endpoint_auth_method": "none",

+13

src/auth/oauth-config.ts

···

       1
       1
       +
       import { configureOAuth, defaultIdentityResolver } from "@atcute/oauth-browser-client";

     

       2
       2
       +
       import { didDocumentResolver, handleResolver } from "../utils/api";

     

       3
       3
       +
       

     

       4
       4
       +
       configureOAuth({

     

       5
       5
       +
         metadata: {

     

       6
       6
       +
           client_id: import.meta.env.VITE_OAUTH_CLIENT_ID,

     

       7
       7
       +
           redirect_uri: import.meta.env.VITE_OAUTH_REDIRECT_URL,

     

       8
       8
       +
         },

     

       9
       9
       +
         identityResolver: defaultIdentityResolver({

     

       10
       10
       +
           handleResolver: handleResolver,

     

       11
       11
       +
           didDocumentResolver: didDocumentResolver,

     

       12
       12
       +
         }),

     

       13
       13
       +
       });

+77

src/auth/scope-flow.ts

···

       1
       1
       +
       import { isDid, isHandle } from "@atcute/lexicons/syntax";

     

       2
       2
       +
       import { createAuthorizationUrl } from "@atcute/oauth-browser-client";

     

       3
       3
       +
       import { createSignal } from "solid-js";

     

       4
       4
       +
       

     

       5
       5
       +
       interface UseOAuthScopeFlowOptions {

     

       6
       6
       +
         onError?: (error: unknown) => void;

     

       7
       7
       +
         onRedirecting?: () => void;

     

       8
       8
       +
         beforeRedirect?: (account: string) => Promise<void>;

     

       9
       9
       +
       }

     

       10
       10
       +
       

     

       11
       11
       +
       export const useOAuthScopeFlow = (options: UseOAuthScopeFlowOptions = {}) => {

     

       12
       12
       +
         const [showScopeSelector, setShowScopeSelector] = createSignal(false);

     

       13
       13
       +
         const [pendingAccount, setPendingAccount] = createSignal("");

     

       14
       14
       +
         const [shouldForceRedirect, setShouldForceRedirect] = createSignal(false);

     

       15
       15
       +
       

     

       16
       16
       +
         const initiate = (account: string) => {

     

       17
       17
       +
           if (!account) return;

     

       18
       18
       +
           setPendingAccount(account);

     

       19
       19
       +
           setShouldForceRedirect(false);

     

       20
       20
       +
           setShowScopeSelector(true);

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         const initiateWithRedirect = (account: string) => {

     

       24
       24
       +
           if (!account) return;

     

       25
       25
       +
           setPendingAccount(account);

     

       26
       26
       +
           setShouldForceRedirect(true);

     

       27
       27
       +
           setShowScopeSelector(true);

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         const complete = async (scopeString: string, scopeIds: string) => {

     

       31
       31
       +
           try {

     

       32
       32
       +
             const account = pendingAccount();

     

       33
       33
       +
       

     

       34
       34
       +
             if (options.beforeRedirect && !shouldForceRedirect()) {

     

       35
       35
       +
               try {

     

       36
       36
       +
                 await options.beforeRedirect(account);

     

       37
       37
       +
                 setShowScopeSelector(false);

     

       38
       38
       +
                 return;

     

       39
       39
       +
               } catch {}

     

       40
       40
       +
             }

     

       41
       41
       +
       

     

       42
       42
       +
             localStorage.setItem("pendingScopes", scopeIds);

     

       43
       43
       +
       

     

       44
       44
       +
             options.onRedirecting?.();

     

       45
       45
       +
       

     

       46
       46
       +
             const authUrl = await createAuthorizationUrl({

     

       47
       47
       +
               scope: scopeString,

     

       48
       48
       +
               target:

     

       49
       49
       +
                 isHandle(account) || isDid(account) ?

     

       50
       50
       +
                   { type: "account", identifier: account }

     

       51
       51
       +
                 : { type: "pds", serviceUrl: account },

     

       52
       52
       +
             });

     

       53
       53
       +
       

     

       54
       54
       +
             await new Promise((resolve) => setTimeout(resolve, 250));

     

       55
       55
       +
             location.assign(authUrl);

     

       56
       56
       +
           } catch (e) {

     

       57
       57
       +
             console.error(e);

     

       58
       58
       +
             options.onError?.(e);

     

       59
       59
       +
             setShowScopeSelector(false);

     

       60
       60
       +
           }

     

       61
       61
       +
         };

     

       62
       62
       +
       

     

       63
       63
       +
         const cancel = () => {

     

       64
       64
       +
           setShowScopeSelector(false);

     

       65
       65
       +
           setPendingAccount("");

     

       66
       66
       +
           setShouldForceRedirect(false);

     

       67
       67
       +
         };

     

       68
       68
       +
       

     

       69
       69
       +
         return {

     

       70
       70
       +
           showScopeSelector,

     

       71
       71
       +
           pendingAccount,

     

       72
       72
       +
           initiate,

     

       73
       73
       +
           initiateWithRedirect,

     

       74
       74
       +
           complete,

     

       75
       75
       +
           cancel,

     

       76
       76
       +
         };

     

       77
       77
       +
       };

+53

src/auth/scope-utils.ts

···

       1
       1
       +
       import { agent, sessions } from "./state";

     

       2
       2
       +
       

     

       3
       3
       +
       export const GRANULAR_SCOPES = [

     

       4
       4
       +
         {

     

       5
       5
       +
           id: "create",

     

       6
       6
       +
           scope: "repo:*?action=create",

     

       7
       7
       +
           label: "Create records",

     

       8
       8
       +
         },

     

       9
       9
       +
         {

     

       10
       10
       +
           id: "update",

     

       11
       11
       +
           scope: "repo:*?action=update",

     

       12
       12
       +
           label: "Update records",

     

       13
       13
       +
         },

     

       14
       14
       +
         {

     

       15
       15
       +
           id: "delete",

     

       16
       16
       +
           scope: "repo:*?action=delete",

     

       17
       17
       +
           label: "Delete records",

     

       18
       18
       +
         },

     

       19
       19
       +
         {

     

       20
       20
       +
           id: "blob",

     

       21
       21
       +
           scope: "blob:*/*",

     

       22
       22
       +
           label: "Upload blobs",

     

       23
       23
       +
         },

     

       24
       24
       +
       ];

     

       25
       25
       +
       

     

       26
       26
       +
       export const BASE_SCOPES = ["atproto"];

     

       27
       27
       +
       

     

       28
       28
       +
       export const buildScopeString = (selected: Set<string>): string => {

     

       29
       29
       +
         const granular = GRANULAR_SCOPES.filter((s) => selected.has(s.id)).map((s) => s.scope);

     

       30
       30
       +
         return [...BASE_SCOPES, ...granular].join(" ");

     

       31
       31
       +
       };

     

       32
       32
       +
       

     

       33
       33
       +
       export const scopeIdsToString = (scopeIds: Set<string>): string => {

     

       34
       34
       +
         return ["atproto", ...Array.from(scopeIds)].join(",");

     

       35
       35
       +
       };

     

       36
       36
       +
       

     

       37
       37
       +
       export const parseScopeString = (scopeIdsString: string): Set<string> => {

     

       38
       38
       +
         if (!scopeIdsString) return new Set();

     

       39
       39
       +
         const ids = scopeIdsString.split(",").filter(Boolean);

     

       40
       40
       +
         return new Set(ids.filter((id) => id !== "atproto"));

     

       41
       41
       +
       };

     

       42
       42
       +
       

     

       43
       43
       +
       export const hasScope = (grantedScopes: string | undefined, scopeId: string): boolean => {

     

       44
       44
       +
         if (!grantedScopes) return false;

     

       45
       45
       +
         return grantedScopes.split(",").includes(scopeId);

     

       46
       46
       +
       };

     

       47
       47
       +
       

     

       48
       48
       +
       export const hasUserScope = (scopeId: string): boolean => {

     

       49
       49
       +
         if (!agent()) return false;

     

       50
       50
       +
         const grantedScopes = sessions[agent()!.sub]?.grantedScopes;

     

       51
       51
       +
         if (!grantedScopes) return true;

     

       52
       52
       +
         return hasScope(grantedScopes, scopeId);

     

       53
       53
       +
       };

+14

src/auth/state.ts

···

       1
       1
       +
       import { OAuthUserAgent } from "@atcute/oauth-browser-client";

     

       2
       2
       +
       import { createSignal } from "solid-js";

     

       3
       3
       +
       import { createStore } from "solid-js/store";

     

       4
       4
       +
       

     

       5
       5
       +
       export type Account = {

     

       6
       6
       +
         signedIn: boolean;

     

       7
       7
       +
         handle?: string;

     

       8
       8
       +
         grantedScopes?: string;

     

       9
       9
       +
       };

     

       10
       10
       +
       

     

       11
       11
       +
       export type Sessions = Record<string, Account>;

     

       12
       12
       +
       

     

       13
       13
       +
       export const [agent, setAgent] = createSignal<OAuthUserAgent | undefined>();

     

       14
       14
       +
       export const [sessions, setSessions] = createStore<Sessions>();

-170

src/components/account.tsx

···

       1
       1
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       2
       2
       -
       import { Did } from "@atcute/lexicons";

     

       3
       3
       -
       import {

     

       4
       4
       -
         createAuthorizationUrl,

     

       5
       5
       -
         deleteStoredSession,

     

       6
       6
       -
         getSession,

     

       7
       7
       -
         OAuthUserAgent,

     

       8
       8
       -
       } from "@atcute/oauth-browser-client";

     

       9
       9
       -
       import { A } from "@solidjs/router";

     

       10
       10
       -
       import { createSignal, For, onMount, Show } from "solid-js";

     

       11
       11
       -
       import { createStore, produce } from "solid-js/store";

     

       12
       12
       -
       import { resolveDidDoc } from "../utils/api.js";

     

       13
       13
       -
       import { ActionMenu, DropdownMenu, MenuProvider, NavMenu } from "./dropdown.jsx";

     

       14
       14
       -
       import { agent, Login, retrieveSession, Sessions, setAgent } from "./login.jsx";

     

       15
       15
       -
       import { Modal } from "./modal.jsx";

     

       16
       16
       -
       

     

       17
       17
       -
       export const [sessions, setSessions] = createStore<Sessions>();

     

       18
       18
       -
       

     

       19
       19
       -
       const AccountDropdown = (props: { did: Did }) => {

     

       20
       20
       -
         const removeSession = async (did: Did) => {

     

       21
       21
       -
           const currentSession = agent()?.sub;

     

       22
       22
       -
           try {

     

       23
       23
       -
             const session = await getSession(did, { allowStale: true });

     

       24
       24
       -
             const agent = new OAuthUserAgent(session);

     

       25
       25
       -
             await agent.signOut();

     

       26
       26
       -
           } catch {

     

       27
       27
       -
             deleteStoredSession(did);

     

       28
       28
       -
           }

     

       29
       29
       -
           setSessions(

     

       30
       30
       -
             produce((accs) => {

     

       31
       31
       -
               delete accs[did];

     

       32
       32
       -
             }),

     

       33
       33
       -
           );

     

       34
       34
       -
           localStorage.setItem("sessions", JSON.stringify(sessions));

     

       35
       35
       -
           if (currentSession === did) setAgent(undefined);

     

       36
       36
       -
         };

     

       37
       37
       -
       

     

       38
       38
       -
         return (

     

       39
       39
       -
           <MenuProvider>

     

       40
       40
       -
             <DropdownMenu icon="lucide--ellipsis" buttonClass="rounded-md p-2">

     

       41
       41
       -
               <NavMenu href={`/at://${props.did}`} label="Go to repo" icon="lucide--user-round" />

     

       42
       42
       -
               <ActionMenu

     

       43
       43
       -
                 icon="lucide--x"

     

       44
       44
       -
                 label="Remove account"

     

       45
       45
       -
                 onClick={() => removeSession(props.did)}

     

       46
       46
       -
               />

     

       47
       47
       -
             </DropdownMenu>

     

       48
       48
       -
           </MenuProvider>

     

       49
       49
       -
         );

     

       50
       50
       -
       };

     

       51
       51
       -
       

     

       52
       52
       -
       export const AccountManager = () => {

     

       53
       53
       -
         const [openManager, setOpenManager] = createSignal(false);

     

       54
       54
       -
         const [avatars, setAvatars] = createStore<Record<Did, string>>();

     

       55
       55
       -
       

     

       56
       56
       -
         onMount(async () => {

     

       57
       57
       -
           try {

     

       58
       58
       -
             await retrieveSession();

     

       59
       59
       -
           } catch {}

     

       60
       60
       -
       

     

       61
       61
       -
           const localSessions = localStorage.getItem("sessions");

     

       62
       62
       -
           if (localSessions) {

     

       63
       63
       -
             const storedSessions: Sessions = JSON.parse(localSessions);

     

       64
       64
       -
             const sessionDids = Object.keys(storedSessions) as Did[];

     

       65
       65
       -
             sessionDids.forEach(async (did) => {

     

       66
       66
       -
               const doc = await resolveDidDoc(did);

     

       67
       67
       -
               const alias = doc.alsoKnownAs?.find((alias) => alias.startsWith("at://"));

     

       68
       68
       -
               if (alias) {

     

       69
       69
       -
                 setSessions(did, {

     

       70
       70
       -
                   signedIn: storedSessions[did].signedIn,

     

       71
       71
       -
                   handle: alias.replace("at://", ""),

     

       72
       72
       -
                 });

     

       73
       73
       -
               }

     

       74
       74
       -
             });

     

       75
       75
       -
             sessionDids.forEach(async (did) => {

     

       76
       76
       -
               const avatar = await getAvatar(did);

     

       77
       77
       -
               if (avatar) setAvatars(did, avatar);

     

       78
       78
       -
             });

     

       79
       79
       -
           }

     

       80
       80
       -
         });

     

       81
       81
       -
       

     

       82
       82
       -
         const resumeSession = async (did: Did) => {

     

       83
       83
       -
           try {

     

       84
       84
       -
             localStorage.setItem("lastSignedIn", did);

     

       85
       85
       -
             await retrieveSession();

     

       86
       86
       -
           } catch {

     

       87
       87
       -
             const authUrl = await createAuthorizationUrl({

     

       88
       88
       -
               scope: import.meta.env.VITE_OAUTH_SCOPE,

     

       89
       89
       -
               target: { type: "account", identifier: did },

     

       90
       90
       -
             });

     

       91
       91
       -
       

     

       92
       92
       -
             await new Promise((resolve) => setTimeout(resolve, 250));

     

       93
       93
       -
       

     

       94
       94
       -
             location.assign(authUrl);

     

       95
       95
       -
           }

     

       96
       96
       -
         };

     

       97
       97
       -
       

     

       98
       98
       -
         const getAvatar = async (did: Did) => {

     

       99
       99
       -
           const rpc = new Client({

     

       100
       100
       -
             handler: new CredentialManager({ service: "https://public.api.bsky.app" }),

     

       101
       101
       -
           });

     

       102
       102
       -
           const res = await rpc.get("app.bsky.actor.getProfile", { params: { actor: did } });

     

       103
       103
       -
           if (res.ok) {

     

       104
       104
       -
             return res.data.avatar;

     

       105
       105
       -
           }

     

       106
       106
       -
           return undefined;

     

       107
       107
       -
         };

     

       108
       108
       -
       

     

       109
       109
       -
         return (

     

       110
       110
       -
           <>

     

       111
       111
       -
             <Modal open={openManager()} onClose={() => setOpenManager(false)}>

     

       112
       112
       -
               <div class="dark:bg-dark-300 dark:shadow-dark-700 absolute top-18 left-[50%] w-88 -translate-x-1/2 rounded-lg border-[0.5px] border-neutral-300 bg-neutral-50 p-4 shadow-md transition-opacity duration-200 dark:border-neutral-700 starting:opacity-0">

     

       113
       113
       -
                 <div class="mb-2 px-1 font-semibold">

     

       114
       114
       -
                   <span>Manage accounts</span>

     

       115
       115
       -
                 </div>

     

       116
       116
       -
                 <div class="mb-3 max-h-80 overflow-y-auto md:max-h-100">

     

       117
       117
       -
                   <For each={Object.keys(sessions)}>

     

       118
       118
       -
                     {(did) => (

     

       119
       119
       -
                       <div class="flex w-full items-center justify-between">

     

       120
       120
       -
                         <A

     

       121
       121
       -
                           href={`/at://${did}`}

     

       122
       122
       -
                           onClick={() => setOpenManager(false)}

     

       123
       123
       -
                           class="flex items-center rounded-md p-1 hover:bg-neutral-200 active:bg-neutral-300 dark:hover:bg-neutral-700 dark:active:bg-neutral-600"

     

       124
       124
       -
                         >

     

       125
       125
       -
                           <Show

     

       126
       126
       -
                             when={avatars[did as Did]}

     

       127
       127
       -
                             fallback={<span class="iconify lucide--user-round m-0.5 size-5"></span>}

     

       128
       128
       -
                           >

     

       129
       129
       -
                             <img

     

       130
       130
       -
                               src={avatars[did as Did].replace("img/avatar/", "img/avatar_thumbnail/")}

     

       131
       131
       -
                               class="size-6 rounded-full"

     

       132
       132
       -
                             />

     

       133
       133
       -
                           </Show>

     

       134
       134
       -
                         </A>

     

       135
       135
       -
                         <button

     

       136
       136
       -
                           class="flex grow items-center justify-between gap-1 truncate rounded-md p-1 hover:bg-neutral-200 active:bg-neutral-300 dark:hover:bg-neutral-700 dark:active:bg-neutral-600"

     

       137
       137
       -
                           onclick={() => resumeSession(did as Did)}

     

       138
       138
       -
                         >

     

       139
       139
       -
                           <span class="truncate">

     

       140
       140
       -
                             {sessions[did]?.handle ? sessions[did].handle : did}

     

       141
       141
       -
                           </span>

     

       142
       142
       -
                           <Show when={did === agent()?.sub && sessions[did].signedIn}>

     

       143
       143
       -
                             <span class="iconify lucide--check shrink-0 text-green-500 dark:text-green-400"></span>

     

       144
       144
       -
                           </Show>

     

       145
       145
       -
                           <Show when={!sessions[did].signedIn}>

     

       146
       146
       -
                             <span class="iconify lucide--circle-alert shrink-0 text-red-500 dark:text-red-400"></span>

     

       147
       147
       -
                           </Show>

     

       148
       148
       -
                         </button>

     

       149
       149
       -
                         <AccountDropdown did={did as Did} />

     

       150
       150
       -
                       </div>

     

       151
       151
       -
                     )}

     

       152
       152
       -
                   </For>

     

       153
       153
       -
                 </div>

     

       154
       154
       -
                 <Login />

     

       155
       155
       -
               </div>

     

       156
       156
       -
             </Modal>

     

       157
       157
       -
             <button

     

       158
       158
       -
               onclick={() => setOpenManager(true)}

     

       159
       159
       -
               class={`flex items-center rounded-lg ${agent() && avatars[agent()!.sub] ? "p-1.25" : "p-1.5"} hover:bg-neutral-200 active:bg-neutral-300 dark:hover:bg-neutral-700 dark:active:bg-neutral-600`}

     

       160
       160
       -
             >

     

       161
       161
       -
               {agent() && avatars[agent()!.sub] ?

     

       162
       162
       -
                 <img

     

       163
       163
       -
                   src={avatars[agent()!.sub].replace("img/avatar/", "img/avatar_thumbnail/")}

     

       164
       164
       -
                   class="size-5 rounded-full"

     

       165
       165
       -
                 />

     

       166
       166
       -
               : <span class="iconify lucide--circle-user-round text-lg"></span>}

     

       167
       167
       -
             </button>

     

       168
       168
       -
           </>

     

       169
       169
       -
         );

     

       170
       170
       -
       };

-143

src/components/login.tsx

···

       1
       1
       -
       import { Client } from "@atcute/client";

     

       2
       2
       -
       import { Did } from "@atcute/lexicons";

     

       3
       3
       -
       import { isDid, isHandle } from "@atcute/lexicons/syntax";

     

       4
       4
       -
       import {

     

       5
       5
       -
         configureOAuth,

     

       6
       6
       -
         createAuthorizationUrl,

     

       7
       7
       -
         defaultIdentityResolver,

     

       8
       8
       -
         finalizeAuthorization,

     

       9
       9
       -
         getSession,

     

       10
       10
       -
         OAuthUserAgent,

     

       11
       11
       -
         type Session,

     

       12
       12
       -
       } from "@atcute/oauth-browser-client";

     

       13
       13
       -
       import { createSignal, Show } from "solid-js";

     

       14
       14
       -
       import { didDocumentResolver, handleResolver } from "../utils/api";

     

       15
       15
       -
       

     

       16
       16
       -
       configureOAuth({

     

       17
       17
       -
         metadata: {

     

       18
       18
       -
           client_id: import.meta.env.VITE_OAUTH_CLIENT_ID,

     

       19
       19
       -
           redirect_uri: import.meta.env.VITE_OAUTH_REDIRECT_URL,

     

       20
       20
       -
         },

     

       21
       21
       -
         identityResolver: defaultIdentityResolver({

     

       22
       22
       -
           handleResolver: handleResolver,

     

       23
       23
       -
           didDocumentResolver: didDocumentResolver,

     

       24
       24
       -
         }),

     

       25
       25
       -
       });

     

       26
       26
       -
       

     

       27
       27
       -
       export const [agent, setAgent] = createSignal<OAuthUserAgent | undefined>();

     

       28
       28
       -
       

     

       29
       29
       -
       type Account = {

     

       30
       30
       -
         signedIn: boolean;

     

       31
       31
       -
         handle?: string;

     

       32
       32
       -
       };

     

       33
       33
       -
       

     

       34
       34
       -
       export type Sessions = Record<string, Account>;

     

       35
       35
       -
       

     

       36
       36
       -
       const Login = () => {

     

       37
       37
       -
         const [notice, setNotice] = createSignal("");

     

       38
       38
       -
         const [loginInput, setLoginInput] = createSignal("");

     

       39
       39
       -
       

     

       40
       40
       -
         const login = async (handle: string) => {

     

       41
       41
       -
           try {

     

       42
       42
       -
             setNotice("");

     

       43
       43
       -
             if (!handle) return;

     

       44
       44
       -
             setNotice(`Contacting your data server...`);

     

       45
       45
       -
             const authUrl = await createAuthorizationUrl({

     

       46
       46
       -
               scope: import.meta.env.VITE_OAUTH_SCOPE,

     

       47
       47
       -
               target:

     

       48
       48
       -
                 isHandle(handle) || isDid(handle) ?

     

       49
       49
       -
                   { type: "account", identifier: handle }

     

       50
       50
       -
                 : { type: "pds", serviceUrl: handle },

     

       51
       51
       -
             });

     

       52
       52
       -
       

     

       53
       53
       -
             setNotice(`Redirecting...`);

     

       54
       54
       -
             await new Promise((resolve) => setTimeout(resolve, 250));

     

       55
       55
       -
       

     

       56
       56
       -
             location.assign(authUrl);

     

       57
       57
       -
           } catch (e) {

     

       58
       58
       -
             console.error(e);

     

       59
       59
       -
             setNotice(`${e}`);

     

       60
       60
       -
           }

     

       61
       61
       -
         };

     

       62
       62
       -
       

     

       63
       63
       -
         return (

     

       64
       64
       -
           <form class="flex flex-col gap-y-2 px-1" onsubmit={(e) => e.preventDefault()}>

     

       65
       65
       -
             <label for="username" class="hidden">

     

       66
       66
       -
               Add account

     

       67
       67
       -
             </label>

     

       68
       68
       -
             <div class="dark:bg-dark-100 dark:inset-shadow-dark-200 flex grow items-center gap-2 rounded-lg border-[0.5px] border-neutral-300 bg-white px-2 inset-shadow-xs focus-within:outline-[1px] focus-within:outline-neutral-600 dark:border-neutral-600 dark:focus-within:outline-neutral-400">

     

       69
       69
       -
               <label

     

       70
       70
       -
                 for="username"

     

       71
       71
       -
                 class="iconify lucide--user-round-plus shrink-0 text-neutral-500 dark:text-neutral-400"

     

       72
       72
       -
               ></label>

     

       73
       73
       -
               <input

     

       74
       74
       -
                 type="text"

     

       75
       75
       -
                 spellcheck={false}

     

       76
       76
       -
                 placeholder="user.bsky.social"

     

       77
       77
       -
                 id="username"

     

       78
       78
       -
                 name="username"

     

       79
       79
       -
                 autocomplete="username"

     

       80
       80
       -
                 aria-label="Your AT Protocol handle"

     

       81
       81
       -
                 class="grow py-1 select-none placeholder:text-sm focus:outline-none"

     

       82
       82
       -
                 onInput={(e) => setLoginInput(e.currentTarget.value)}

     

       83
       83
       -
               />

     

       84
       84
       -
               <button

     

       85
       85
       -
                 onclick={() => login(loginInput())}

     

       86
       86
       -
                 class="flex items-center rounded-md p-1 hover:bg-neutral-100 active:bg-neutral-200 dark:hover:bg-neutral-600 dark:active:bg-neutral-500"

     

       87
       87
       -
               >

     

       88
       88
       -
                 <span class="iconify lucide--log-in"></span>

     

       89
       89
       -
               </button>

     

       90
       90
       -
             </div>

     

       91
       91
       -
             <Show when={notice()}>

     

       92
       92
       -
               <div class="text-sm">{notice()}</div>

     

       93
       93
       -
             </Show>

     

       94
       94
       -
           </form>

     

       95
       95
       -
         );

     

       96
       96
       -
       };

     

       97
       97
       -
       

     

       98
       98
       -
       const retrieveSession = async () => {

     

       99
       99
       -
         const init = async (): Promise<Session | undefined> => {

     

       100
       100
       -
           const params = new URLSearchParams(location.hash.slice(1));

     

       101
       101
       -
       

     

       102
       102
       -
           if (params.has("state") && (params.has("code") || params.has("error"))) {

     

       103
       103
       -
             history.replaceState(null, "", location.pathname + location.search);

     

       104
       104
       -
       

     

       105
       105
       -
             const auth = await finalizeAuthorization(params);

     

       106
       106
       -
             const did = auth.session.info.sub;

     

       107
       107
       -
       

     

       108
       108
       -
             localStorage.setItem("lastSignedIn", did);

     

       109
       109
       -
       

     

       110
       110
       -
             const sessions = localStorage.getItem("sessions");

     

       111
       111
       -
             const newSessions: Sessions = sessions ? JSON.parse(sessions) : { [did]: {} };

     

       112
       112
       -
             newSessions[did] = { signedIn: true };

     

       113
       113
       -
             localStorage.setItem("sessions", JSON.stringify(newSessions));

     

       114
       114
       -
             return auth.session;

     

       115
       115
       -
           } else {

     

       116
       116
       -
             const lastSignedIn = localStorage.getItem("lastSignedIn");

     

       117
       117
       -
       

     

       118
       118
       -
             if (lastSignedIn) {

     

       119
       119
       -
               const sessions = localStorage.getItem("sessions");

     

       120
       120
       -
               const newSessions: Sessions = sessions ? JSON.parse(sessions) : {};

     

       121
       121
       -
               try {

     

       122
       122
       -
                 const session = await getSession(lastSignedIn as Did);

     

       123
       123
       -
                 const rpc = new Client({ handler: new OAuthUserAgent(session) });

     

       124
       124
       -
                 const res = await rpc.get("com.atproto.server.getSession");

     

       125
       125
       -
                 newSessions[lastSignedIn].signedIn = true;

     

       126
       126
       -
                 localStorage.setItem("sessions", JSON.stringify(newSessions));

     

       127
       127
       -
                 if (!res.ok) throw res.data.error;

     

       128
       128
       -
                 return session;

     

       129
       129
       -
               } catch (err) {

     

       130
       130
       -
                 newSessions[lastSignedIn].signedIn = false;

     

       131
       131
       -
                 localStorage.setItem("sessions", JSON.stringify(newSessions));

     

       132
       132
       -
                 throw err;

     

       133
       133
       -
               }

     

       134
       134
       -
             }

     

       135
       135
       -
           }

     

       136
       136
       -
         };

     

       137
       137
       -
       

     

       138
       138
       -
         const session = await init();

     

       139
       139
       -
       

     

       140
       140
       -
         if (session) setAgent(new OAuthUserAgent(session));

     

       141
       141
       -
       };

     

       142
       142
       -
       

     

       143
       143
       -
       export { Login, retrieveSession };

+2 -2

src/views/collection.tsx

···

       1
       1
        
       import { ComAtprotoRepoApplyWrites, ComAtprotoRepoGetRecord } from "@atcute/atproto";

     

       2
       2
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       2
       2
       +
       import { Client, simpleFetchHandler } from "@atcute/client";

     

       3
       3
        
       import { $type, ActorIdentifier, InferXRPCBodyOutput } from "@atcute/lexicons";

     

       4
       4
        
       import * as TID from "@atcute/tid";

     

       5
       5
        
       import { A, useParams } from "@solidjs/router";

     
···

       89
       89
        
       

     

       90
       90
        
         const fetchRecords = async () => {

     

       91
       91
        
           if (!pds) pds = await resolvePDS(did!);

     

       92
       92
       -
           if (!rpc) rpc = new Client({ handler: new CredentialManager({ service: pds }) });

     

       92
       92
       +
           if (!rpc) rpc = new Client({ handler: simpleFetchHandler({ service: pds }) });

     

       93
       93
        
           const res = await rpc.get("com.atproto.repo.listRecords", {

     

       94
       94
        
             params: {

     

       95
       95
        
               repo: did as ActorIdentifier,

public/favicon.ico

This is a binary file and will not be displayed.

public/fonts/Figtree[wght].woff2

This is a binary file and will not be displayed.

+7 -1

src/styles/index.css

···

       6
       6
        
       

     

       7
       7
        
       @custom-variant dark (&:where(.dark, .dark *));

     

       8
       8
        
       

     

       9
       9
       +
       @font-face {

     

       10
       10
       +
         font-family: "Figtree";

     

       11
       11
       +
         src: url("/fonts/Figtree[wght].woff2") format("woff2");

     

       12
       12
       +
         font-display: swap;

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       9
       15
        
       @theme {

     

       10
       10
       -
         --font-sans: "Inter", sans-serif;

     

       16
       16
       +
         --font-sans: "Figtree", sans-serif;

     

       11
       17
        
         --font-mono: "Roboto Mono", monospace;

     

       12
       18
        
         --font-pecita: "Pecita", serif;

     

       13
       19

+5 -1

src/auth/account.tsx

···

       41
       41
        
         return (

     

       42
       42
        
           <MenuProvider>

     

       43
       43
        
             <DropdownMenu icon="lucide--ellipsis" buttonClass="rounded-md p-2">

     

       44
       44
       -
               <NavMenu href={`/at://${props.did}`} label="Go to repo" icon="lucide--user-round" />

     

       44
       44
       +
               <NavMenu

     

       45
       45
       +
                 href={`/at://${props.did}`}

     

       46
       46
       +
                 label={agent()?.sub === props.did ? "Go to repo (g)" : "Go to repo"}

     

       47
       47
       +
                 icon="lucide--user-round"

     

       48
       48
       +
               />

     

       45
       49
        
               <ActionMenu

     

       46
       50
        
                 icon="lucide--settings"

     

       47
       51
        
                 label="Edit permissions"

+109

src/components/create/file-upload.tsx

···

       1
       1
       +
       import { Client } from "@atcute/client";

     

       2
       2
       +
       import { remove } from "@mary/exif-rm";

     

       3
       3
       +
       import { createSignal, onCleanup, Show } from "solid-js";

     

       4
       4
       +
       import { agent } from "../../auth/state";

     

       5
       5
       +
       import { Button } from "../button.jsx";

     

       6
       6
       +
       import { TextInput } from "../text-input.jsx";

     

       7
       7
       +
       import { editorInstance } from "./state";

     

       8
       8
       +
       

     

       9
       9
       +
       export const FileUpload = (props: {

     

       10
       10
       +
         file: File;

     

       11
       11
       +
         blobInput: HTMLInputElement;

     

       12
       12
       +
         onClose: () => void;

     

       13
       13
       +
       }) => {

     

       14
       14
       +
         const [uploading, setUploading] = createSignal(false);

     

       15
       15
       +
         const [error, setError] = createSignal("");

     

       16
       16
       +
       

     

       17
       17
       +
         onCleanup(() => (props.blobInput.value = ""));

     

       18
       18
       +
       

     

       19
       19
       +
         const formatFileSize = (bytes: number) => {

     

       20
       20
       +
           if (bytes === 0) return "0 Bytes";

     

       21
       21
       +
           const k = 1024;

     

       22
       22
       +
           const sizes = ["Bytes", "KB", "MB", "GB"];

     

       23
       23
       +
           const i = Math.floor(Math.log(bytes) / Math.log(k));

     

       24
       24
       +
           return Math.round((bytes / Math.pow(k, i)) * 100) / 100 + " " + sizes[i];

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         const uploadBlob = async () => {

     

       28
       28
       +
           let blob: Blob;

     

       29
       29
       +
       

     

       30
       30
       +
           const mimetype = (document.getElementById("mimetype") as HTMLInputElement)?.value;

     

       31
       31
       +
           (document.getElementById("mimetype") as HTMLInputElement).value = "";

     

       32
       32
       +
           if (mimetype) blob = new Blob([props.file], { type: mimetype });

     

       33
       33
       +
           else blob = props.file;

     

       34
       34
       +
       

     

       35
       35
       +
           if ((document.getElementById("exif-rm") as HTMLInputElement).checked) {

     

       36
       36
       +
             const exifRemoved = remove(new Uint8Array(await blob.arrayBuffer()));

     

       37
       37
       +
             if (exifRemoved !== null) blob = new Blob([exifRemoved], { type: blob.type });

     

       38
       38
       +
           }

     

       39
       39
       +
       

     

       40
       40
       +
           const rpc = new Client({ handler: agent()! });

     

       41
       41
       +
           setUploading(true);

     

       42
       42
       +
           const res = await rpc.post("com.atproto.repo.uploadBlob", {

     

       43
       43
       +
             input: blob,

     

       44
       44
       +
           });

     

       45
       45
       +
           setUploading(false);

     

       46
       46
       +
           if (!res.ok) {

     

       47
       47
       +
             setError(res.data.error);

     

       48
       48
       +
             return;

     

       49
       49
       +
           }

     

       50
       50
       +
           editorInstance.view.dispatch({

     

       51
       51
       +
             changes: {

     

       52
       52
       +
               from: editorInstance.view.state.selection.main.head,

     

       53
       53
       +
               insert: JSON.stringify(res.data.blob, null, 2),

     

       54
       54
       +
             },

     

       55
       55
       +
           });

     

       56
       56
       +
           props.onClose();

     

       57
       57
       +
         };

     

       58
       58
       +
       

     

       59
       59
       +
         return (

     

       60
       60
       +
           <div class="dark:bg-dark-300 dark:shadow-dark-700 absolute top-70 left-[50%] w-[20rem] -translate-x-1/2 rounded-lg border-[0.5px] border-neutral-300 bg-neutral-50 p-4 shadow-md transition-opacity duration-200 dark:border-neutral-700 starting:opacity-0">

     

       61
       61
       +
             <h2 class="mb-2 font-semibold">Upload blob</h2>

     

       62
       62
       +
             <div class="flex flex-col gap-2 text-sm">

     

       63
       63
       +
               <div class="flex flex-col gap-1">

     

       64
       64
       +
                 <p class="flex gap-1">

     

       65
       65
       +
                   <span class="truncate">{props.file.name}</span>

     

       66
       66
       +
                   <span class="shrink-0 text-neutral-600 dark:text-neutral-400">

     

       67
       67
       +
                     ({formatFileSize(props.file.size)})

     

       68
       68
       +
                   </span>

     

       69
       69
       +
                 </p>

     

       70
       70
       +
               </div>

     

       71
       71
       +
               <div class="flex items-center gap-x-2">

     

       72
       72
       +
                 <label for="mimetype" class="shrink-0 select-none">

     

       73
       73
       +
                   MIME type

     

       74
       74
       +
                 </label>

     

       75
       75
       +
                 <TextInput id="mimetype" placeholder={props.file.type} />

     

       76
       76
       +
               </div>

     

       77
       77
       +
               <div class="flex items-center gap-1">

     

       78
       78
       +
                 <input id="exif-rm" type="checkbox" checked />

     

       79
       79
       +
                 <label for="exif-rm" class="select-none">

     

       80
       80
       +
                   Remove EXIF data

     

       81
       81
       +
                 </label>

     

       82
       82
       +
               </div>

     

       83
       83
       +
               <p class="text-xs text-neutral-600 dark:text-neutral-400">

     

       84
       84
       +
                 Metadata will be pasted after the cursor

     

       85
       85
       +
               </p>

     

       86
       86
       +
               <Show when={error()}>

     

       87
       87
       +
                 <span class="text-red-500 dark:text-red-400">Error: {error()}</span>

     

       88
       88
       +
               </Show>

     

       89
       89
       +
               <div class="flex justify-between gap-2">

     

       90
       90
       +
                 <Button onClick={props.onClose}>Cancel</Button>

     

       91
       91
       +
                 <Show when={uploading()}>

     

       92
       92
       +
                   <div class="flex items-center gap-1">

     

       93
       93
       +
                     <span class="iconify lucide--loader-circle animate-spin"></span>

     

       94
       94
       +
                     <span>Uploading</span>

     

       95
       95
       +
                   </div>

     

       96
       96
       +
                 </Show>

     

       97
       97
       +
                 <Show when={!uploading()}>

     

       98
       98
       +
                   <Button

     

       99
       99
       +
                     onClick={uploadBlob}

     

       100
       100
       +
                     class="dark:shadow-dark-700 flex items-center gap-1 rounded-lg bg-blue-500 px-2 py-1.5 text-xs text-white shadow-xs select-none hover:bg-blue-600 active:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-500 dark:active:bg-blue-400"

     

       101
       101
       +
                   >

     

       102
       102
       +
                     Upload

     

       103
       103
       +
                   </Button>

     

       104
       104
       +
                 </Show>

     

       105
       105
       +
               </div>

     

       106
       106
       +
             </div>

     

       107
       107
       +
           </div>

     

       108
       108
       +
         );

     

       109
       109
       +
       };

+87

src/components/create/handle-input.tsx

···

       1
       1
       +
       import { Handle } from "@atcute/lexicons";

     

       2
       2
       +
       import { createSignal, Show } from "solid-js";

     

       3
       3
       +
       import { resolveHandle } from "../../utils/api";

     

       4
       4
       +
       import { Button } from "../button.jsx";

     

       5
       5
       +
       import { TextInput } from "../text-input.jsx";

     

       6
       6
       +
       import { editorInstance } from "./state";

     

       7
       7
       +
       

     

       8
       8
       +
       export const HandleInput = (props: { onClose: () => void }) => {

     

       9
       9
       +
         const [resolving, setResolving] = createSignal(false);

     

       10
       10
       +
         const [error, setError] = createSignal("");

     

       11
       11
       +
         let handleFormRef!: HTMLFormElement;

     

       12
       12
       +
       

     

       13
       13
       +
         const resolveDid = async (e: SubmitEvent) => {

     

       14
       14
       +
           e.preventDefault();

     

       15
       15
       +
           const formData = new FormData(handleFormRef);

     

       16
       16
       +
           const handleValue = formData.get("handle")?.toString().trim();

     

       17
       17
       +
       

     

       18
       18
       +
           if (!handleValue) {

     

       19
       19
       +
             setError("Please enter a handle");

     

       20
       20
       +
             return;

     

       21
       21
       +
           }

     

       22
       22
       +
       

     

       23
       23
       +
           setResolving(true);

     

       24
       24
       +
           setError("");

     

       25
       25
       +
           try {

     

       26
       26
       +
             const did = await resolveHandle(handleValue as Handle);

     

       27
       27
       +
             editorInstance.view.dispatch({

     

       28
       28
       +
               changes: {

     

       29
       29
       +
                 from: editorInstance.view.state.selection.main.head,

     

       30
       30
       +
                 insert: `"${did}"`,

     

       31
       31
       +
               },

     

       32
       32
       +
             });

     

       33
       33
       +
             props.onClose();

     

       34
       34
       +
             handleFormRef.reset();

     

       35
       35
       +
           } catch (err: any) {

     

       36
       36
       +
             setError(err.message || "Failed to resolve handle");

     

       37
       37
       +
           } finally {

     

       38
       38
       +
             setResolving(false);

     

       39
       39
       +
           }

     

       40
       40
       +
         };

     

       41
       41
       +
       

     

       42
       42
       +
         return (

     

       43
       43
       +
           <div class="dark:bg-dark-300 dark:shadow-dark-700 absolute top-70 left-[50%] w-[20rem] -translate-x-1/2 rounded-lg border-[0.5px] border-neutral-300 bg-neutral-50 p-4 shadow-md transition-opacity duration-200 dark:border-neutral-700 starting:opacity-0">

     

       44
       44
       +
             <h2 class="mb-2 font-semibold">Insert DID from handle</h2>

     

       45
       45
       +
             <form ref={handleFormRef} onSubmit={resolveDid} class="flex flex-col gap-2 text-sm">

     

       46
       46
       +
               <div class="flex flex-col gap-1">

     

       47
       47
       +
                 <label for="handle-input" class="select-none">

     

       48
       48
       +
                   Handle

     

       49
       49
       +
                 </label>

     

       50
       50
       +
                 <TextInput id="handle-input" name="handle" placeholder="user.bsky.social" />

     

       51
       51
       +
               </div>

     

       52
       52
       +
               <p class="text-xs text-neutral-600 dark:text-neutral-400">

     

       53
       53
       +
                 DID will be pasted after the cursor

     

       54
       54
       +
               </p>

     

       55
       55
       +
               <Show when={error()}>

     

       56
       56
       +
                 <span class="text-red-500 dark:text-red-400">Error: {error()}</span>

     

       57
       57
       +
               </Show>

     

       58
       58
       +
               <div class="flex justify-between gap-2">

     

       59
       59
       +
                 <Button

     

       60
       60
       +
                   type="button"

     

       61
       61
       +
                   onClick={() => {

     

       62
       62
       +
                     props.onClose();

     

       63
       63
       +
                     handleFormRef.reset();

     

       64
       64
       +
                     setError("");

     

       65
       65
       +
                   }}

     

       66
       66
       +
                 >

     

       67
       67
       +
                   Cancel

     

       68
       68
       +
                 </Button>

     

       69
       69
       +
                 <Show when={resolving()}>

     

       70
       70
       +
                   <div class="flex items-center gap-1">

     

       71
       71
       +
                     <span class="iconify lucide--loader-circle animate-spin"></span>

     

       72
       72
       +
                     <span>Resolving</span>

     

       73
       73
       +
                   </div>

     

       74
       74
       +
                 </Show>

     

       75
       75
       +
                 <Show when={!resolving()}>

     

       76
       76
       +
                   <Button

     

       77
       77
       +
                     type="submit"

     

       78
       78
       +
                     class="dark:shadow-dark-700 flex items-center gap-1 rounded-lg bg-blue-500 px-2 py-1.5 text-xs text-white shadow-xs select-none hover:bg-blue-600 active:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-500 dark:active:bg-blue-400"

     

       79
       79
       +
                   >

     

       80
       80
       +
                     Insert

     

       81
       81
       +
                   </Button>

     

       82
       82
       +
                 </Show>

     

       83
       83
       +
               </div>

     

       84
       84
       +
             </form>

     

       85
       85
       +
           </div>

     

       86
       86
       +
         );

     

       87
       87
       +
       };

+12

src/components/create/menu-item.tsx

···

       1
       1
       +
       export const MenuItem = (props: { icon: string; label: string; onClick: () => void }) => {

     

       2
       2
       +
         return (

     

       3
       3
       +
           <button

     

       4
       4
       +
             type="button"

     

       5
       5
       +
             class="flex items-center gap-2 rounded-md p-2 text-left text-xs hover:bg-neutral-100 active:bg-neutral-200 dark:hover:bg-neutral-700 dark:active:bg-neutral-600"

     

       6
       6
       +
             onClick={props.onClick}

     

       7
       7
       +
           >

     

       8
       8
       +
             <span class={`iconify ${props.icon}`}></span>

     

       9
       9
       +
             <span>{props.label}</span>

     

       10
       10
       +
           </button>

     

       11
       11
       +
         );

     

       12
       12
       +
       };

src/components/create/state.ts

···

       1
       1
       +
       import { createSignal } from "solid-js";

     

       2
       2
       +
       

     

       3
       3
       +
       export const editorInstance = { view: null as any };

     

       4
       4
       +
       export const [placeholder, setPlaceholder] = createSignal<any>();

+1 -1

src/views/record.tsx

···

       12
       12
        
       import { agent } from "../auth/state";

     

       13
       13
        
       import { Backlinks } from "../components/backlinks.jsx";

     

       14
       14
        
       import { Button } from "../components/button.jsx";

     

       15
       15
       -
       import { RecordEditor, setPlaceholder } from "../components/create.jsx";

     

       15
       15
       +
       import { RecordEditor, setPlaceholder } from "../components/create";

     

       16
       16
        
       import {

     

       17
       17
        
         CopyMenu,

     

       18
       18
        
         DropdownMenu,

+1 -1

src/components/lexicon-schema.tsx

···

       428
       428
        
                 {props.name === "main" ? "Main Definition" : props.name}

     

       429
       429
        
               </a>

     

       430
       430
        
               <span class={`rounded px-2 py-0.5 text-xs font-semibold uppercase ${defTypeColor()}`}>

     

       431
       431
       -
                 {props.def.type}

     

       431
       431
       +
                 {props.def.type.replace("-", " ")}

     

       432
       432
        
               </span>

     

       433
       433
        
             </div>

     

       434
       434

src/components/editor.tsx

···

       48
       48
        
               keymap.of([indentWithTab]),

     

       49
       49
        
               linter(jsonParseLinter()),

     

       50
       50
        
               themeColor.of(document.documentElement.classList.contains("dark") ? basicDark : basicLight),

     

       51
       51
       +
               EditorView.lineWrapping,

     

       51
       52
        
             ],

     

       52
       53
        
           });

     

       53
       54
        
           editorInstance.view = view;

+29 -48

src/components/create/index.tsx

···

       20
       20
        
       import { addNotification, removeNotification } from "../notification.jsx";

     

       21
       21
        
       import { TextInput } from "../text-input.jsx";

     

       22
       22
        
       import Tooltip from "../tooltip.jsx";

     

       23
       23
       +
       import { ConfirmSubmit } from "./confirm-submit";

     

       23
       24
        
       import { FileUpload } from "./file-upload";

     

       24
       25
        
       import { HandleInput } from "./handle-input";

     

       25
       26
        
       import { MenuItem } from "./menu-item";

     
···

       37
       38
        
         const [openUpload, setOpenUpload] = createSignal(false);

     

       38
       39
        
         const [openInsertMenu, setOpenInsertMenu] = createSignal(false);

     

       39
       40
        
         const [openHandleDialog, setOpenHandleDialog] = createSignal(false);

     

       40
       40
       -
         const [validate, setValidate] = createSignal<boolean | undefined>(undefined);

     

       41
       41
       +
         const [openConfirmDialog, setOpenConfirmDialog] = createSignal(false);

     

       41
       42
        
         const [isMaximized, setIsMaximized] = createSignal(false);

     

       42
       43
        
         const [isMinimized, setIsMinimized] = createSignal(false);

     

       43
       44
        
         const [collectionError, setCollectionError] = createSignal("");

     
···

       96
       97
        
           };

     

       97
       98
        
         };

     

       98
       99
        
       

     

       99
       99
       -
         const getValidateIcon = () => {

     

       100
       100
       -
           return (

     

       101
       101
       -
             validate() === true ? "lucide--circle-check"

     

       102
       102
       -
             : validate() === false ? "lucide--circle-x"

     

       103
       103
       -
             : "lucide--circle"

     

       104
       104
       -
           );

     

       105
       105
       -
         };

     

       106
       106
       -
       

     

       107
       107
       -
         const getValidateLabel = () => {

     

       108
       108
       -
           return (

     

       109
       109
       -
             validate() === true ? "True"

     

       110
       110
       -
             : validate() === false ? "False"

     

       111
       111
       -
             : "Unset"

     

       112
       112
       -
           );

     

       113
       113
       -
         };

     

       114
       114
       -
       

     

       115
       100
        
         createEffect(() => {

     

       116
       101
        
           if (openDialog()) {

     

       117
       117
       -
             setValidate(undefined);

     

       118
       102
        
             setCollectionError("");

     

       119
       103
        
             setRkeyError("");

     

       120
       104
        
           }

     

       121
       105
        
         });

     

       122
       106
        
       

     

       123
       123
       -
         const createRecord = async (formData: FormData) => {

     

       107
       107
       +
         const createRecord = async (validate: boolean | undefined) => {

     

       108
       108
       +
           const formData = new FormData(formRef);

     

       124
       109
        
           const repo = formData.get("repo")?.toString();

     

       125
       110
        
           if (!repo) return;

     

       126
       111
        
           const rpc = new Client({ handler: new OAuthUserAgent(await getSession(repo as Did)) });

     
···

       139
       124
        
               collection: collection ? collection.toString() : record.$type,

     

       140
       125
        
               rkey: rkey?.toString().length ? rkey?.toString() : undefined,

     

       141
       126
        
               record: record,

     

       142
       142
       -
               validate: validate(),

     

       127
       127
       +
               validate: validate,

     

       143
       128
        
             },

     

       144
       129
        
           });

     

       145
       130
        
           if (!res.ok) {

     

       146
       131
        
             setNotice(`${res.data.error}: ${res.data.message}`);

     

       147
       132
        
             return;

     

       148
       133
        
           }

     

       134
       134
       +
           setOpenConfirmDialog(false);

     

       149
       135
        
           setOpenDialog(false);

     

       150
       136
        
           const id = addNotification({

     

       151
       137
        
             message: "Record created",

     
···

       155
       141
        
           navigate(`/${res.data.uri}`);

     

       156
       142
        
         };

     

       157
       143
        
       

     

       158
       158
       -
         const editRecord = async (recreate?: boolean) => {

     

       144
       144
       +
         const editRecord = async (validate: boolean | undefined, recreate: boolean) => {

     

       159
       145
        
           const record = editorInstance.view.state.doc.toString();

     

       160
       146
        
           if (!record) return;

     

       161
       147
        
           const rpc = new Client({ handler: agent()! });

     
···

       165
       151
        
               const res = await rpc.post("com.atproto.repo.applyWrites", {

     

       166
       152
        
                 input: {

     

       167
       153
        
                   repo: agent()!.sub,

     

       168
       168
       -
                   validate: validate(),

     

       154
       154
       +
                   validate: validate,

     

       169
       155
        
                   writes: [

     

       170
       156
        
                     {

     

       171
       157
        
                       collection: params.collection as `${string}.${string}.${string}`,

     
···

       189
       175
        
               const res = await rpc.post("com.atproto.repo.applyWrites", {

     

       190
       176
        
                 input: {

     

       191
       177
        
                   repo: agent()!.sub,

     

       192
       192
       -
                   validate: validate(),

     

       178
       178
       +
                   validate: validate,

     

       193
       179
        
                   writes: [

     

       194
       180
        
                     {

     

       195
       181
        
                       collection: params.collection as `${string}.${string}.${string}`,

     
···

       205
       191
        
                 return;

     

       206
       192
        
               }

     

       207
       193
        
             }

     

       194
       194
       +
             setOpenConfirmDialog(false);

     

       208
       195
        
             setOpenDialog(false);

     

       209
       196
        
             const id = addNotification({

     

       210
       197
        
               message: "Record edited",

     
···

       418
       405
        
                       >

     

       419
       406
        
                         <HandleInput onClose={() => setOpenHandleDialog(false)} />

     

       420
       407
        
                       </Modal>

     

       408
       408
       +
                       <Modal

     

       409
       409
       +
                         open={openConfirmDialog()}

     

       410
       410
       +
                         onClose={() => setOpenConfirmDialog(false)}

     

       411
       411
       +
                         closeOnClick={false}

     

       412
       412
       +
                       >

     

       413
       413
       +
                         <ConfirmSubmit

     

       414
       414
       +
                           isCreate={props.create}

     

       415
       415
       +
                           onConfirm={(validate, recreate) => {

     

       416
       416
       +
                             if (props.create) {

     

       417
       417
       +
                               createRecord(validate);

     

       418
       418
       +
                             } else {

     

       419
       419
       +
                               editRecord(validate, recreate);

     

       420
       420
       +
                             }

     

       421
       421
       +
                           }}

     

       422
       422
       +
                           onClose={() => setOpenConfirmDialog(false)}

     

       423
       423
       +
                         />

     

       424
       424
       +
                       </Modal>

     

       421
       425
        
                       <div class="flex items-center justify-end gap-2">

     

       422
       422
       -
                         <button

     

       423
       423
       -
                           type="button"

     

       424
       424
       -
                           class="flex items-center gap-1 rounded-sm p-1.5 text-xs hover:bg-neutral-200 active:bg-neutral-300 dark:hover:bg-neutral-700 dark:active:bg-neutral-600"

     

       425
       425
       -
                           onClick={() =>

     

       426
       426
       -
                             setValidate(

     

       427
       427
       -
                               validate() === true ? false

     

       428
       428
       -
                               : validate() === false ? undefined

     

       429
       429
       -
                               : true,

     

       430
       430
       -
                             )

     

       431
       431
       -
                           }

     

       432
       432
       -
                         >

     

       433
       433
       -
                           <Tooltip text={getValidateLabel()}>

     

       434
       434
       -
                             <span class={`iconify ${getValidateIcon()}`}></span>

     

       435
       435
       -
                           </Tooltip>

     

       436
       436
       -
                           <span>Validate</span>

     

       437
       437
       -
                         </button>

     

       438
       438
       -
                         <Show when={!props.create && hasUserScope("create") && hasUserScope("delete")}>

     

       439
       439
       -
                           <Button onClick={() => editRecord(true)}>Recreate</Button>

     

       440
       440
       -
                         </Show>

     

       441
       441
       -
                         <Button

     

       442
       442
       -
                           onClick={() =>

     

       443
       443
       -
                             props.create ? createRecord(new FormData(formRef)) : editRecord()

     

       444
       444
       -
                           }

     

       445
       445
       -
                         >

     

       446
       446
       -
                           {props.create ? "Create" : "Edit"}

     

       426
       426
       +
                         <Button onClick={() => setOpenConfirmDialog(true)}>

     

       427
       427
       +
                           {props.create ? "Create..." : "Edit..."}

     

       447
       428
        
                         </Button>

     

       448
       429
        
                       </div>

     

       449
       430
        
                     </div>

+2 -2

src/components/create/confirm-submit.tsx

···

       27
       27
        
       

     

       28
       28
        
         return (

     

       29
       29
        
           <div class="dark:bg-dark-300 dark:shadow-dark-700 absolute top-70 left-[50%] w-[24rem] -translate-x-1/2 rounded-lg border-[0.5px] border-neutral-300 bg-neutral-50 p-4 shadow-md transition-opacity duration-200 dark:border-neutral-700 starting:opacity-0">

     

       30
       30
       -
             <h2 class="mb-3 font-semibold">{props.isCreate ? "Create" : "Edit"} record</h2>

     

       31
       30
        
             <div class="flex flex-col gap-3 text-sm">

     

       31
       31
       +
               <h2 class="font-semibold">{props.isCreate ? "Create" : "Edit"} record</h2>

     

       32
       32
        
               <div class="flex flex-col gap-1.5">

     

       33
       33
        
                 <div class="flex items-center gap-2">

     

       34
       34
        
                   <button

     
···

       75
       75
        
                   </p>

     

       76
       76
        
                 </div>

     

       77
       77
        
               </Show>

     

       78
       78
       -
               <div class="mt-1 flex justify-between gap-2">

     

       78
       78
       +
               <div class="flex justify-between gap-2">

     

       79
       79
        
                 <Button onClick={props.onClose}>Cancel</Button>

     

       80
       80
        
                 <Button

     

       81
       81
        
                   onClick={() => props.onConfirm(validate(), recreate())}

+1 -1

src/views/logs.tsx

···

       272
       272
        
             </div>

     

       273
       273
        
             <div class="flex items-center gap-1.5 text-sm font-medium">

     

       274
       274
        
               <Show when={validLog() === true}>

     

       275
       275
       -
                 <span class="iconify lucide--check-circle-2 text-green-500 dark:text-green-400"></span>

     

       275
       275
       +
                 <span class="iconify lucide--check-circle-2 text-green-600 dark:text-green-400"></span>

     

       276
       276
        
                 <span>Valid log</span>

     

       277
       277
        
               </Show>

     

       278
       278
        
               <Show when={validLog() === false}>

Compare changes