comparing 60dffc1d5e528c44275d2be75b7d7f2b8f22ef1f and main on hexmani.ac/bluroma

+29

src/base.tsx

···

       1
       1
       +
       import { RouteSectionProps } from "@solidjs/router";

     

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

     

       3
       3
       +
       import { retrieveSession, loginState } from "./components/login";

     

       4
       4
       +
       import Navbar from "./components/navbar";

     

       5
       5
       +
       

     

       6
       6
       +
       const Base = (props: RouteSectionProps<unknown>) => {

     

       7
       7
       +
         const [isLoading, setIsLoading] = createSignal(true);

     

       8
       8
       +
       

     

       9
       9
       +
         onMount(async () => {

     

       10
       10
       +
           await retrieveSession();

     

       11
       11
       +
           if (loginState() && location.pathname === "/") {

     

       12
       12
       +
             window.location.href = "/dash";

     

       13
       13
       +
           }

     

       14
       14
       +
           setIsLoading(false);

     

       15
       15
       +
         });

     

       16
       16
       +
       

     

       17
       17
       +
         return (

     

       18
       18
       +
           <Show when={!isLoading()} fallback={<></>}>

     

       19
       19
       +
             <>

     

       20
       20
       +
               <header>

     

       21
       21
       +
                 <Navbar />

     

       22
       22
       +
               </header>

     

       23
       23
       +
               <main>{props.children}</main>

     

       24
       24
       +
             </>

     

       25
       25
       +
           </Show>

     

       26
       26
       +
         );

     

       27
       27
       +
       };

     

       28
       28
       +
       

     

       29
       29
       +
       export default Base;

+153

src/components/login.tsx

···

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

     

       2
       2
       +
       import {

     

       3
       3
       +
         configureOAuth,

     

       4
       4
       +
         createAuthorizationUrl,

     

       5
       5
       +
         deleteStoredSession,

     

       6
       6
       +
         finalizeAuthorization,

     

       7
       7
       +
         getSession,

     

       8
       8
       +
         OAuthUserAgent,

     

       9
       9
       +
         resolveFromIdentity,

     

       10
       10
       +
         resolveFromService,

     

       11
       11
       +
         Session,

     

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

     

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

     

       14
       14
       +
       import Container from "./container";

     

       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
       +
       });

     

       22
       22
       +
       

     

       23
       23
       +
       export const [loginState, setLoginState] = createSignal(false);

     

       24
       24
       +
       let agent: OAuthUserAgent;

     

       25
       25
       +
       

     

       26
       26
       +
       const Login: Component = () => {

     

       27
       27
       +
         const [notice, setNotice] = createSignal("");

     

       28
       28
       +
         const [loginInput, setLoginInput] = createSignal("");

     

       29
       29
       +
       

     

       30
       30
       +
         const login = async (handle: string) => {

     

       31
       31
       +
           try {

     

       32
       32
       +
             if (!handle) return;

     

       33
       33
       +
             let resolved;

     

       34
       34
       +
             document.querySelector(".submitInfo")!.removeAttribute("hidden");

     

       35
       35
       +
             document

     

       36
       36
       +
               .querySelector('button[type="submit"]')!

     

       37
       37
       +
               .setAttribute("disabled", "");

     

       38
       38
       +
             if (!isHandle(handle)) {

     

       39
       39
       +
               setNotice(`Resolving your service...`);

     

       40
       40
       +
               resolved = await resolveFromService(handle);

     

       41
       41
       +
             } else {

     

       42
       42
       +
               setNotice(`Resolving your identity...`);

     

       43
       43
       +
               resolved = await resolveFromIdentity(handle);

     

       44
       44
       +
             }

     

       45
       45
       +
       

     

       46
       46
       +
             setNotice(`Contacting your data server...`);

     

       47
       47
       +
             const authUrl = await createAuthorizationUrl({

     

       48
       48
       +
               scope: import.meta.env.VITE_OAUTH_SCOPE,

     

       49
       49
       +
               ...resolved,

     

       50
       50
       +
             });

     

       51
       51
       +
       

     

       52
       52
       +
             setNotice(`Redirecting...`);

     

       53
       53
       +
             await new Promise((resolve) => setTimeout(resolve, 500));

     

       54
       54
       +
       

     

       55
       55
       +
             location.assign(authUrl);

     

       56
       56
       +
           } catch (e: unknown) {

     

       57
       57
       +
             if (e instanceof Error) {

     

       58
       58
       +
               console.error(e);

     

       59
       59
       +
               setNotice(`${e.message}`);

     

       60
       60
       +
             } else {

     

       61
       61
       +
               console.error(e);

     

       62
       62
       +
               setNotice(`Unknown error, check console ¯\\_(ツ)_/¯`);

     

       63
       63
       +
             }

     

       64
       64
       +
           } finally {

     

       65
       65
       +
             document

     

       66
       66
       +
               .querySelector('button[type="submit"]')!

     

       67
       67
       +
               .removeAttribute("disabled");

     

       68
       68
       +
           }

     

       69
       69
       +
         };

     

       70
       70
       +
       

     

       71
       71
       +
         return (

     

       72
       72
       +
           <>

     

       73
       73
       +
             <Container

     

       74
       74
       +
               title="Log in"

     

       75
       75
       +
               children={

     

       76
       76
       +
                 <>

     

       77
       77
       +
                   <div class="login">

     

       78
       78
       +
                     <form name="login" id="login" onclick={(e) => e.preventDefault()}>

     

       79
       79
       +
                       <label for="handle">Handle</label>

     

       80
       80
       +
                       <br />

     

       81
       81
       +
                       <input

     

       82
       82
       +
                         type="text"

     

       83
       83
       +
                         id="handle"

     

       84
       84
       +
                         name="handle"

     

       85
       85
       +
                         maxlength="255"

     

       86
       86
       +
                         placeholder="soykaf.com"

     

       87
       87
       +
                         onInput={(e) => setLoginInput(e.currentTarget.value)}

     

       88
       88
       +
                         required

     

       89
       89
       +
                       />

     

       90
       90
       +
                       <br />

     

       91
       91
       +
                       <button type="submit" onclick={() => login(loginInput())}>

     

       92
       92
       +
                         Login

     

       93
       93
       +
                       </button>

     

       94
       94
       +
                     </form>

     

       95
       95
       +
                     <p class="submitInfo" hidden>

     

       96
       96
       +
                       {notice()}

     

       97
       97
       +
                     </p>

     

       98
       98
       +
                   </div>

     

       99
       99
       +
                 </>

     

       100
       100
       +
               }

     

       101
       101
       +
             />

     

       102
       102
       +
           </>

     

       103
       103
       +
         );

     

       104
       104
       +
       };

     

       105
       105
       +
       

     

       106
       106
       +
       const retrieveSession = async (): Promise<void> => {

     

       107
       107
       +
         const init = async (): Promise<Session | undefined> => {

     

       108
       108
       +
           const params = new URLSearchParams(location.hash.slice(1));

     

       109
       109
       +
       

     

       110
       110
       +
           if (params.has("state") && (params.has("code") || params.has("error"))) {

     

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

     

       112
       112
       +
       

     

       113
       113
       +
             const session = await finalizeAuthorization(params);

     

       114
       114
       +
             console.log("Finalizing authorization...", session);

     

       115
       115
       +
             const agent = new OAuthUserAgent(session);

     

       116
       116
       +
             console.log(await agent.getSession());

     

       117
       117
       +
             const did = session.info.sub;

     

       118
       118
       +
       

     

       119
       119
       +
             localStorage.setItem("currentUser", did);

     

       120
       120
       +
             return session;

     

       121
       121
       +
           } else {

     

       122
       122
       +
             const currentUser = localStorage.getItem("currentUser");

     

       123
       123
       +
       

     

       124
       124
       +
             if (currentUser) {

     

       125
       125
       +
               try {

     

       126
       126
       +
                 console.log("Retrieving session...");

     

       127
       127
       +
                 return await getSession(currentUser as Did);

     

       128
       128
       +
               } catch (err) {

     

       129
       129
       +
                 deleteStoredSession(currentUser as Did);

     

       130
       130
       +
                 localStorage.removeItem("currentUser");

     

       131
       131
       +
                 throw err;

     

       132
       132
       +
               }

     

       133
       133
       +
             }

     

       134
       134
       +
           }

     

       135
       135
       +
         };

     

       136
       136
       +
       

     

       137
       137
       +
         const session = await init().catch(() => {});

     

       138
       138
       +
       

     

       139
       139
       +
         if (session) {

     

       140
       140
       +
           console.log("Retrieved session!", session);

     

       141
       141
       +
           agent = new OAuthUserAgent(session);

     

       142
       142
       +
           setLoginState(true);

     

       143
       143
       +
         }

     

       144
       144
       +
       };

     

       145
       145
       +
       

     

       146
       146
       +
       const killSession = async (): Promise<void> => {

     

       147
       147
       +
         await agent.signOut();

     

       148
       148
       +
         setLoginState(false);

     

       149
       149
       +
         localStorage.removeItem("currentUser");

     

       150
       150
       +
         location.href = "/";

     

       151
       151
       +
       };

     

       152
       152
       +
       

     

       153
       153
       +
       export { agent, killSession, Login, retrieveSession };

+7 -13

src/index.tsx

···

       2
       2
        
       import { render } from "solid-js/web";

     

       3
       3
        
       import "solid-devtools";

     

       4
       4
        
       import { Route, Router } from "@solidjs/router";

     

       5
       5
       -
       

     

       6
       6
       -
       import Login from "./routes/login";

     

       7
       7
       -
       

     

       8
       8
       -
       const root = document.getElementById("root");

     

       9
       9
       -
       

     

       10
       10
       -
       if (import.meta.env.DEV && !(root instanceof HTMLElement)) {

     

       11
       11
       -
         throw new Error(

     

       12
       12
       -
           "Root element not found. Did you forget to add it to your index.html? Or maybe the id attribute got misspelled?",

     

       13
       13
       -
         );

     

       14
       14
       -
       }

     

       5
       5
       +
       import Splash from "./routes/splash";

     

       6
       6
       +
       import Base from "./base";

     

       7
       7
       +
       import Dashboard from "./routes/dashboard";

     

       15
       8
        
       

     

       16
       9
        
       render(

     

       17
       10
        
         () => (

     

       18
       18
       -
           <Router root={Login}>

     

       19
       19
       -
             <Route path="/" component={Login} />

     

       11
       11
       +
           <Router root={Base}>

     

       12
       12
       +
             <Route path="/" component={Splash} />

     

       13
       13
       +
             <Route path="/dash" component={Dashboard} />

     

       20
       14
        
           </Router>

     

       21
       15
        
         ),

     

       22
       22
       -
         root!,

     

       16
       16
       +
         document.getElementById("root") as HTMLElement,

     

       23
       17
        
       );

-71

src/routes/login.tsx

···

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

     

       2
       2
       -
       import Navbar from "../components/navbar";

     

       3
       3
       -
       import "../styles/main.scss";

     

       4
       4
       -
       import typefaceLogo from "/logo.png?url";

     

       5
       5
       -
       import blueskyLogo from "/bluesky.svg?url";

     

       6
       6
       -
       import tangledLogo from "/tangled.svg?url";

     

       7
       7
       -
       import Container from "../components/container";

     

       8
       8
       -
       

     

       9
       9
       -
       const Login: Component = () => {

     

       10
       10
       -
         return (

     

       11
       11
       -
           <>

     

       12
       12
       -
             <header>

     

       13
       13
       -
               <Navbar />

     

       14
       14
       -
             </header>

     

       15
       15
       -
             <main>

     

       16
       16
       -
               <div id="sidebar">

     

       17
       17
       -
                 <Container

     

       18
       18
       -
                   title="Log in"

     

       19
       19
       -
                   children={

     

       20
       20
       -
                     <div class="login">

     

       21
       21
       -
                       <form name="login" id="login">

     

       22
       22
       -
                         <label for="handle">Handle</label>

     

       23
       23
       -
                         <br />

     

       24
       24
       -
                         <input

     

       25
       25
       -
                           type="text"

     

       26
       26
       -
                           id="handle"

     

       27
       27
       -
                           name="handle"

     

       28
       28
       -
                           maxlength="255"

     

       29
       29
       -
                           placeholder="soykaf.com"

     

       30
       30
       -
                           required

     

       31
       31
       -
                         />

     

       32
       32
       -
                         <br />

     

       33
       33
       -
                         <button type="submit">Login</button>

     

       34
       34
       -
                       </form>

     

       35
       35
       -
                     </div>

     

       36
       36
       -
                   }

     

       37
       37
       -
                 />

     

       38
       38
       -
               </div>

     

       39
       39
       -
               <div id="content">

     

       40
       40
       -
                 <Container

     

       41
       41
       -
                   title="About"

     

       42
       42
       -
                   children={

     

       43
       43
       -
                     <div class="container-content">

     

       44
       44
       -
                       <img class={"typeface"} src={typefaceLogo} />

     

       45
       45
       -
                       <h2>A Bluesky client with a familiar face</h2>

     

       46
       46
       -
                       <hr />

     

       47
       47
       -
                       <p>

     

       48
       48
       -
                         <b>Bluroma</b> is a web client for Bluesky, built to provide a

     

       49
       49
       -
                         customizable power-user experience. Its design is heavily

     

       50
       50
       -
                         influenced by the <a href="https://pleroma.social">Pleroma</a>{" "}

     

       51
       51
       -
                         and <a href="https://akkoma.social">Akkoma</a> projects, and

     

       52
       52
       -
                         intends to provide a similar user interface for Bluesky users.

     

       53
       53
       -
                       </p>

     

       54
       54
       -
                       <div class="logo-crawl">

     

       55
       55
       -
                         <a href="https://bsky.social/profile/did:plc:5szlrh3xkfxxsuu4mo6oe6h7">

     

       56
       56
       -
                           <img src={blueskyLogo} />

     

       57
       57
       -
                         </a>

     

       58
       58
       -
                         <a href="https://tangled.org/@hexmani.ac/bluroma">

     

       59
       59
       -
                           <img src={tangledLogo}></img>

     

       60
       60
       -
                         </a>

     

       61
       61
       -
                       </div>

     

       62
       62
       -
                     </div>

     

       63
       63
       -
                   }

     

       64
       64
       -
                 />

     

       65
       65
       -
               </div>

     

       66
       66
       -
             </main>

     

       67
       67
       -
           </>

     

       68
       68
       -
         );

     

       69
       69
       -
       };

     

       70
       70
       -
       

     

       71
       71
       -
       export default Login;

+14

src/styles/button.scss

···

       24
       24
        
               0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset,

     

       25
       25
        
               0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;

     

       26
       26
        
       }

     

       27
       27
       +
       

     

       28
       28
       +
       button:disabled,

     

       29
       29
       +
       .button:disabled {

     

       30
       30
       +
           color: #666769;

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       button:focus,

     

       34
       34
       +
       .button:focus {

     

       35
       35
       +
           outline: none;

     

       36
       36
       +
           box-shadow:

     

       37
       37
       +
               0px 0px 1px 2px rgba(185, 185, 186, 0.4) inset,

     

       38
       38
       +
               0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset,

     

       39
       39
       +
               0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;

     

       40
       40
       +
       }

+12

static/oauth/client-metadata.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "client_id": "https://pl.hexmani.ac/oauth/client-metadata.json",

     

       3
       3
       +
         "client_name": "Bluroma",

     

       4
       4
       +
         "client_uri": "https://pl.hexmani.ac",

     

       5
       5
       +
         "redirect_uris": ["https://pl.hexmani.ac/"],

     

       6
       6
       +
         "scope": "atproto transition:generic",

     

       7
       7
       +
         "grant_types": ["authorization_code", "refresh_token"],

     

       8
       8
       +
         "response_types": ["code"],

     

       9
       9
       +
         "token_endpoint_auth_method": "none",

     

       10
       10
       +
         "application_type": "web",

     

       11
       11
       +
         "dpop_bound_access_tokens": true

     

       12
       12
       +
       }

+7 -3

src/components/container.tsx

···

       8
       8
        
       const Container = (props: ContainerProps) => {

     

       9
       9
        
         return (

     

       10
       10
        
           <div class="container">

     

       11
       11
       -
             <div class="container-header">

     

       12
       12
       -
               <span>{props.title}</span>

     

       13
       13
       -
             </div>

     

       11
       11
       +
             {props.title ? (

     

       12
       12
       +
               <div class="container-header">

     

       13
       13
       +
                 <span>{props.title}</span>

     

       14
       14
       +
               </div>

     

       15
       15
       +
             ) : (

     

       16
       16
       +
               <></>

     

       17
       17
       +
             )}

     

       14
       18
        
             {props.children}

     

       15
       19
        
           </div>

     

       16
       20
        
         );

+58

src/components/miniProfile.tsx

···

       1
       1
       +
       import { Component, Match, Show, Switch, createResource } from "solid-js";

     

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

     

       3
       3
       +
       import { agent } from "./login";

     

       4
       4
       +
       

     

       5
       5
       +
       type MiniProfileProps = {

     

       6
       6
       +
         did: `did:${string}:${string}`;

     

       7
       7
       +
       };

     

       8
       8
       +
       

     

       9
       9
       +
       async function getProfileDetails(did: `did:${string}:${string}`) {

     

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

     

       11
       11
       +
       

     

       12
       12
       +
         const res = await rpc.get("app.bsky.actor.getProfile", {

     

       13
       13
       +
           params: {

     

       14
       14
       +
             actor: did,

     

       15
       15
       +
           },

     

       16
       16
       +
         });

     

       17
       17
       +
       

     

       18
       18
       +
         if (!res.ok) {

     

       19
       19
       +
           throw new Error(`Failed to fetch profile details: ${res.status}`);

     

       20
       20
       +
         }

     

       21
       21
       +
       

     

       22
       22
       +
         return res.data;

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       const MiniProfile = (props: MiniProfileProps) => {

     

       26
       26
       +
         const [profileInfo] = createResource(agent.sub, getProfileDetails);

     

       27
       27
       +
       

     

       28
       28
       +
         return (

     

       29
       29
       +
           <>

     

       30
       30
       +
             <Show when={profileInfo.loading}>

     

       31
       31
       +
               <p>loading...</p>

     

       32
       32
       +
             </Show>

     

       33
       33
       +
             <Switch>

     

       34
       34
       +
               <Match when={profileInfo.error}>

     

       35
       35
       +
                 <p>Error: {profileInfo.error.message}</p>

     

       36
       36
       +
               </Match>

     

       37
       37
       +
               <Match when={profileInfo()}>

     

       38
       38
       +
                 <div

     

       39
       39
       +
                   class="mini-profile"

     

       40
       40
       +
                   // todo: add banner fade

     

       41
       41
       +
                   style={`background-image: linear-gradient(to bottom, rgba(15, 22, 30, 0.85)), url(${profileInfo()?.banner}); background-size: cover; background-repeat: no-repeat;`}

     

       42
       42
       +
                 >

     

       43
       43
       +
                   <img

     

       44
       44
       +
                     src={profileInfo()?.avatar}

     

       45
       45
       +
                     alt={`Profile picture for ${profileInfo()?.handle}`}

     

       46
       46
       +
                   />

     

       47
       47
       +
                   <div class="mini-profile-info">

     

       48
       48
       +
                     <p>{profileInfo()?.displayName}</p>

     

       49
       49
       +
                     <p>@{profileInfo()?.handle}</p>

     

       50
       50
       +
                   </div>

     

       51
       51
       +
                 </div>

     

       52
       52
       +
               </Match>

     

       53
       53
       +
             </Switch>

     

       54
       54
       +
           </>

     

       55
       55
       +
         );

     

       56
       56
       +
       };

     

       57
       57
       +
       

     

       58
       58
       +
       export default MiniProfile;

+30

src/styles/profile.scss

···

       1
       1
       +
       @use "vars";

     

       2
       2
       +
       

     

       3
       3
       +
       .mini-profile {

     

       4
       4
       +
           display: flex;

     

       5
       5
       +
           flex-direction: row;

     

       6
       6
       +
           align-items: center;

     

       7
       7
       +
           gap: 1rem;

     

       8
       8
       +
           padding: 1rem;

     

       9
       9
       +
           margin-bottom: 1rem;

     

       10
       10
       +
           border-radius: vars.$containerBorderRadius;

     

       11
       11
       +
       

     

       12
       12
       +
           img {

     

       13
       13
       +
               max-height: 64px;

     

       14
       14
       +
               box-shadow: 10px 5px 5px rgba(0, 0, 0, 0.2);

     

       15
       15
       +
               border-radius: 3px;

     

       16
       16
       +
           }

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       .mini-profile-info {

     

       20
       20
       +
           text-align: left;

     

       21
       21
       +
           display: flex;

     

       22
       22
       +
           flex-direction: column;

     

       23
       23
       +
           align-items: flex-start;

     

       24
       24
       +
           justify-content: center;

     

       25
       25
       +
           gap: 0.5rem;

     

       26
       26
       +
       

     

       27
       27
       +
           p {

     

       28
       28
       +
               margin: 0;

     

       29
       29
       +
           }

     

       30
       30
       +
       }

+74

src/components/post.tsx

···

       1
       1
       +
       import RelativeTime from "@yaireo/relative-time";

     

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

     

       3
       3
       +
       import type { Post } from "../types/post";

     

       4
       4
       +
       

     

       5
       5
       +
       type PostProps = {

     

       6
       6
       +
         data: Post;

     

       7
       7
       +
       };

     

       8
       8
       +
       

     

       9
       9
       +
       // todo: don't just copy FA svgs in from akko-fe

     

       10
       10
       +
       const BoostIcon = () => {

     

       11
       11
       +
         return (

     

       12
       12
       +
           <svg role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">

     

       13
       13
       +
             <title>Boost</title>

     

       14
       14
       +
             <path

     

       15
       15
       +
               class=""

     

       16
       16
       +
               fill="#5dc94a"

     

       17
       17
       +
               d="M272 416c17.7 0 32-14.3 32-32s-14.3-32-32-32H160c-17.7 0-32-14.3-32-32V192h32c12.9 0 24.6-7.8 29.6-19.8s2.2-25.7-6.9-34.9l-64-64c-12.5-12.5-32.8-12.5-45.3 0l-64 64c-9.2 9.2-11.9 22.9-6.9 34.9s16.6 19.8 29.6 19.8l32 0 0 128c0 53 43 96 96 96H272zM304 96c-17.7 0-32 14.3-32 32s14.3 32 32 32l112 0c17.7 0 32 14.3 32 32l0 128H416c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l64 64c12.5 12.5 32.8 12.5 45.3 0l64-64c9.2-9.2 11.9-22.9 6.9-34.9s-16.6-19.8-29.6-19.8l-32 0V192c0-53-43-96-96-96L304 96z"

     

       18
       18
       +
             ></path>

     

       19
       19
       +
           </svg>

     

       20
       20
       +
         );

     

       21
       21
       +
       };

     

       22
       22
       +
       

     

       23
       23
       +
       const Post = (props: PostProps) => {

     

       24
       24
       +
         return (

     

       25
       25
       +
           <div class="post">

     

       26
       26
       +
             <Show when={props.data.context}>

     

       27
       27
       +
               <div class="post-context">

     

       28
       28
       +
                 <img

     

       29
       29
       +
                   src={props.data.context?.invoker.avatar}

     

       30
       30
       +
                   alt={`Profile picture of ${props.data.context?.invoker.handle}`}

     

       31
       31
       +
                 />

     

       32
       32
       +
                 <span class="post-context-user">

     

       33
       33
       +
                   {props.data.context?.invoker.displayName}

     

       34
       34
       +
                 </span>

     

       35
       35
       +
                 <BoostIcon />

     

       36
       36
       +
                 <span>reposted</span>

     

       37
       37
       +
               </div>

     

       38
       38
       +
             </Show>

     

       39
       39
       +
             <div class="post-content">

     

       40
       40
       +
               <img

     

       41
       41
       +
                 class="post-avatar"

     

       42
       42
       +
                 src={props.data.avatar}

     

       43
       43
       +
                 alt={`Profile picture of ${props.data.handle}`}

     

       44
       44
       +
               />

     

       45
       45
       +
               <div class="post-main">

     

       46
       46
       +
                 <div class="post-header">

     

       47
       47
       +
                   <div class="post-author">

     

       48
       48
       +
                     <span>{props.data.displayName}</span>

     

       49
       49
       +
                     <span class="post-author-handle">@{props.data.handle}</span>

     

       50
       50
       +
                   </div>

     

       51
       51
       +
                   <span class="post-time">

     

       52
       52
       +
                     {new RelativeTime({ options: { style: "narrow" } }).from(

     

       53
       53
       +
                       props.data.createdAt,

     

       54
       54
       +
                     )}

     

       55
       55
       +
                   </span>

     

       56
       56
       +
                 </div>

     

       57
       57
       +
                 <div class="post-body">{props.data.record.text}</div>

     

       58
       58
       +
               </div>

     

       59
       59
       +
             </div>

     

       60
       60
       +
             <div class="post-interactions">

     

       61
       61
       +
               <p>

     

       62
       62
       +
                 {props.data.counts.replyCount}{" "}

     

       63
       63
       +
                 {props.data.counts.replyCount === 1 ? "reply" : "replies"} |{" "}

     

       64
       64
       +
                 {props.data.counts.repostCount}{" "}

     

       65
       65
       +
                 {props.data.counts.repostCount === 1 ? "repost" : "reposts"} |{" "}

     

       66
       66
       +
                 {props.data.counts.likeCount}{" "}

     

       67
       67
       +
                 {props.data.counts.likeCount === 1 ? "like" : "likes"}

     

       68
       68
       +
               </p>

     

       69
       69
       +
             </div>

     

       70
       70
       +
           </div>

     

       71
       71
       +
         );

     

       72
       72
       +
       };

     

       73
       73
       +
       

     

       74
       74
       +
       export default Post;

-1

src/components/postForm.tsx

···

       2
       2
        
       import { agent } from "./login";

     

       3
       3
        
       import { Client } from "@atcute/client";

     

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

     

       5
       5
       -
       import RichtextBuilder from "@atcute/bluesky-richtext-builder";

     

       6
       5
        
       

     

       7
       6
        
       const PostForm: Component = () => {

     

       8
       7
        
         const [notice, setNotice] = createSignal("");

+22 -1

src/routes/dashboard.tsx

···

       1
       1
       +
       import { createResource, For, Match, Show, Switch } from "solid-js";

     

       1
       2
        
       import Container from "../components/container";

     

       2
       3
        
       import { agent, killSession, loginState } from "../components/login";

     

       3
       4
        
       import MiniProfile from "../components/miniProfile";

     

       4
       5
        
       import PostForm from "../components/postForm";

     

       6
       6
       +
       import { createPostElements, getFollowingTimeline } from "../utils/posts";

     

       7
       7
       +
       import Post from "../components/post";

     

       8
       8
       +
       

     

       9
       9
       +
       async function renderTimeline() {

     

       10
       10
       +
         const feed = await getFollowingTimeline();

     

       11
       11
       +
         return await createPostElements(feed.feed);

     

       12
       12
       +
       }

     

       5
       13
        
       

     

       6
       14
        
       const Dashboard = () => {

     

       7
       15
        
         if (!loginState()) {

     

       8
       16
        
           location.href = "/";

     

       9
       17
        
         }

     

       10
       18
        
       

     

       19
       19
       +
         const [feed] = createResource(renderTimeline);

     

       20
       20
       +
       

     

       11
       21
        
         return (

     

       12
       22
        
           <>

     

       13
       23
        
             <div id="sidebar">

     
···

       28
       38
        
                 children={

     

       29
       39
        
                   <div class="container-content">

     

       30
       40
        
                     <div class="dashboard-feed">

     

       31
       31
       -
                       <p>No more posts</p>

     

       41
       41
       +
                       <Switch>

     

       42
       42
       +
                         <Match when={feed.loading}>

     

       43
       43
       +
                           <p>Loading...</p>

     

       44
       44
       +
                         </Match>

     

       45
       45
       +
                         <Match when={feed.error}>

     

       46
       46
       +
                           <p>Error while loading timeline: {feed.error}</p>

     

       47
       47
       +
                         </Match>

     

       48
       48
       +
                         <Match when={feed()}>

     

       49
       49
       +
                           <For each={feed()}>{(item) => <Post data={item} />}</For>

     

       50
       50
       +
                           <p>No more posts</p>

     

       51
       51
       +
                         </Match>

     

       52
       52
       +
                       </Switch>

     

       32
       53
        
                     </div>

     

       33
       54
        
                   </div>

     

       34
       55
        
                 }

+224

src/styles/components/post.scss

···

       1
       1
       +
       @use "../vars";

     

       2
       2
       +
       

     

       3
       3
       +
       $currentColor: #1185fe;

     

       4
       4
       +
       

     

       5
       5
       +
       .dashboard-feed {

     

       6
       6
       +
           font-size: 0.95rem;

     

       7
       7
       +
           display: flex;

     

       8
       8
       +
           flex-direction: column;

     

       9
       9
       +
           overflow: scroll;

     

       10
       10
       +
           p {

     

       11
       11
       +
               color: #8d8d8d;

     

       12
       12
       +
           }

     

       13
       13
       +
           max-width: 600px;

     

       14
       14
       +
           width: 100%;

     

       15
       15
       +
           min-width: 0;

     

       16
       16
       +
       

     

       17
       17
       +
           @media (max-width: 850px) {

     

       18
       18
       +
               max-width: 500px;

     

       19
       19
       +
           }

     

       20
       20
       +
       

     

       21
       21
       +
           @media (max-width: 768px) {

     

       22
       22
       +
               max-width: 100%;

     

       23
       23
       +
               margin: 0;

     

       24
       24
       +
               padding: 0;

     

       25
       25
       +
           }

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       .post {

     

       29
       29
       +
           display: flex;

     

       30
       30
       +
           flex-direction: column;

     

       31
       31
       +
           gap: 0.1rem;

     

       32
       32
       +
           margin: 0.5rem 0;

     

       33
       33
       +
           border-bottom: 1px solid #444;

     

       34
       34
       +
           min-width: 0;

     

       35
       35
       +
           width: 100%;

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       .post-context {

     

       39
       39
       +
           display: flex;

     

       40
       40
       +
           gap: 0.5rem;

     

       41
       41
       +
           padding-left: 2.5rem;

     

       42
       42
       +
           padding-bottom: 0.5rem;

     

       43
       43
       +
           max-height: 32px;

     

       44
       44
       +
           align-items: center;

     

       45
       45
       +
           text-align: left;

     

       46
       46
       +
       

     

       47
       47
       +
           .post-context-user {

     

       48
       48
       +
               color: $currentColor;

     

       49
       49
       +
           }

     

       50
       50
       +
       

     

       51
       51
       +
           span {

     

       52
       52
       +
               color: rgba(185, 185, 186, 0.5);

     

       53
       53
       +
           }

     

       54
       54
       +
       

     

       55
       55
       +
           span:first-of-type {

     

       56
       56
       +
               margin-left: 0.5rem;

     

       57
       57
       +
           }

     

       58
       58
       +
       

     

       59
       59
       +
           img {

     

       60
       60
       +
               max-height: 24px;

     

       61
       61
       +
               border-radius: 5px;

     

       62
       62
       +
           }

     

       63
       63
       +
       

     

       64
       64
       +
           svg {

     

       65
       65
       +
               max-height: 16px;

     

       66
       66
       +
               border-radius: 5px;

     

       67
       67
       +
           }

     

       68
       68
       +
       

     

       69
       69
       +
           @media (max-width: 850px) {

     

       70
       70
       +
               span:first-of-type {

     

       71
       71
       +
                   margin-left: 0rem;

     

       72
       72
       +
               }

     

       73
       73
       +
           }

     

       74
       74
       +
       

     

       75
       75
       +
           @media (max-width: 768px) {

     

       76
       76
       +
               padding-left: 2rem;

     

       77
       77
       +
               gap: 0.34rem;

     

       78
       78
       +
       

     

       79
       79
       +
               span:first-of-type {

     

       80
       80
       +
                   margin-left: 0.1rem;

     

       81
       81
       +
               }

     

       82
       82
       +
           }

     

       83
       83
       +
       }

     

       84
       84
       +
       

     

       85
       85
       +
       .post-content {

     

       86
       86
       +
           display: flex;

     

       87
       87
       +
           flex-direction: row;

     

       88
       88
       +
           gap: 1rem;

     

       89
       89
       +
           padding-left: 1rem;

     

       90
       90
       +
           min-width: 0;

     

       91
       91
       +
       

     

       92
       92
       +
           @media (max-width: 850px) {

     

       93
       93
       +
               gap: 0.75rem;

     

       94
       94
       +
               padding-left: 0.75rem;

     

       95
       95
       +
           }

     

       96
       96
       +
       

     

       97
       97
       +
           @media (max-width: 768px) {

     

       98
       98
       +
               padding-left: 0.5rem;

     

       99
       99
       +
               gap: 0.5rem;

     

       100
       100
       +
           }

     

       101
       101
       +
       }

     

       102
       102
       +
       

     

       103
       103
       +
       .post-main {

     

       104
       104
       +
           display: flex;

     

       105
       105
       +
           flex-direction: column;

     

       106
       106
       +
           gap: 0.5rem;

     

       107
       107
       +
           flex: 1;

     

       108
       108
       +
           min-width: 0;

     

       109
       109
       +
           overflow-wrap: break-word;

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       .post-avatar {

     

       113
       113
       +
           width: 48px;

     

       114
       114
       +
           height: 48px;

     

       115
       115
       +
           border-radius: 5px;

     

       116
       116
       +
           flex-shrink: 0;

     

       117
       117
       +
       

     

       118
       118
       +
           @media (max-width: 768px) {

     

       119
       119
       +
               width: 48px;

     

       120
       120
       +
               height: 48px;

     

       121
       121
       +
           }

     

       122
       122
       +
       }

     

       123
       123
       +
       

     

       124
       124
       +
       .post-header {

     

       125
       125
       +
           display: flex;

     

       126
       126
       +
           flex-direction: row;

     

       127
       127
       +
           align-items: flex-start;

     

       128
       128
       +
           justify-content: space-between;

     

       129
       129
       +
           text-align: left;

     

       130
       130
       +
           width: 100%;

     

       131
       131
       +
           min-width: 0;

     

       132
       132
       +
           gap: 1rem;

     

       133
       133
       +
       

     

       134
       134
       +
           .post-author {

     

       135
       135
       +
               display: flex;

     

       136
       136
       +
               gap: 0.5rem;

     

       137
       137
       +
               align-items: baseline;

     

       138
       138
       +
               min-width: 0;

     

       139
       139
       +
               flex: 1;

     

       140
       140
       +
               overflow: hidden;

     

       141
       141
       +
       

     

       142
       142
       +
               span {

     

       143
       143
       +
                   white-space: nowrap;

     

       144
       144
       +
                   overflow: hidden;

     

       145
       145
       +
                   text-overflow: ellipsis;

     

       146
       146
       +
               }

     

       147
       147
       +
       

     

       148
       148
       +
               .post-author-handle {

     

       149
       149
       +
                   color: #1185fe;

     

       150
       150
       +
               }

     

       151
       151
       +
           }

     

       152
       152
       +
       

     

       153
       153
       +
           .post-time {

     

       154
       154
       +
               color: #8d8d8d;

     

       155
       155
       +
               white-space: nowrap;

     

       156
       156
       +
               flex-shrink: 0;

     

       157
       157
       +
               margin-left: auto;

     

       158
       158
       +
               margin-right: 1rem;

     

       159
       159
       +
           }

     

       160
       160
       +
       

     

       161
       161
       +
           @media (max-width: 850px) {

     

       162
       162
       +
               .post-author {

     

       163
       163
       +
                   span {

     

       164
       164
       +
                       max-width: 150px;

     

       165
       165
       +
                   }

     

       166
       166
       +
               }

     

       167
       167
       +
           }

     

       168
       168
       +
       

     

       169
       169
       +
           @media (max-width: 768px) {

     

       170
       170
       +
               flex-direction: row;

     

       171
       171
       +
               align-items: flex-start;

     

       172
       172
       +
               justify-content: space-between;

     

       173
       173
       +
       

     

       174
       174
       +
               .post-author {

     

       175
       175
       +
                   flex-direction: column;

     

       176
       176
       +
                   align-items: flex-start;

     

       177
       177
       +
                   gap: 0.25rem;

     

       178
       178
       +
                   flex: none;

     

       179
       179
       +
                   max-width: calc(100% - 80px);

     

       180
       180
       +
       

     

       181
       181
       +
                   span {

     

       182
       182
       +
                       white-space: normal;

     

       183
       183
       +
                       overflow-wrap: break-word;

     

       184
       184
       +
                       word-break: break-word;

     

       185
       185
       +
                       max-width: none;

     

       186
       186
       +
                       overflow: visible;

     

       187
       187
       +
                       text-overflow: clip;

     

       188
       188
       +
                   }

     

       189
       189
       +
               }

     

       190
       190
       +
       

     

       191
       191
       +
               .post-time {

     

       192
       192
       +
                   align-self: flex-start;

     

       193
       193
       +
               }

     

       194
       194
       +
           }

     

       195
       195
       +
       }

     

       196
       196
       +
       

     

       197
       197
       +
       .post-body {

     

       198
       198
       +
           text-align: left;

     

       199
       199
       +
           margin-top: 0.25rem;

     

       200
       200
       +
           margin-right: 1rem;

     

       201
       201
       +
           overflow-wrap: break-word;

     

       202
       202
       +
           word-break: break-word;

     

       203
       203
       +
       

     

       204
       204
       +
           @media (max-width: 850px) {

     

       205
       205
       +
               margin-right: 0.75rem;

     

       206
       206
       +
           }

     

       207
       207
       +
       

     

       208
       208
       +
           @media (max-width: 768px) {

     

       209
       209
       +
               margin-right: 0.5rem;

     

       210
       210
       +
           }

     

       211
       211
       +
       }

     

       212
       212
       +
       

     

       213
       213
       +
       .post-interactions {

     

       214
       214
       +
           text-align: left;

     

       215
       215
       +
           margin-left: 1rem;

     

       216
       216
       +
       

     

       217
       217
       +
           @media (max-width: 850px) {

     

       218
       218
       +
               margin-left: 0.75rem;

     

       219
       219
       +
           }

     

       220
       220
       +
       

     

       221
       221
       +
           @media (max-width: 768px) {

     

       222
       222
       +
               margin-left: 0.5rem;

     

       223
       223
       +
           }

     

       224
       224
       +
       }

+11 -3

src/styles/container.scss

···

       6
       6
        
           margin: 1em;

     

       7
       7
        
           padding: 0 0 1em 0;

     

       8
       8
        
           max-height: 100%;

     

       9
       9
       +
           min-width: 0;

     

       10
       10
       +
           box-sizing: border-box;

     

       9
       11
        
           box-shadow:

     

       10
       12
        
               0px 0px 3px 0px rgba(0, 0, 0, 0.5),

     

       11
       13
        
               0px 4px 6px 3px rgba(0, 0, 0, 0.3);

     

       12
       14
        
       

     

       13
       15
        
           .container-content {

     

       14
       14
       -
               padding: 0 1rem;

     

       16
       16
       +
               padding: 0;

     

       17
       17
       +
               margin-top: 1rem;

     

       18
       18
       +
               min-width: 0;

     

       19
       19
       +
               overflow-wrap: break-word;

     

       20
       20
       +
           }

     

       21
       21
       +
       

     

       22
       22
       +
           @media (max-width: 768px) {

     

       23
       23
       +
               margin: 0.5em;

     

       15
       24
        
           }

     

       16
       25
        
       }

     

       17
       26
        
       

     

       18
       27
        
       .container-header {

     

       19
       28
        
           background-color: vars.$foregroundColor;

     

       20
       29
        
           text-align: left;

     

       21
       21
       -
           padding: 1em;

     

       30
       30
       +
           padding: 1rem;

     

       22
       31
        
           height: 1rem;

     

       23
       32
        
           border-radius: vars.$containerBorderRadius vars.$containerBorderRadius 0 0;

     

       24
       24
       -
           margin-bottom: 1em;

     

       25
       33
        
           box-shadow:

     

       26
       34
        
               0px 1px 3px 0px rgba(0, 0, 0, 0.4),

     

       27
       35
        
               0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset;

+26

src/types/post.ts

···

       1
       1
       +
       import { AppBskyFeedPost } from "@atcute/bluesky";

     

       2
       2
       +
       import { ProfileViewBasic } from "@atcute/bluesky/types/app/actor/defs";

     

       3
       3
       +
       

     

       4
       4
       +
       export type Post = {

     

       5
       5
       +
         avatar?: string;

     

       6
       6
       +
         context?: PostContext;

     

       7
       7
       +
         counts: PostCounts;

     

       8
       8
       +
         createdAt: Date;

     

       9
       9
       +
         displayName: string;

     

       10
       10
       +
         handle: string;

     

       11
       11
       +
         indexedAt: Date;

     

       12
       12
       +
         record: AppBskyFeedPost.Main;

     

       13
       13
       +
       };

     

       14
       14
       +
       

     

       15
       15
       +
       type PostCounts = {

     

       16
       16
       +
         bookmarkCount?: number;

     

       17
       17
       +
         likeCount?: number;

     

       18
       18
       +
         quoteCount?: number;

     

       19
       19
       +
         repostCount?: number;

     

       20
       20
       +
         replyCount?: number;

     

       21
       21
       +
       };

     

       22
       22
       +
       

     

       23
       23
       +
       type PostContext = {

     

       24
       24
       +
         invoker: ProfileViewBasic;

     

       25
       25
       +
         reason: string;

     

       26
       26
       +
       };

+91

src/utils/posts.ts

···

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

     

       2
       2
       +
       import { agent } from "../components/login";

     

       3
       3
       +
       import { FeedViewPost } from "@atcute/bluesky/types/app/feed/defs";

     

       4
       4
       +
       import type { Post } from "../types/post";

     

       5
       5
       +
       import { is } from "@atcute/lexicons";

     

       6
       6
       +
       import { AppBskyFeedPost } from "@atcute/bluesky";

     

       7
       7
       +
       

     

       8
       8
       +
       export async function getFollowingTimeline(

     

       9
       9
       +
         cursor: string = "",

     

       10
       10
       +
         limit: number = 50,

     

       11
       11
       +
       ) {

     

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

     

       13
       13
       +
       

     

       14
       14
       +
         const res = await rpc.get("app.bsky.feed.getTimeline", {

     

       15
       15
       +
           params: {

     

       16
       16
       +
             cursor,

     

       17
       17
       +
             limit,

     

       18
       18
       +
           },

     

       19
       19
       +
         });

     

       20
       20
       +
       

     

       21
       21
       +
         if (!res.ok) {

     

       22
       22
       +
           throw new Error(

     

       23
       23
       +
             `Failed to fetch user's following timeline: ${res.data.error}/${res.data.message}`,

     

       24
       24
       +
           );

     

       25
       25
       +
         }

     

       26
       26
       +
       

     

       27
       27
       +
         return { feed: res.data.feed, cursor: res.data.cursor };

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       export async function createPostElements(feed: FeedViewPost[]) {

     

       31
       31
       +
         let elms: Post[] = [];

     

       32
       32
       +
         const seenCreators = new Set<string>();

     

       33
       33
       +
       

     

       34
       34
       +
         feed.forEach((post) => {

     

       35
       35
       +
           if (is(AppBskyFeedPost.mainSchema, post.post.record)) {

     

       36
       36
       +
             const record = post.post.record as unknown as AppBskyFeedPost.Main;

     

       37
       37
       +
             const isReply = record.reply !== undefined;

     

       38
       38
       +
             const creatorDid = post.post.author.did;

     

       39
       39
       +
       

     

       40
       40
       +
             // Skip replies from creators who already have a post in elms

     

       41
       41
       +
             if (isReply && seenCreators.has(creatorDid)) {

     

       42
       42
       +
               return;

     

       43
       43
       +
             }

     

       44
       44
       +
       

     

       45
       45
       +
             if (post.reason) {

     

       46
       46
       +
               if (post.reason.$type === "app.bsky.feed.defs#reasonRepost") {

     

       47
       47
       +
                 elms.push({

     

       48
       48
       +
                   avatar: post.post.author.avatar,

     

       49
       49
       +
                   context: {

     

       50
       50
       +
                     invoker: post.reason.by,

     

       51
       51
       +
                     reason: post.reason.$type,

     

       52
       52
       +
                   },

     

       53
       53
       +
                   counts: {

     

       54
       54
       +
                     bookmarkCount: post.post.bookmarkCount,

     

       55
       55
       +
                     likeCount: post.post.likeCount,

     

       56
       56
       +
                     quoteCount: post.post.quoteCount,

     

       57
       57
       +
                     repostCount: post.post.repostCount,

     

       58
       58
       +
                     replyCount: post.post.replyCount,

     

       59
       59
       +
                   },

     

       60
       60
       +
                   createdAt: new Date(post.post.record.createdAt),

     

       61
       61
       +
                   displayName:

     

       62
       62
       +
                     post.post.author.displayName || post.post.author.handle,

     

       63
       63
       +
                   handle: post.post.author.handle,

     

       64
       64
       +
                   indexedAt: new Date(post.post.indexedAt),

     

       65
       65
       +
                   record: record,

     

       66
       66
       +
                 });

     

       67
       67
       +
                 seenCreators.add(creatorDid);

     

       68
       68
       +
               }

     

       69
       69
       +
             } else {

     

       70
       70
       +
               elms.push({

     

       71
       71
       +
                 avatar: post.post.author.avatar,

     

       72
       72
       +
                 counts: {

     

       73
       73
       +
                   bookmarkCount: post.post.bookmarkCount,

     

       74
       74
       +
                   likeCount: post.post.likeCount,

     

       75
       75
       +
                   quoteCount: post.post.quoteCount,

     

       76
       76
       +
                   repostCount: post.post.repostCount,

     

       77
       77
       +
                   replyCount: post.post.replyCount,

     

       78
       78
       +
                 },

     

       79
       79
       +
                 createdAt: new Date(post.post.record.createdAt),

     

       80
       80
       +
                 displayName: post.post.author.displayName || post.post.author.handle,

     

       81
       81
       +
                 handle: post.post.author.handle,

     

       82
       82
       +
                 indexedAt: new Date(post.post.indexedAt),

     

       83
       83
       +
                 record: record,

     

       84
       84
       +
               });

     

       85
       85
       +
               seenCreators.add(creatorDid);

     

       86
       86
       +
             }

     

       87
       87
       +
           }

     

       88
       88
       +
         });

     

       89
       89
       +
       

     

       90
       90
       +
         return elms;

     

       91
       91
       +
       }

+23

.tangled/build.yaml

···

       1
       1
       +
       when:

     

       2
       2
       +
         - event: [ "push", "pull_request" ]

     

       3
       3
       +
           branch: [ "main" ]

     

       4
       4
       +
         - event: [ "manual" ]

     

       5
       5
       +
       

     

       6
       6
       +
       engine: "nixery"

     

       7
       7
       +
       

     

       8
       8
       +
       dependencies:

     

       9
       9
       +
         nixpkgs:

     

       10
       10
       +
           - bun

     

       11
       11
       +
           - nodejs

     

       12
       12
       +
       

     

       13
       13
       +
       steps:

     

       14
       14
       +
         - name: "Install dependencies"

     

       15
       15
       +
           command: "bun install"

     

       16
       16
       +
       

     

       17
       17
       +
         - name: "Build app"

     

       18
       18
       +
           command: "bun run build"

     

       19
       19
       +
       

     

       20
       20
       +
       clone:

     

       21
       21
       +
         skip: false

     

       22
       22
       +
         depth: 50

     

       23
       23
       +
         submodules: true

+17 -4

package.json

···

       1
       1
        
       {

     

       2
       2
       -
         "name": "vite-template-solid",

     

       3
       3
       -
         "version": "0.0.0",

     

       4
       4
       -
         "description": "",

     

       2
       2
       +
         "name": "bluroma",

     

       3
       3
       +
         "version": "0.1.0",

     

       4
       4
       +
         "description": "pleroma-like client for Bluesky",

     

       5
       5
       +
         "keywords": [

     

       6
       6
       +
           "atproto",

     

       7
       7
       +
           "bluesky",

     

       8
       8
       +
           "client"

     

       9
       9
       +
         ],

     

       10
       10
       +
         "homepage": "https://tangled.org/@hexmani.ac/bluroma",

     

       11
       11
       +
         "bugs": {

     

       12
       12
       +
           "url": "https://tangled.org/@hexmani.ac/bluroma/issues"

     

       13
       13
       +
         },

     

       14
       14
       +
         "license": "AGPL-3.0-only",

     

       15
       15
       +
         "repository": {

     

       16
       16
       +
           "type": "git",

     

       17
       17
       +
           "url": "git+https://tangled.org/@hexmani.ac/bluroma.git"

     

       18
       18
       +
         },

     

       5
       19
        
         "type": "module",

     

       6
       20
        
         "scripts": {

     

       7
       21
        
           "start": "vite",

     
···

       9
       23
        
           "build": "vite build",

     

       10
       24
        
           "serve": "vite preview"

     

       11
       25
        
         },

     

       12
       12
       -
         "license": "MIT",

     

       13
       26
        
         "devDependencies": {

     

       14
       27
        
           "@types/bun": "^1.3.0",

     

       15
       28
        
           "sass": "^1.81.0",

.tangled/build.yaml .tangled/workflows/build.yaml

+1 -1

static/oauth/client-metadata.json static/oauth-client-metadata.json

···

       1
       1
        
       {

     

       2
       2
       -
         "client_id": "https://pl.hexmani.ac/oauth/client-metadata.json",

     

       2
       2
       +
         "client_id": "https://pl.hexmani.ac/oauth-client-metadata.json",

     

       3
       3
        
         "client_name": "Bluroma",

     

       4
       4
        
         "client_uri": "https://pl.hexmani.ac",

     

       5
       5
        
         "redirect_uris": ["https://pl.hexmani.ac/"],

+1 -1

README.md

···

       1
       1
       -
       <img src="static/logo.png" alt="The Bluroma logo, containing three rectangles with one rounded corner each shaped to look like an uppercase B and the Bluroma name written in the Convection font beside it." width="200">

     

       1
       1
       +
       <img src="static/media/logo.png" alt="The Bluroma logo, containing three rectangles with one rounded corner each shaped to look like an uppercase B and the Bluroma name written in the Convection font beside it." width="200">

     

       2
       2
        
       

     

       3
       3
        
       ## About

     

       4
       4

+3 -3

index.html

···

       1
       1
        
       <!doctype html>

     

       2
       2
        
       <html lang="en">

     

       3
       3
        
           <head>

     

       4
       4
       -
               <link rel="icon" href="/favicon.png" type="image/png" />

     

       4
       4
       +
               <link rel="icon" href="favicon.png" type="image/png" />

     

       5
       5
        
               <meta charset="utf-8" />

     

       6
       6
        
               <meta name="viewport" content="width=device-width, initial-scale=1" />

     

       7
       7
        
               <meta name="theme-color" content="#1285FE" />

     
···

       21
       21
        
                       <p>Please enable

     

       22
       22
        
                       JavaScript to continue.</p>

     

       23
       23
        
                       </p>

     

       24
       24
       -
                       <img src="/favicon.png" alt="Bluroma Logo" />

     

       24
       24
       +
                       <img src="favicon.png" alt="Bluroma Logo" />

     

       25
       25
        
                   </div>

     

       26
       26
        
               </noscript>

     

       27
       27
        
           </body>

     

       28
       28
       -
           <script src="/src/index.tsx" type="module"></script>

     

       28
       28
       +
           <script src="src/index.tsx" type="module"></script>

     

       29
       29
        
       </html>

+3 -3

src/routes/splash.tsx

···

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

     

       2
       2
        
       import "../styles/main.scss";

     

       3
       3
       -
       import typefaceLogo from "/logo.png?url";

     

       4
       4
       -
       import blueskyLogo from "/bluesky.svg?url";

     

       5
       5
       -
       import tangledLogo from "/tangled.svg?url";

     

       3
       3
       +
       import typefaceLogo from "/media/logo.png?url";

     

       4
       4
       +
       import blueskyLogo from "/media/bluesky.svg?url";

     

       5
       5
       +
       import tangledLogo from "/media/tangled.svg?url";

     

       6
       6
        
       import Container from "../components/container";

     

       7
       7
        
       import { Login, loginState } from "../components/login";

     

       8
       8

static/bluesky.svg static/media/bluesky.svg

static/logo.png static/media/logo.png

static/tangled.svg static/media/tangled.svg

+41

.tangled/workflows/deploy-main.yaml

···

       1
       1
       +
       when:

     

       2
       2
       +
         - event: ["push"]

     

       3
       3
       +
           branch: ["main"]

     

       4
       4
       +
         - event: ["manual"]

     

       5
       5
       +
       

     

       6
       6
       +
       engine: "nixery"

     

       7
       7
       +
       

     

       8
       8
       +
       dependencies:

     

       9
       9
       +
         nixpkgs:

     

       10
       10
       +
           - bun

     

       11
       11
       +
           - coreutils

     

       12
       12
       +
           - curl

     

       13
       13
       +
           - nodejs

     

       14
       14
       +
       

     

       15
       15
       +
       environment:

     

       16
       16
       +
         SITE_PATH: "dist"

     

       17
       17
       +
         SITE_NAME: "bluroma"

     

       18
       18
       +
         WISP_HANDLE: "hexmani.ac"

     

       19
       19
       +
       

     

       20
       20
       +
       steps:

     

       21
       21
       +
         - name: "Install dependencies"

     

       22
       22
       +
           command: "bun install --frozen-lockfile"

     

       23
       23
       +
       

     

       24
       24
       +
         - name: "Build app"

     

       25
       25
       +
           command: "bun run build"

     

       26
       26
       +
       

     

       27
       27
       +
         - name: "Deploy to Wisp"

     

       28
       28
       +
           command: |

     

       29
       29
       +
             curl https://sites.wisp.place/nekomimi.pet/wisp-cli-binaries/wisp-cli-x86_64-linux -o wisp-cli

     

       30
       30
       +
             chmod +x wisp-cli

     

       31
       31
       +
       

     

       32
       32
       +
             ./wisp-cli deploy \

     

       33
       33
       +
               "$WISP_HANDLE" \

     

       34
       34
       +
               --path "$SITE_PATH" \

     

       35
       35
       +
               --site "$SITE_NAME" \

     

       36
       36
       +
               --password "$WISP_APP_PASSWORD"

     

       37
       37
       +
       

     

       38
       38
       +
       clone:

     

       39
       39
       +
         skip: false

     

       40
       40
       +
         depth: 50

     

       41
       41
       +
         submodules: true

Compare changes