diff --git a/pkg/bitcoin/desk.docket b/pkg/bitcoin/desk.docket index cb232ef71f..d2e346c472 100644 --- a/pkg/bitcoin/desk.docket +++ b/pkg/bitcoin/desk.docket @@ -1,6 +1,6 @@ :~ title+'Bitcoin' - info+'BTC wallet for Urbit. Testing' + info+'A Bitcoin Wallet that lets you send and receive Bitcoin directly to and from other Urbit users' color+0xf9.8e40 glob-http+['https://bootstrap.urbit.org/glob-0v4.ghaim.of1as.9ucee.uj93f.a9nbs.glob' 0v4.ghaim.of1as.9ucee.uj93f.a9nbs] image+'https://urbit.ewr1.vultrobjects.com/hastuc-dibtux/2021.8.24..02.57.38-bitcoin.svg' diff --git a/pkg/garden/desk.docket b/pkg/garden/desk.docket index b120df5d9d..163d9104b4 100644 --- a/pkg/garden/desk.docket +++ b/pkg/garden/desk.docket @@ -1,5 +1,5 @@ -:~ title+'Garden' - info+'An app launcher for Urbit. ' +:~ title+'System' + info+'An app launcher for Urbit.' color+0xee.5432 glob-http+['https://bootstrap.urbit.org/glob-0v2.dne76.9hibl.1o442.h6l11.cn7os.glob' 0v2.dne76.9hibl.1o442.h6l11.cn7os] glob-http+['https://bootstrap.urbit.org/glob-0v7.1jqf3.5gao8.67i4k.64c49.i6kr8.glob' 0v7.1jqf3.5gao8.67i4k.64c49.i6kr8] diff --git a/pkg/grid/index.html b/pkg/grid/index.html index d1cc3aae81..42aa10f50a 100644 --- a/pkg/grid/index.html +++ b/pkg/grid/index.html @@ -3,7 +3,7 @@ - Landscape • Home + Urbit • Home diff --git a/pkg/grid/package-lock.json b/pkg/grid/package-lock.json index 81477503ad..656c6cd5ae 100644 --- a/pkg/grid/package-lock.json +++ b/pkg/grid/package-lock.json @@ -915,6 +915,23 @@ "eslint-visitor-keys": "^2.0.0" } }, + "@urbit/vite-plugin-urbit": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@urbit/vite-plugin-urbit/-/vite-plugin-urbit-0.2.0.tgz", + "integrity": "sha512-plYJnjdLw/KAIP8w7ER9lgBNKDSEVhI9Oka6s4rOZDOOudqjzpP5Fh7iFapaWtIDAZ6MKla/Cu+JZiw95jEDkg==", + "dev": true, + "requires": { + "vite-plugin-html-config": "^1.0.6" + }, + "dependencies": { + "vite-plugin-html-config": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/vite-plugin-html-config/-/vite-plugin-html-config-1.0.6.tgz", + "integrity": "sha512-cEC4AT96Bmq60wgDiR90zvIlArCZFoaHhO4DoCmvsN22I2Y5azFatGvH1lG3EStssDQExX9OuTmJN5CsD9/AWA==", + "dev": true + } + } + }, "@vitejs/plugin-react-refresh": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-refresh/-/plugin-react-refresh-1.3.6.tgz", diff --git a/pkg/grid/package.json b/pkg/grid/package.json index 83d1345330..6319b67195 100644 --- a/pkg/grid/package.json +++ b/pkg/grid/package.json @@ -51,6 +51,7 @@ "@types/react-router-dom": "^5.1.8", "@typescript-eslint/eslint-plugin": "^4.26.1", "@typescript-eslint/parser": "^4.26.1", + "@urbit/vite-plugin-urbit": "^0.3.0", "@vitejs/plugin-react-refresh": "^1.3.1", "autoprefixer": "^10.3.1", "eslint": "^7.28.0", diff --git a/pkg/grid/src/nav/Help.tsx b/pkg/grid/src/nav/Help.tsx index 53901f442e..51db624b9a 100644 --- a/pkg/grid/src/nav/Help.tsx +++ b/pkg/grid/src/nav/Help.tsx @@ -6,17 +6,6 @@ export const Help = () => {
-
-

User Help Docs

- - tlon.io/help - -

For general help, ask the community

{

For all other issues:

 - support@tlon.io + support@urbit.org
diff --git a/pkg/grid/src/nav/Leap.tsx b/pkg/grid/src/nav/Leap.tsx index ba6145ea43..1d3c4332df 100644 --- a/pkg/grid/src/nav/Leap.tsx +++ b/pkg/grid/src/nav/Leap.tsx @@ -234,13 +234,13 @@ export const Leap = React.forwardRef( !selection && 'sr-only' )} > - {selection || 'Search Landscape'} + {selection || 'Search'} { const { push } = useHistory(); const [copied, setCopied] = useState(false); - const garden = useVat('garden'); + const garden = useVat(window.desk); const hash = garden ? getHash(garden) : null; const isMobile = useMedia('(max-width: 639px)'); @@ -116,12 +116,12 @@ export const SystemMenu = ({ className, open, subMenuOpen, shouldDim }: SystemMe - About Landscape + About {hash && (
- Grid + Home
-

Hello there, welcome to Grid!

+

Hello there, and welcome!

diff --git a/pkg/grid/src/nav/notifications/SystemNotification.tsx b/pkg/grid/src/nav/notifications/SystemNotification.tsx index 8354145591..8d3f824009 100644 --- a/pkg/grid/src/nav/notifications/SystemNotification.tsx +++ b/pkg/grid/src/nav/notifications/SystemNotification.tsx @@ -55,7 +55,7 @@ export const BaseBlockedNotification = () => {
- Landscape + System
diff --git a/pkg/grid/src/nav/preferences/NotificationPrefs.tsx b/pkg/grid/src/nav/preferences/NotificationPrefs.tsx index 70e6f47190..ea09e915e5 100644 --- a/pkg/grid/src/nav/preferences/NotificationPrefs.tsx +++ b/pkg/grid/src/nav/preferences/NotificationPrefs.tsx @@ -37,8 +37,8 @@ export const NotificationPrefs = () => { disabled={doNotDisturb && !secure} >

- Block visual desktop notifications whenever Urbit software produces an in-Landscape - notification badge. + Block visual desktop notifications whenever Urbit software produces a notification + badge.

Turning this "off" will prompt your browser to ask if you'd like to diff --git a/pkg/grid/src/state/mock-data.ts b/pkg/grid/src/state/mock-data.ts index b0dc475253..732915e19e 100644 --- a/pkg/grid/src/state/mock-data.ts +++ b/pkg/grid/src/state/mock-data.ts @@ -35,7 +35,7 @@ export const mockTreaties: Treaties = { '~zod/garden': { ship: '~zod', desk: 'garden', - title: 'Landscape', + title: 'System', info: 'Your Urbit Home', href: makeHref('garden'), color: '#E2C050', diff --git a/pkg/grid/vite.config.ts b/pkg/grid/vite.config.ts index dd769daa9e..c282e93eba 100644 --- a/pkg/grid/vite.config.ts +++ b/pkg/grid/vite.config.ts @@ -2,13 +2,9 @@ import { loadEnv, defineConfig } from 'vite'; import analyze from 'rollup-plugin-analyzer'; import { visualizer } from 'rollup-plugin-visualizer'; import reactRefresh from '@vitejs/plugin-react-refresh'; -import htmlPlugin from 'vite-plugin-html-config'; +import urbitPlugin from '@urbit/vite-plugin-urbit'; import { execSync } from 'child_process'; -const htmlPluginOpt = { - headScripts: [{ src: '/apps/grid/desk.js' }, { src: '/session.js' }] -}; - // using current commit until release const GIT_DESC = execSync('git rev-parse --short HEAD', { encoding: 'utf8' }).trim(); process.env.VITE_SHORTHASH = GIT_DESC; @@ -24,17 +20,7 @@ export default ({ mode }) => { server: mode === 'mock' ? undefined - : { - https: true, - proxy: { - '^/apps/grid/desk.js': { - target: SHIP_URL - }, - '^((?!/apps/grid).)*$': { - target: SHIP_URL - } - } - }, + : { https: true }, build: mode !== 'profile' ? undefined @@ -48,6 +34,6 @@ export default ({ mode }) => { ] } }, - plugins: [htmlPlugin(htmlPluginOpt), reactRefresh()] + plugins: [urbitPlugin({ base: 'grid', target: SHIP_URL }), reactRefresh()] }); }; diff --git a/pkg/webterm/desk.docket b/pkg/webterm/desk.docket index 2508dea044..ce49ff7354 100644 --- a/pkg/webterm/desk.docket +++ b/pkg/webterm/desk.docket @@ -1,5 +1,5 @@ -:~ title+'Web Terminal' - info+'A web interface for dill, through herm.' +:~ title+'Terminal' + info+'A web interface to your Urbit\'s command line (the dojo).' color+0x2e.4347 glob-http+['https://bootstrap.urbit.org/glob-0v4.8ui32.ui10d.t0v4d.n9g1s.1ftua.glob' 0v4.8ui32.ui10d.t0v4d.n9g1s.1ftua] base+'webterm'