diff --git a/.github/config/applications.json b/.github/config/applications.json new file mode 100644 index 00000000..39d33855 --- /dev/null +++ b/.github/config/applications.json @@ -0,0 +1,14 @@ +{ + "jarvis": { + "eks_cluster_name": "ascending-s-api-cluster", + "aws_deploy_role": "SAAS_AWS_DEPLOY_ROLE_ARN" + }, + "jarvis-demo": { + "eks_cluster_name": "ascending-s-api-cluster", + "aws_deploy_role": "SAAS_AWS_DEPLOY_ROLE_ARN" + }, + "askcto": { + "eks_cluster_name": "ascending-askcto-cluster", + "aws_deploy_role": "AWS_DEPLOY_ROLE_ARN" + } +} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml new file mode 100644 index 00000000..4e097735 --- /dev/null +++ b/.github/workflows/deploy.yaml @@ -0,0 +1,155 @@ +name: Deploy Admin Panel + +on: + push: + branches: + - main + paths: + - 'src/**' + - 'server.ts' + - 'package.json' + - 'bun.lock' + - 'Dockerfile' + - '.github/workflows/deploy.yaml' + workflow_dispatch: + inputs: + application: + description: 'Application to deploy to' + type: choice + required: true + default: jarvis + options: + - jarvis + - askcto + - jarvis-demo + region: + description: 'AWS Region to deploy to' + type: string + required: true + default: us-east-1 + +permissions: + id-token: write + contents: read + +run-name: Deploy Admin Panel for ${{ inputs.application }} + +jobs: + test: + name: Lint, Type Check & Tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + + - uses: oven-sh/setup-bun@v2 + + - name: Install dependencies + run: bun install --frozen-lockfile + + - name: ESLint + run: bunx eslint src/ --max-warnings 0 + + - name: TypeScript + run: bunx tsc --noEmit + + - name: Vitest + run: bun run test + env: + NODE_ENV: development + SESSION_SECRET: ci-test-secret-do-not-use-in-production + + build-and-push: + name: Build & Push to ECR + runs-on: ubuntu-latest + needs: test + outputs: + image: ${{ steps.tags.outputs.ecr_image }} + steps: + - uses: actions/checkout@v6 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Assume IAM role + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.SAAS_AWS_DEPLOY_ROLE_ARN }} + role-session-name: deployment-role-session + aws-region: ${{ inputs.region || 'us-east-1' }} + + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v2 + with: + registries: "897729109735" + + - name: Determine image tags + id: tags + run: | + ECR_IMAGE="${{ steps.login-ecr.outputs.registry }}/jarvis/admin-panel" + echo "ecr_image=${ECR_IMAGE}:${{ github.sha }}" >> $GITHUB_OUTPUT + echo "tags=${ECR_IMAGE}:${{ github.sha }},${ECR_IMAGE}:latest" >> $GITHUB_OUTPUT + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64 + push: true + tags: ${{ steps.tags.outputs.tags }} + provenance: false + + deploy: + name: Deploy to EKS + runs-on: ubuntu-latest + needs: build-and-push + if: github.event_name == 'workflow_dispatch' + env: + DEPLOYMENT_NAME: jarvis-admin-panel + steps: + - uses: actions/checkout@v6 + + - name: Load Application Configuration + id: config + run: | + CONFIG=$(cat .github/config/applications.json | jq -r --arg app "${{ inputs.application }}" '.[$app]') + echo "eks_cluster_name=$(echo $CONFIG | jq -r '.eks_cluster_name')" >> $GITHUB_OUTPUT + echo "aws_deploy_role=$(echo $CONFIG | jq -r '.aws_deploy_role')" >> $GITHUB_OUTPUT + + - name: Install kubectl + uses: azure/setup-kubectl@v3 + with: + version: latest + + - name: Set IAM role to assume + id: set-role + run: echo "role=${{ secrets[steps.config.outputs.aws_deploy_role] }}" >> $GITHUB_OUTPUT + + - name: Assume IAM role + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ steps.set-role.outputs.role }} + role-session-name: deployment-role-session + aws-region: ${{ inputs.region }} + + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v2 + with: + registries: "897729109735" + + - name: Update kubeconfig + run: aws eks update-kubeconfig --name ${{ steps.config.outputs.eks_cluster_name }} --region ${{ inputs.region }} + + - name: Update image on EKS + run: | + kubectl set image deploy/${{ env.DEPLOYMENT_NAME }} \ + jarvis-admin-panel=${{ needs.build-and-push.outputs.image }} \ + -n ${{ inputs.application }} + + - name: Restart pods + run: kubectl rollout restart deploy/${{ env.DEPLOYMENT_NAME }} -n ${{ inputs.application }} + + - name: Check pod status + run: kubectl rollout status deploy/${{ env.DEPLOYMENT_NAME }} -n ${{ inputs.application }} diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index 96a21d1f..00000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Docker Image Publish - -on: - workflow_dispatch: - push: - branches: - - main - paths: - - 'src/**' - - 'server.ts' - - 'package.json' - - 'bun.lock' - - 'Dockerfile' - - '.github/workflows/docker-publish.yml' - -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile - push: true - tags: | - ghcr.io/clickhouse/librechat-admin-panel:${{ github.sha }} - ghcr.io/clickhouse/librechat-admin-panel:latest - platforms: linux/amd64,linux/arm64 diff --git a/public/clickhouse-dark.svg b/public/clickhouse-dark.svg deleted file mode 100644 index d3a8e478..00000000 --- a/public/clickhouse-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/clickhouse-light.svg b/public/clickhouse-light.svg deleted file mode 100644 index 6543c1d6..00000000 --- a/public/clickhouse-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png new file mode 100644 index 00000000..c55272f0 Binary files /dev/null and b/public/favicon-32x32.png differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index f8fced34..00000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/librechat-logo.svg b/public/librechat-logo.svg deleted file mode 100644 index b455209c..00000000 --- a/public/librechat-logo.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/manifest.json b/public/manifest.json index 52708d81..932db358 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "LibreChat Admin", - "name": "LibreChat Admin Panel", + "short_name": "Jarvis Chat Admin", + "name": "Jarvis Chat Admin Panel", "icons": [ { "src": "favicon.ico", diff --git a/src/assets/jarvis.svg b/src/assets/jarvis.svg new file mode 100644 index 00000000..d9879632 --- /dev/null +++ b/src/assets/jarvis.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 98f6d770..b75f7cde 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -3,7 +3,7 @@ import { Icon, Dropdown } from '@clickhouse/click-ui'; import { Link, useRouter } from '@tanstack/react-router'; import type * as t from '@/types'; import { useStripAriaExpanded, useCapabilities, useLocalize } from '@/hooks'; -import libreChatLogo from '@/assets/librechat.svg'; +import jarvisLogo from '@/assets/jarvis.svg'; import { SettingsDialog } from './SettingsDialog'; import { SystemCapabilities } from '@/constants'; import { getInitials, cn } from '@/utils'; @@ -84,7 +84,7 @@ export function Sidebar({ user, collapsed, onToggle }: t.SidebarProps) { >
- {localize('com_a11y_logo_alt')} + {localize('com_a11y_logo_alt')} {localize('com_auth_title')} diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index 9719e257..0dd70ab4 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -730,7 +730,7 @@ "com_ui_active": "Active", "com_ui_paused": "Paused", "com_users_title": "User management", - "com_users_subtitle": "Manage users, roles, and permissions for LibreChat", + "com_users_subtitle": "Manage users, roles, and permissions for Jarvis Chat", "com_users_add": "Add user", "com_users_total": "Total users", "com_users_admins": "Admins", @@ -882,7 +882,7 @@ "com_help_subtitle": "Documentation, guides, and support resources", "com_help_resources": "Resources", "com_help_docs_title": "Documentation", - "com_help_docs_desc": "Comprehensive guides for configuring and running LibreChat", + "com_help_docs_desc": "Comprehensive guides for configuring and running Jarvis Chat", "com_help_api_title": "Configuration reference", "com_help_api_desc": "Detailed reference for librechat.yaml and environment setup", "com_help_community_title": "Community", @@ -890,7 +890,7 @@ "com_help_discord_title": "Discord", "com_help_discord_desc": "Chat with the community and get support on Discord", "com_help_support": "Support", - "com_help_support_text": "Need help? Contact your system administrator or visit the LibreChat documentation for troubleshooting guides.", + "com_help_support_text": "Need help? Contact your system administrator or visit the Jarvis Chat documentation for troubleshooting guides.", "com_a11y_results_found": "{{count}} results found", "com_a11y_filter_changed": "Filter updated, {{count}} results", "com_a11y_value_hidden": "{{key}} value hidden", @@ -995,12 +995,12 @@ "com_nav_collapse_sidebar": "Collapse sidebar", "com_nav_dashboard": "Dashboard", "com_dash_title": "Welcome!", - "com_dash_subtitle": "Here's everything you need to manage your LibreChat instance.", + "com_dash_subtitle": "Here's everything you need to manage your Jarvis Chat instance.", "com_dash_quick_links": "Quick links", "com_dash_config_desc": "View and manage instance configuration settings.", "com_dash_access_desc": "Create and manage groups, assign roles, and fine-tune member permissions across your organization.", "com_dash_grants_desc": "Control which capabilities each role has access to, from reading configs to managing users.", - "com_dash_help_desc": "Links to documentation, community resources, and support channels to help you get the most out of LibreChat.", + "com_dash_help_desc": "Links to documentation, community resources, and support channels to help you get the most out of Jarvis Chat.", "com_dash_nav_tips": "Getting around", "com_dash_tip_sidebar": "The sidebar gives you access to every page: Configuration, Access, Grants, and Help. Toggle it open to see labels or collapse it down to just icons.", "com_dash_tip_cmdk": "The command menu lets you search for and jump to any page, configuration section, or config tab. You can also switch between light, dark, and system themes within the menu.", @@ -1027,5 +1027,5 @@ "com_kv_type_number": "123", "com_kv_type_boolean": "T/F", "com_kv_type_json": "{ }", - "com_a11y_logo_alt": "LibreChat logo" + "com_a11y_logo_alt": "Jarvis Chat logo" } diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx index fcc82e70..fd50eb45 100644 --- a/src/routes/__root.tsx +++ b/src/routes/__root.tsx @@ -36,7 +36,7 @@ export const Route = createRootRoute({ content: 'width=device-width, initial-scale=1', }, { - title: 'LibreChat Admin Panel', + title: 'Jarvis Chat Admin Panel', }, ], links: [ @@ -46,7 +46,8 @@ export const Route = createRootRoute({ }, { rel: 'icon', - href: '/favicon.ico', + type: 'image/png', + href: '/favicon-32x32.png', }, ], }),