chore: initial changes

.github/workflows/update_locales.yml

@@ -20,7 +20,6 @@ jobs:
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:
-          author_name: Revolt CI
-          author_email: revolt[email protected]
+          author_name: Upryzing CI
+          author_email: upryzing[email protected]
           message: "chore: update locale strings"
-

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/revoltchat/revolt.js
 [submodule "components/i18n/locales"]
 	path = packages/client/components/i18n/locales
-	url = https://github.com/revoltchat/translations
+	url = https://github.com/upryzing/translations
 [submodule "packages/solid-styled-components"]
 	path = packages/solid-styled-components
 	url = https://github.com/revoltchat/solid-styled-components

.vscode/settings.json

@@ -8,13 +8,13 @@
   "editor.codeActionsOnSave": {
     "source.fixAll": "explicit"
   },
-  // Force to follow the `GUIDELINES.md`
+  // follow the style guidlines in `GUIDELINES.md`
   "editor.detectIndentation": false,
   "editor.insertSpaces": true,
   "editor.tabSize": 2,
-  // Tell `rust-analyzer` where the Tauri project is.
+  // tell `rust-analyzer` where the Tauri project is
   "rust-analyzer.linkedProjects": [
     "./packages/desktop/src-tauri/Cargo.toml"
   ],
   "nixEnvSelector.nixFile": "${workspaceRoot}/default.nix"
-}
+}

README.md

@@ -1,23 +1,23 @@
-# Revolt Frontend
+# Upryzing's Web App (Lavender)
 
-This repository contains the code for Revolt's frontend, built with Solid.js.
+This repository houses the source code for Lavender, Upryzing's web app, built with Solid.js.
 
 ## Development Guide
 
 Before contributing, make yourself familiar with [our contribution guidelines](https://developers.revolt.chat/contrib.html), the [code style guidelines](./GUIDELINES.md), and the [technical documentation for this project](https://revoltchat.github.io/frontend/).
 
 Before getting started, you'll want to install:
 
-- Git
-- Node.js
-- pnpm (run `corepack enable`)
+- Git,
+- Node.js (v18+), and
+- pnpm (run `corepack enable`).
 
 Then proceed to setup:
 
 ```bash
 # clone the repository
-git clone --recursive https://github.com/revoltchat/frontend client
-cd client
+git clone --recursive https://github.com/upryzing/lavender lavender
+cd lavender
 
 # update submodules if you pull new changes
 # git submodule init && git submodule update
@@ -28,7 +28,7 @@ pnpm i
 # build deps:
 pnpm build:deps
 
-# or build a specific dep (e.g. revolt.js updates):
+# ...or build a specific dep (e.g. revolt.js updates):
 # pnpm --filter revolt.js run build
 
 # run dev server
@@ -79,7 +79,7 @@ pnpm build:deps
 # build for web
 pnpm build:web
 
-# ... when building for Revolt production, use this instead of :web
+# ... when building for production, use this instead of :web
 pnpm build:prod
 ```
 

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "resolvite",
-  "version": "1.0.0",
-  "description": "Revolt's front-end monorepo.",
+  "name": "@upryzing/lavender-mono",
+  "version": "0.1.0",
+  "description": "Upryzing's main web and desktop apps",
   "scripts": {
     "test": "pnpm --filter test-runner test",
     "test:coverage": "pnpm --filter test-runner coverage",
@@ -10,19 +10,19 @@
     "test:browser:report": "pnpm --filter browser-test-runner exec playwright show-report",
     "lint": "eslint --ext .ts,.tsx components/ packages/",
     "lint:fix": "pnpm lint --fix",
-    "dev:web": "pnpm --filter client dev",
-    "dev:desktop": "pnpm --filter desktop tauri dev",
+    "dev:web": "pnpm --filter @upryzing/lavender dev",
+    "dev:desktop": "pnpm --filter @upryzing/lavender-desktop tauri dev",
     "build:deps": "pnpm --filter revolt.js build",
-    "build:web": "pnpm --filter client build",
-    "build:desktop": "pnpm --filter desktop tauri build",
+    "build:web": "pnpm --filter @upryzing/lavender build",
+    "build:desktop": "pnpm --filter @upryzing/lavender-desktop tauri build",
     "start": "cd packages/client && pnpm run serve",
     "fmt": "prettier --write '**/*.{ts,tsx,json}'",
     "fmt:check": "prettier --check '**/*.{ts,tsx,json}'",
     "typecheck": "cd packages/client && pnpm run typecheck"
   },
   "keywords": [],
   "engines": {
-    "node": ">=16",
+    "node": ">=18",
     "pnpm": ">=6"
   },
   "private": true,

packages/client/components/app/interface/channels/text/Message.tsx

@@ -184,7 +184,7 @@ export function Message(props: Props) {
             }
           >
             <NewUser>
-              <Tooltip content="New to Revolt" placement="top">
+              <Tooltip content={t("app.main.channel.new_to_upryzing")} placement="top">
                 <MdSpa {...iconSize(16)} />
               </Tooltip>
             </NewUser>
@@ -196,15 +196,16 @@ export function Message(props: Props) {
             }
           >
             <NewUser>
-              <Tooltip content="New to the server" placement="top">
+              <Tooltip content={t("app.main.channel.new_to_space")} placement="top">
                 <MdSpa {...iconSize(16)} />
               </Tooltip>
             </NewUser>
           </Match>
+          {/* pronounce example
           <Match when={props.message.authorId === "01EX2NCWQ0CHS3QJF0FEQS1GR4"}>
             <span />
             <span>he/him &middot; </span>
-          </Match>
+          </Match> */}
         </Switch>
       }
       compact={
@@ -228,10 +229,10 @@ export function Message(props: Props) {
             menuGenerator={(user) =>
               user
                 ? floatingUserMenus(
-                    user!,
-                    // TODO: try to fetch on demand member
-                    props.message.server?.getMember(user!.id)
-                  )
+                  user!,
+                  // TODO: try to fetch on demand member
+                  props.message.server?.getMember(user!.id)
+                )
                 : {}
             }
             isServer={!!props.message.server}

packages/client/components/app/interface/settings/user/Account.tsx

@@ -285,7 +285,7 @@ function ManageAccount() {
   const client = useClient();
   const mfa = createMfaResource();
 
-  const stillOwnServers = createMemo(
+  const stillOwnSpaces = createMemo(
     () =>
       client().servers.filter((server) => server.owner?.self || false).length >
       0
@@ -327,17 +327,17 @@ function ManageAccount() {
         {t("app.settings.pages.account.manage.disable")}
       </CategoryButton>
       <CategoryButton
-        action={stillOwnServers() ? undefined : "chevron"}
-        disabled={mfa.isLoading || stillOwnServers()}
+        action={stillOwnSpaces() ? undefined : "chevron"}
+        disabled={mfa.isLoading || stillOwnSpaces()}
         onClick={deleteAccount}
         icon={
           <MdDelete {...iconSize(22)} fill={theme!.customColours.error.color} />
         }
         description={t("app.settings.pages.account.manage.delete_description")}
       >
         {t(
-          stillOwnServers()
-            ? "app.settings.pages.account.manage.delete_still_own_servers"
+          stillOwnSpaces()
+            ? "app.settings.pages.account.manage.delete_still_own_spaces"
             : "app.settings.pages.account.manage.delete"
         )}
       </CategoryButton>

packages/client/components/app/interface/settings/user/Feedback.tsx

@@ -49,7 +49,7 @@ export default function Feedback() {
           </CategoryButton>
         </Link>
         <Link
-          href="https://github.com/revoltchat/frontend/issues/new/choose"
+          href="https://github.com/upryzing/lavender/issues/new/choose"
           target="_blank"
         >
           <CategoryButton
@@ -82,7 +82,7 @@ export default function Feedback() {
           onClick={() => void 0}
           description="You can report issues and discuss improvements with us directly here."
         >
-          Join the Revolt Lounge
+          Join the Upryzing Garden
         </CategoryButton>
       </CategoryButtonGroup>
     </Column>

packages/client/components/app/interface/settings/user/Native.tsx

@@ -24,7 +24,7 @@ export default function Native() {
             action={<Checkbox value onChange={(value) => void value} />}
             onClick={() => void 0}
             icon={<MdExitToApp {...iconSize(22)} />}
-            description="Launch Revolt when you log into your computer."
+            description="Launch Upryzing when you log into your computer."
           >
             Start with Computer
           </CategoryButton>
@@ -34,7 +34,7 @@ export default function Native() {
             action={<Checkbox value onChange={(value) => void value} />}
             onClick={() => void 0}
             icon={<MdCancelPresentation {...iconSize(22)} />}
-            description="Instead of closing, Revolt will hide in your tray."
+            description="Instead of closing, Upryzing will hide in your tray."
           >
             Minimise to Tray
           </CategoryButton>
@@ -46,7 +46,7 @@ export default function Native() {
             action={<Checkbox value onChange={(value) => void value} />}
             onClick={() => void 0}
             icon={<MdWebAsset {...iconSize(22)} />}
-            description="Let Revolt use its own custom titlebar."
+            description="Let Upryzing use its own custom titlebar."
           >
             Custom window frame
           </CategoryButton>
@@ -57,7 +57,7 @@ export default function Native() {
           icon={<MdDesktopWindows {...iconSize(22)} />}
           description="Version 1.0.0"
         >
-          Revolt Desktop
+          Upryzing Desktop
         </CategoryButton>
       </CategoryButtonGroup>
     </Column>

packages/client/components/auth/src/AuthPage.tsx

@@ -1,4 +1,4 @@
-import { BiLogosGithub, BiLogosMastodon, BiLogosTwitter } from "solid-icons/bi";
+import { BiLogosGithub, BiLogosMastodon } from "solid-icons/bi";
 import { JSX } from "solid-js";
 
 import { styled } from "styled-system/jsx";
@@ -153,16 +153,14 @@ export function AuthPage(props: { children: JSX.Element }) {
       <Nav>
         <NavItems variant="stack">
           <NavItems>
-            <LinkWithIcon href="https://github.com/revoltchat" target="_blank">
+            <LinkWithIcon href="https://github.com/upryzing" target="_blank">
               <BiLogosGithub size={24} />
             </LinkWithIcon>
-            <LinkWithIcon href="https://twitter.com/revoltchat" target="_blank">
-              <BiLogosTwitter size={24} />
-            </LinkWithIcon>
             <LinkWithIcon
-              href="https://mastodon.social/web/@revoltchat"
+              href="https://lea.pet/@upryzing"
               target="_blank"
             >
+              {/* before you ask: if the package had a fedi icon I'd use it */}
               <BiLogosMastodon size={24} />
             </LinkWithIcon>
           </NavItems>

packages/client/components/client/index.tsx

@@ -37,9 +37,8 @@ export function useApi() {
   return clientController.api;
 }
 
-export const IS_REVOLT =
-  import.meta.env.VITE_API_URL === "https://api.revolt.chat" ||
-  import.meta.env.VITE_API_URL === "https://revolt.chat/api" ||
+export const IS_UPRYZING =
+  import.meta.env.VITE_API_URL === "https://upryzing.app/api" ||
   typeof import.meta.env.VITE_API_URL !== "string";
 
 export const IS_DEV = import.meta.env.DEV;

packages/client/components/modal/modals/CreateInvite.tsx

@@ -1,6 +1,6 @@
 import { Match, Switch, createSignal, onMount } from "solid-js";
 
-import { IS_REVOLT, mapAnyError } from "@revolt/client";
+import { IS_UPRYZING, mapAnyError } from "@revolt/client";
 import { useTranslation } from "@revolt/i18n";
 import { Column, styled } from "@revolt/ui";
 
@@ -38,9 +38,10 @@ const CreateInvite: PropGenerator<"create_invite"> = (props) => {
       .createInvite()
       .then(({ _id }) =>
         setLink(
-          IS_REVOLT
-            ? `https://rvlt.gg/${_id}`
-            : `${window.location.protocol}//${window.location.host}/invite/${_id}`
+          // IS_UPRYZING
+          //   ? `https://upryzing.app/invite/${_id}`
+          //   : 
+          `${window.location.protocol}//${window.location.host}/invite/${_id}`
         )
       )
       .catch((err) =>

packages/client/index.html

@@ -13,7 +13,7 @@
       type="image/png"
       href="./public/assets/logo_round.png"
     />
-    <title>Revolt</title>
+    <title>Upryzing</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

packages/client/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "client",
-  "version": "0.0.0",
+  "name": "@upryzing/lavender",
+  "version": "0.1.0",
   "type": "module",
   "scripts": {
     "prepare": "panda codegen",
@@ -109,4 +109,4 @@
     "workbox-precaching": "^7.0.0"
   },
   "private": true
-}
+}

packages/client/src/Interface.tsx

@@ -62,7 +62,8 @@ const Interface = (props: { children: JSX.Element }) => {
           }}
         >
           <Notice>
-            ⚠️ This is beta software, things will break! State:{" "}
+            ⚠️ This is beta software. <b>Things will break!</b><br />
+            State:{" "}
             <Switch>
               <Match
                 when={clientController.lifecycle.state() === State.Connecting}

packages/client/src/index.tsx

@@ -49,7 +49,7 @@ attachDevtoolsOverlay();
 
 /** TEMPORARY */
 function MountTheme(props: { children: any }) {
-  const [accent, setAccent] = createSignal("#FF5733");
+  const [accent, setAccent] = createSignal("#dca3ff");
   const [darkMode, setDarkMode] = createSignal(false);
 
   (window as any)._demo_setAccent = setAccent;