ossapp

Author: mxcl

README.md

@@ -1,42 +1,24 @@
-![screenshot](https://user-images.githubusercontent.com/58962/235918362-48efad34-8f7b-4420-81db-abfa0d7cafe7.jpg)
-
-<p align="center">
-  <a href="https://twitter.com/teaxyz">
-    <img
-      src="https://img.shields.io/badge/-teaxyz-2675f5?logo=twitter&logoColor=fff"
-      alt="Twitter" />
-  </a>
-  <a href="https://discord.gg/JKzuqrW9">
-    <img
-      src="https://img.shields.io/discord/906608167901876256?label=discord&color=29f746"
-      alt="Discord" />
-  </a>
-  <a href="https://docs.tea.xyz">
-    <img
-      src="https://img.shields.io/badge/-docs-2675f5?logoColor=fff&color=ff00ff&logo=gitbook"
-      alt="Documentation & Manual" />
-  </a>
-</p>
-
-tea/gui is the graphical app complement to [`tea/cli`].
-
-Under the hood tea/gui installs and manages your packages with [`tea/cli`]
+![pkgx.dev](https://pkgx.dev/banner.png)
+
+`ossapp` is the graphical app complement to [`pkgx`].
+
+Under the hood `ossapp` installs and manages your packages with [`pkgx`]
 while exposing additional functionality, features and informational touches
 that complement and expand upon the nature of package management.
 
-To install the gui, visit: <https://tea.xyz/gui/> and download the latest
-version. The gui auto-updates itself.
+To install `ossapp`, visit: <https://pkgx.app> and download the latest
+version. `ossapp` auto-updates itself.
 
 &nbsp;
 
-# Contributing to `tea/gui`
+# Contributing
 
 If you have suggestions or ideas, start a [discussion]. If we agree, we’ll
 move it to an issue. Bug fixes straight to pull request or issue please!
 
 ## Anatomy
 
-tea/gui is a Svelte Electon app. The electron “backend” can be found in
+`ossapp` is a Svelte Electron app. The electron “backend” can be found in
 `electron/`, the Svelte “frontend” is in `svelte/`.
 
 The following technologies are used:
@@ -46,7 +28,7 @@ The following technologies are used:
 - [fontastic](https://fontastic.me)
 - [electron](http://electronjs.org)
 
-# Hacking on `tea/gui`
+# Hacking on `ossapp`
 
 ```sh
 xc setup  # only required once
@@ -58,7 +40,7 @@ xc dev    # opens the app in dev mode
 
 &nbsp;
 
-# Internationalization / Translations
+# i18n (Translating `ossapp`)
 
 We’d love your help in translating the gui into different languages.
 The translation related source code are all in `./svelte/src/libs/translations/*`.
@@ -187,19 +169,6 @@ V="$(node -p "require('./package.json').version")"
 tea gh release create "v$V"
 ```
 
-&nbsp;
-
-# Dependencies
-
-[`tea/cli`] will automagically make these available to your environment.
-
-| Project    | Version  |
-| ---------- | -------- |
-| nodejs.org | =18.16.0 |
-| npmjs.com  | >=9.7.2  |
-| xcfile.dev | >=0.4.1  |
-| python.org | ^3.11    |
-
-[`tea/cli`]: https://github.com/teaxyz/cli
+[`pkgx`]: https://github.com/pkgxdev/pkgx
 [`xc`]: https://xcfile.dev
-[discussion]: https://github.com/orgs/teaxyz/discussions
+[discussion]: https://github.com/orgs/pkgxdev/discussions

electron-builder.config.cjs

@@ -6,7 +6,7 @@ const _ = require("lodash");
 const appBundleId = "xyz.tea.gui";
 module.exports = {
   appId: appBundleId,
-  productName: "tea",
+  productName: "ossapp",
   asar: false,
   directories: { output: "dist" },
   files: ["electron/dist/electron.cjs", { from: "svelte/build", to: "" }],
@@ -22,7 +22,7 @@ module.exports = {
     minimumSystemVersion: "11"
   },
   dmg: {
-    background: "./electron/bg.png",
+    // background: "./electron/bg.png",
     window: {
       width: 684,
       height: 465

electron/Icons.icns

@@ -4,6 +4,7 @@ import fs from "fs";
 import log from "./logger";
 import { getTeaPath } from "./tea-dir";
 import { GUIPackage, Packages } from "../../svelte/src/libs/types";
+import { GUIBaseURL } from "../../svelte/src/libs/constants";
 import { isDev } from "./auto-updater";
 
 const pkgsFilePath = path.join(getTeaPath(), "tea.xyz/gui/pkgs.json");
@@ -45,7 +46,7 @@ export async function loadPackageCache(): Promise<Packages> {
         // possible user deletes cache files
         delete pkgs.packages[key].cached_image_url;
         if (rest.image_added_at) {
-          const prefix = `https://gui.tea.xyz/${dev ? "dev" : "prod"}/${rest.full_name}`;
+          const prefix = `https://${GUIBaseURL}/${dev ? "dev" : "prod"}/${rest.full_name}`;
           pkgs.packages[key].image_128_url = `${prefix}/128x128.webp`;
           pkgs.packages[key].image_512_url = `${prefix}/512x512.webp`;
         }

electron/icon.icns

@@ -3,6 +3,7 @@ import path from "path";
 import { app } from "electron";
 import log from "./logger";
 import { defaultImgUrl, type InstalledPackage } from "../../svelte/src/libs/types";
+import { GUIBaseURL } from "../../svelte/src/libs/constants";
 import { mkdirp } from "mkdirp";
 import fetch from "node-fetch";
 import { SemVer, semver } from "@teaxyz/lib";
@@ -195,7 +196,7 @@ async function downloadImage(url: string, imagePath: string): Promise<void> {
 
 export async function cacheImage(url: string): Promise<string> {
   const imageFolder = path.join(getGuiPath(), "cached_images");
-  let pkgFilePath = url.split("gui.tea.xyz")[1];
+  let pkgFilePath = url.split(GUIBaseURL)[1] ?? "";
   //unfortunately we have prod in image url so strip it if it's present
   if (pkgFilePath.startsWith("/prod")) {
     pkgFilePath = pkgFilePath.replace("/prod", "");

electron/libs/package.ts

@@ -93,7 +93,6 @@ export async function getHeaders(path: string, session: Session) {
 
 export async function syncLogsAt(prefix: string) {
   const logDir = path.join(app.getPath("home"), "Library/Logs/tea");
-  // ['/Users/neil/Library/Logs/tea/main.log']
   const logFiles = await deepReadDir({ dir: logDir });
   const files = logFiles.map((p) => {
     const paths = p.split("/");

electron/libs/tea-dir.ts

@@ -1,9 +1,9 @@
 {
-  "name": "tea",
-  "version": "0.2.57",
+  "name": "ossapp",
+  "version": "0.3.0",
   "private": true,
-  "description": "tea gui app",
-  "author": "tea.xyz",
+  "description": "The Open Source App Store",
+  "author": "pkgx inc. <[email protected]>",
   "main": "electron/dist/electron.cjs",
   "type": "module",
   "scripts": {
@@ -145,6 +145,7 @@
     "xterm-addon-fit": "^0.7.0",
     "yaml": "^2.2.1"
   },
-  "homepage": "https://tea.xyz",
-  "repository": "https://github.com/teaxyz/gui.git"
+  "homepage": "https://pkgx.app",
+  "repository": "https://github.com/pkgxdev/ossapp.git",
+  "tea": "node^18.16 npm^9.7.2 python^3.11 xc make"
 }

electron/libs/v1-client.ts

@@ -51,7 +51,6 @@
     [SideMenuOptions.new_packages]: (pkg: GUIPackage) => {
       return moment(pkg.created_at).isAfter(moment().subtract(15, "days"));
     },
-    [SideMenuOptions.made_by_tea]: (pkg: GUIPackage) => pkg.full_name.includes("tea.xyz"),
     [SideMenuOptions.local]: (pkg: GUIPackage) => !!pkg.is_local
   };
 

icon.png

@@ -3,7 +3,6 @@
   import { authStore } from "$libs/stores";
 
   const { user } = authStore;
-  // const authPage = `http://localhost:3000/v1/auth/user?device_id=${authStore.deviceId}`; // https://app.tea.xyz/v1/auth/user?device_id=device_id
 </script>
 
 {#if $user}

package-lock.json

@@ -37,7 +37,7 @@
   >
     <button
       class="outline-gray hover:bg-gray h-7 w-full p-1 text-left outline-1 hover:bg-opacity-25 hover:outline"
-      on:click={() => shellOpenExternal("https://docs.tea.xyz")}
+      on:click={() => shellOpenExternal("https://docs.pkgx.dev")}
     >
       docs
     </button>

package.json

@@ -73,12 +73,6 @@
       on:click={() => goto(`/?tab=${SideMenuOptions.recently_updated}`)}
     />
     <hr />
-    <MenuButton
-      label={$t("tags.made_by_tea").toLowerCase()}
-      icon="tea-logo-iconasset-1"
-      active={activeOption === SideMenuOptions.made_by_tea}
-      on:click={() => goto(`/?tab=${SideMenuOptions.made_by_tea}`)}
-    />
     {#if hasLocalPackages}
       <MenuButton
         label={$t("tags.local_packages").toLowerCase()}

svelte/src/components/packages/packages.svelte

@@ -1,37 +1,10 @@
 <script lang="ts">
   import { authStore } from "$libs/stores";
-  import { getSession } from "@native";
-  import { getBaseURL } from "$libs/v1-client";
-  import { shellOpenExternal, pollDeviceSession } from "@native";
   import mouseLeaveDelay from "$components/lib/mouse-leave-delay";
   const { user } = authStore;
 
-  $: authenticating = false;
-
   $: isLogoutOpen = false;
 
-  const openGithub = async () => {
-    if (!authenticating) {
-      authenticating = true;
-      try {
-        const session = await getSession();
-
-        if (session && session.device_id) {
-          const baseUrl = await getBaseURL();
-          shellOpenExternal(`${baseUrl}/v1/auth/user?device_id=${session.device_id}`);
-          pollDeviceSession();
-        } else {
-          throw new Error("possible no internet connection");
-        }
-      } catch (error) {
-        console.error(error);
-      } finally {
-        authenticating = false;
-      }
-    }
-    isLogoutOpen = false;
-  };
-
   const logout = () => authStore.clearSession();
 
   const preventDoubleClick = (evt: MouseEvent) => evt.stopPropagation();
@@ -66,14 +39,14 @@
     </div>
   </div>
 {:else}
-  <button
+  <!-- <button
     class="border-gray text-gray h-[28px] w-[120px] rounded-sm border px-1 text-sm transition-all hover:bg-[#e1e1e1] hover:text-black"
     class:animate-pulse={authenticating}
     on:click={openGithub}
     on:dblclick={preventDoubleClick}
   >
     log in
-  </button>
+  </button> -->
 {/if}
 
 <style>

svelte/src/components/profile-banner/profile-banner.svelte

@@ -12,9 +12,19 @@
   let { nextPath, prevPath } = navStore;
 
   let dev = false;
+
   onMount(async () => {
     dev = await isDev();
   });
+
+  let imgsrc = "Default";
+
+  function hover() {
+    imgsrc = "Hover";
+  }
+  function mouseout() {
+    imgsrc = "Default";
+  }
 </script>
 
 <header
@@ -25,7 +35,13 @@
   <ul class="text-gray flex h-10 items-center gap-1 pl-20 align-middle leading-10">
     <a href="/?tab=discover" data-testid="home-button">
       <div class="home-btn w-12 text-center text-2xl">
-        <i class="icon-tea-logo-iconasset-1" />
+        <!-- svelte-ignore a11y-mouse-events-have-key-events -->
+        <img
+          src="/images/home-btn/State={imgsrc}.svg"
+          alt="home"
+          on:mouseover={hover}
+          on:mouseout={mouseout}
+        />
       </div>
     </a>
     <p class="text-gray px-2">{dev ? "dev" : "beta"}</p>
@@ -76,18 +92,16 @@
     width: 46px;
     line-height: 46px;
     padding-left: 3px;
-    background-size: cover;
-    background-position: center center;
-    background-image: url("/images/gradient-bg.png");
-    color: #222222;
-  }
-
-  .home-btn:hover {
-    color: white;
   }
   p {
     font-size: 10px;
   }
+  .home-btn img {
+    display: inline;
+  }
+  .home-btn img:hover {
+    display: inline;
+  }
 
   .home-btn:active {
     color: #222222;

svelte/src/components/settings-menu/settings-menu.svelte

@@ -0,0 +1 @@
+export const GUIBaseURL = "gui.pkgx.dev";

svelte/src/components/side-menu/side-menu.svelte

@@ -2,6 +2,7 @@ import log from "$libs/logger";
 import { PackageStates, type GUIPackage } from "$libs/types";
 import SemVer from "@teaxyz/lib/semver";
 import { t } from "$libs/translations";
+import { GUIBaseURL } from "$libs/constants";
 
 // Find a list of available versions for a package based on the bottles
 export const findAvailableVersions = (pkg: Pick<GUIPackage, "bottles" | "version">) => {
@@ -100,7 +101,7 @@ export const newLocalPackage = (
   installed_versions: string[],
   dev: boolean
 ): GUIPackage => {
-  const prefix = `https://gui.tea.xyz/${dev ? "dev" : "prod"}/localplaceholder`;
+  const prefix = `https://${GUIBaseURL}/${dev ? "dev" : "prod"}/localplaceholder`;
 
   return {
     full_name: full_name,

svelte/src/components/top-bar/login-button.svelte

@@ -3,6 +3,7 @@ import type { Contributor, GUIPackage, Package } from "$libs/types";
 import yaml from "js-yaml";
 import { isDev } from "@native";
 import log from "./logger";
+import { GUIBaseURL } from "./constants";
 export async function getPackageYaml(pkgYamlUrl: string) {
   const url = pkgYamlUrl.replace("/github.com", "/raw.githubusercontent.com").replace("/blob", "");
 
@@ -20,7 +21,7 @@ export async function getReadme(
   let data = "";
   try {
     const stage = (await isDev()) ? "dev" : "prod";
-    const reqHTML = await axios.get(`https://gui.tea.xyz/${stage}/${pkg.full_name!}/readme.html`);
+    const reqHTML = await axios.get(`https://${GUIBaseURL}/${stage}/${pkg.full_name!}/readme.html`);
     if (reqHTML.status === 200 && reqHTML.data) {
       return {
         data: reqHTML.data,