From df4257038a5b2cc511f0c7d3b05cfca020bc01f1 Mon Sep 17 00:00:00 2001 From: jog1t <39823706+jog1t@users.noreply.github.com> Date: Mon, 13 Jan 2025 05:07:08 +0000 Subject: [PATCH] chore: sync fe repo (#1829) ## Changes --- .../apps/hub/src/components/get-started.tsx | 8 +--- .../initial-setup-install-rivet-cli-cmd.sh | 1 + ...tial-setup-install-rivet-cli-powershell.sh | 1 + .../initial-setup-install-rivet-cli-source.sh | 2 + .../initial-setup-install-rivet-cli-unix.sh | 1 + .../initial-setup-install-rivet-cli.sh | 1 - .../src/components/onboarding/install-cli.tsx | 48 +++++++++++++++++++ .../components/billing/billing-plan-badge.tsx | 4 +- 8 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-cmd.sh create mode 100644 frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-powershell.sh create mode 100644 frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-source.sh create mode 100644 frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-unix.sh delete mode 100644 frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli.sh create mode 100644 frontend/apps/hub/src/components/onboarding/install-cli.tsx diff --git a/frontend/apps/hub/src/components/get-started.tsx b/frontend/apps/hub/src/components/get-started.tsx index 71764eab2..836947abe 100644 --- a/frontend/apps/hub/src/components/get-started.tsx +++ b/frontend/apps/hub/src/components/get-started.tsx @@ -27,15 +27,13 @@ import { } from "@rivet-gg/icons"; import { motion, useMotionValueEvent, useScroll } from "framer-motion"; import { type ComponentProps, useState } from "react"; -import installCli, { - source as installCliSource, -} from "./onboarding/initial-setup-install-rivet-cli.sh?shiki&lang=bash"; import setupCli, { source as setupCliSource, } from "./onboarding/initial-setup-setup-rivet-cli.sh?shiki&lang=bash"; import testCli, { source as testCliSource, } from "./onboarding/initial-setup-test-rivet-cli.sh?shiki&lang=bash"; +import { InstallCli } from "./onboarding/install-cli"; const containerVariants = { hidden: { @@ -88,9 +86,7 @@ export function GetStarted() {

1. Install

- - {installCli} - +

2. Setup

diff --git a/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-cmd.sh b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-cmd.sh new file mode 100644 index 000000000..5e3ba32e2 --- /dev/null +++ b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-cmd.sh @@ -0,0 +1 @@ +powershell -Command "iwr https://releases.rivet.gg/rivet/latest/install.ps1 -useb | iex" \ No newline at end of file diff --git a/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-powershell.sh b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-powershell.sh new file mode 100644 index 000000000..10910f5a1 --- /dev/null +++ b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-powershell.sh @@ -0,0 +1 @@ +iwr https://releases.rivet.gg/rivet/latest/install.ps1 -useb | iex \ No newline at end of file diff --git a/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-source.sh b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-source.sh new file mode 100644 index 000000000..fa6ff9d99 --- /dev/null +++ b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-source.sh @@ -0,0 +1,2 @@ +git clone https://github.com/rivet-gg/rivet +cargo build --bin rivet diff --git a/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-unix.sh b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-unix.sh new file mode 100644 index 000000000..12a43a361 --- /dev/null +++ b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli-unix.sh @@ -0,0 +1 @@ +curl -fsSL https://releases.rivet.gg/rivet/latest/install.sh | sh \ No newline at end of file diff --git a/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli.sh b/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli.sh deleted file mode 100644 index 30404ce4c..000000000 --- a/frontend/apps/hub/src/components/onboarding/initial-setup-install-rivet-cli.sh +++ /dev/null @@ -1 +0,0 @@ -TODO \ No newline at end of file diff --git a/frontend/apps/hub/src/components/onboarding/install-cli.tsx b/frontend/apps/hub/src/components/onboarding/install-cli.tsx new file mode 100644 index 000000000..1b74dabe6 --- /dev/null +++ b/frontend/apps/hub/src/components/onboarding/install-cli.tsx @@ -0,0 +1,48 @@ +import { CodeFrame, CodeGroup, CodeSource } from "@rivet-gg/components"; +import installCliCmd, { + source as installCliCmdSource, +} from "./initial-setup-install-rivet-cli-cmd.sh?shiki&lang=bash"; +import installCliPowerShell, { + source as installCliPowerShellSource, +} from "./initial-setup-install-rivet-cli-powershell.sh?shiki&lang=bash"; +import installCliSource, { + source as installCliSourceSource, +} from "./initial-setup-install-rivet-cli-source.sh?shiki&lang=bash"; +import installCliUnix, { + source as installCliUnixSource, +} from "./initial-setup-install-rivet-cli-unix.sh?shiki&lang=bash"; + +export function InstallCli() { + return ( + + + {installCliUnix} + + + {installCliCmd} + + + {installCliPowerShell} + + + {installCliSource} + + + ); +} diff --git a/frontend/apps/hub/src/domains/project/components/billing/billing-plan-badge.tsx b/frontend/apps/hub/src/domains/project/components/billing/billing-plan-badge.tsx index 97bc40a0c..da6adb26e 100644 --- a/frontend/apps/hub/src/domains/project/components/billing/billing-plan-badge.tsx +++ b/frontend/apps/hub/src/domains/project/components/billing/billing-plan-badge.tsx @@ -59,6 +59,8 @@ export function BillingPlanBadge({ projectId }: BillingPlanBadgeProps) { return ; } -export function ProjectBillingPlanLabel({ plan }: { plan: Rivet.ee.billing.Plan }) { +export function ProjectBillingPlanLabel({ + plan, +}: { plan: Rivet.ee.billing.Plan }) { return BILLING_PLAN_LABELS[plan]; }