feat: Dekstop Revamp (#2877)

* feat: desktop revamp * feat: refactor system monitor * fix linter CI * remove unused import component * added responsive and resizeable component * responsive and resizeable local server page * finalize responsive and resizeable component * fix scroll custom ui * remove react scroll to bottom from modal troubleshoot * fix modal troubleshoot ui * fix setting gpu list * text area custom scroll bar * fix padding message input * cleanup classname * update inference engine model dropdown * update loader style * update quick ask ui * prepare theme provider * update dark theme * remove update hotkey list model and navigation * fix: cleanup hardcode classname * fix: update feedback * Set native theme electron * update destop ui revamp from feedback * update button icon component insider icon chat input message * update model dropdown ui * update tranaparent baclground * update logo model provider * fix: set background material acrylic support to blur background windows * fix: update tranparent left and right panel * fix: linter CI * update app using frameless window * styling custom style minimize, maximize and close app * temporary hidden maximize window * fix: responsive left and right panel * fix: enable click outside when leftpanel responsive * fix: remove unused import * update transparent variable css windows * fix: ui import model * feat: Support Theme system (#2946) * feat: update support theme system * update select component * feat: add theme folder in root project * fix: padding left and right center panel * fix: update padding left and right * chore: migrate themes * fix: rmdirsync error * chore: update gitignore * fix: cp recursive * fix: files electron package json * fix: migration * fix: update fgit ignore --------- Co-authored-by: Louis <[email protected]> * fix: update feedback missing state when refrash app * fix: error test CI * chore: refactor useLoadThemes * chore: cleanup unused vars * fix: revert back menubar windows * fix minor ui * fix: minor ui --------- Co-authored-by: Louis <[email protected]>
janhq · May 29, 2024 · faa09bd · faa09bd
1 parent 611a361
commit faa09bd
Show file tree

Hide file tree

Showing 287 changed files with 8,701 additions and 7,649 deletions.
diff --git a/.github/workflows/jan-electron-linter-and-test.yml b/.github/workflows/jan-electron-linter-and-test.yml
@@ -6,35 6,35 @@ on:
  - main
  - dev
  paths:
- - "electron/**"
  - 'electron/**'
  - .github/workflows/jan-electron-linter-and-test.yml
- - "web/**"
- - "uikit/**"
- - "package.json"
- - "node_modules/**"
- - "yarn.lock"
- - "core/**"
- - "extensions/**"
- - "!README.md"
- - "Makefile"
  - 'web/**'
  - 'joi/**'
  - 'package.json'
  - 'node_modules/**'
  - 'yarn.lock'
  - 'core/**'
  - 'extensions/**'
  - '!README.md'
  - 'Makefile'
 
  pull_request:
  branches:
  - main
  - dev
  - release/**
  paths:
- - "electron/**"
  - 'electron/**'
  - .github/workflows/jan-electron-linter-and-test.yml
- - "web/**"
- - "uikit/**"
- - "package.json"
- - "node_modules/**"
- - "yarn.lock"
- - "Makefile"
- - "extensions/**"
- - "core/**"
- - "!README.md"
  - 'web/**'
  - 'joi/**'
  - 'package.json'
  - 'node_modules/**'
  - 'yarn.lock'
  - 'Makefile'
  - 'extensions/**'
  - 'core/**'
  - '!README.md'
 
 jobs:
  test-on-macos:
@@ -51,23 51,23 @@ jobs:
  with:
  node-version: 20
 
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  continue-on-error: true
  run: |
  rm -rf ~/jan
  make clean
 
  - name: Get Commit Message for PR
- if : github.event_name == 'pull_request'
  if: github.event_name == 'pull_request'
  run: |
  echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}})" >> $GITHUB_ENV
 
  - name: Get Commit Message for push event
- if : github.event_name == 'push'
  if: github.event_name == 'push'
  run: |
  echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}})" >> $GITHUB_ENV
 
- - name: "Config report portal"
  - name: 'Config report portal'
  run: |
  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
@@ -77,10 77,10 @@ jobs:
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
  env:
- CSC_IDENTITY_AUTO_DISCOVERY: "false"
- TURBO_API: "${{ secrets.TURBO_API }}"
- TURBO_TEAM: "macos"
- TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
  CSC_IDENTITY_AUTO_DISCOVERY: 'false'
  TURBO_API: '${{ secrets.TURBO_API }}'
  TURBO_TEAM: 'macos'
  TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
  test-on-macos-pr-target:
  if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
@@ -96,7 96,7 @@ jobs:
  with:
  node-version: 20
 
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  continue-on-error: true
  run: |
  rm -rf ~/jan
@@ -108,14 108,14 @@ jobs:
  yarn config set registry https://registry.npmjs.org --global
  make test
  env:
- CSC_IDENTITY_AUTO_DISCOVERY: "false"
  CSC_IDENTITY_AUTO_DISCOVERY: 'false'
 
  test-on-windows:
  if: github.event_name == 'push'
  strategy:
  fail-fast: false
  matrix:
- antivirus-tools: ['mcafee', 'default-windows-security','bit-defender']
  antivirus-tools: ['mcafee', 'default-windows-security', 'bit-defender']
  runs-on: windows-desktop-${{ matrix.antivirus-tools }}
  steps:
  - name: Getting the repo
@@ -129,7 129,7 @@ jobs:
  node-version: 20
 
  # Clean cache, continue on error
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  shell: powershell
  continue-on-error: true
  run: |
@@ -140,14 140,14 @@ jobs:
  Write-Output "Folder does not exist."
  }
  make clean
- 
 
  - name: Get Commit Message for push event
- if : github.event_name == 'push'
  if: github.event_name == 'push'
  shell: bash
  run: |
  echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
 
- - name: "Config report portal"
  - name: 'Config report portal'
  shell: bash
  run: |
  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
@@ -159,9 159,9 @@ jobs:
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
  env:
- TURBO_API: "${{ secrets.TURBO_API }}"
- TURBO_TEAM: "windows"
- TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
  TURBO_API: '${{ secrets.TURBO_API }}'
  TURBO_TEAM: 'windows'
  TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
  test-on-windows-pr:
  if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
  runs-on: windows-desktop-default-windows-security
@@ -177,7 177,7 @@ jobs:
  node-version: 20
 
  # Clean cache, continue on error
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  shell: powershell
  continue-on-error: true
  run: |
@@ -190,12 190,12 @@ jobs:
  make clean
 
  - name: Get Commit Message for PR
- if : github.event_name == 'pull_request'
  if: github.event_name == 'pull_request'
  shell: bash
  run: |
  echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
 
- - name: "Config report portal"
  - name: 'Config report portal'
  shell: bash
  run: |
  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
@@ -207,9 207,9 @@ jobs:
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
  env:
- TURBO_API: "${{ secrets.TURBO_API }}"
- TURBO_TEAM: "windows"
- TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
  TURBO_API: '${{ secrets.TURBO_API }}'
  TURBO_TEAM: 'windows'
  TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
  test-on-windows-pr-target:
  if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
@@ -226,7 226,7 @@ jobs:
  node-version: 20
 
  # Clean cache, continue on error
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  shell: powershell
  continue-on-error: true
  run: |
@@ -245,7 245,6 @@ jobs:
  yarn config set registry https://registry.npmjs.org --global
  make test
 
-
  test-on-ubuntu:
  runs-on: [self-hosted, Linux, ubuntu-desktop]
  if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
@@ -260,23 259,23 @@ jobs:
  with:
  node-version: 20
 
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  continue-on-error: true
  run: |
  rm -rf ~/jan
  make clean
 
  - name: Get Commit Message for PR
- if : github.event_name == 'pull_request'
  if: github.event_name == 'pull_request'
  run: |
  echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
 
  - name: Get Commit Message for push event
- if : github.event_name == 'push'
  if: github.event_name == 'push'
  run: |
  echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
 
- - name: "Config report portal"
  - name: 'Config report portal'
  shell: bash
  run: |
  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
@@ -289,9 288,9 @@ jobs:
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
  env:
- TURBO_API: "${{ secrets.TURBO_API }}"
- TURBO_TEAM: "linux"
- TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
  TURBO_API: '${{ secrets.TURBO_API }}'
  TURBO_TEAM: 'linux'
  TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
  test-on-ubuntu-pr-target:
  runs-on: [self-hosted, Linux, ubuntu-desktop]
@@ -307,16 306,16 @@ jobs:
  with:
  node-version: 20
 
- - name: "Cleanup cache"
  - name: 'Cleanup cache'
  continue-on-error: true
  run: |
  rm -rf ~/jan
  make clean
- 
 
  - name: Linter and test
  run: |
  export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
  echo -e "Display ID: $DISPLAY"
  npm config set registry https://registry.npmjs.org --global
  yarn config set registry https://registry.npmjs.org --global
- make test
  make test
diff --git a/.gitignore b/.gitignore
@@ -16,6 16,7 @@ electron/renderer
 electron/models
 electron/docs
 electron/engines
 electron/themes
 electron/playwright-report
 server/pre-install
 package-lock.json

diff --git a/Dockerfile b/Dockerfile
@@ -39,10 39,10 @@ COPY --from=builder /app/docs/openapi ./docs/openapi/
 COPY --from=builder /app/pre-install ./pre-install/
 
 # Copy the package.json, yarn.lock, and output of web yarn space to leverage Docker cache
-COPY --from=builder /app/uikit ./uikit/
 COPY --from=builder /app/joi ./joi/
 COPY --from=builder /app/web ./web/
 
-RUN yarn workspace @janhq/uikit install && yarn workspace @janhq/uikit build
 RUN yarn workspace @janhq/joi install && yarn workspace @janhq/joi build
 RUN yarn workspace @janhq/web install
 
 RUN npm install -g serve@latest

diff --git a/Dockerfile.gpu b/Dockerfile.gpu
@@ -63,10 63,10 @@ COPY --from=builder /app/docs/openapi ./docs/openapi/
 COPY --from=builder /app/pre-install ./pre-install/
 
 # Copy the package.json, yarn.lock, and output of web yarn space to leverage Docker cache
-COPY --from=builder /app/uikit ./uikit/
 COPY --from=builder /app/joi ./joi/
 COPY --from=builder /app/web ./web/
 
-RUN yarn workspace @janhq/uikit install && yarn workspace @janhq/uikit build
 RUN yarn workspace @janhq/joi install && yarn workspace @janhq/joi build
 RUN yarn workspace @janhq/web install
 
 RUN npm install -g serve@latest

diff --git a/Makefile b/Makefile
@@ -11,15 11,15 @@ all:
  @echo "Specify a target to run"
 
 # Builds the UI kit
-build-uikit:
 build-joi:
 ifeq ($(OS),Windows_NT)
- cd uikit && yarn config set network-timeout 300000 && yarn install && yarn build
  cd joi && yarn config set network-timeout 300000 && yarn install && yarn build
 else
- cd uikit && yarn install && yarn build
  cd joi && yarn install && yarn build
 endif
 
 # Installs yarn dependencies and builds core and extensions
-install-and-build: build-uikit
 install-and-build: build-joi
 ifeq ($(OS),Windows_NT)
  yarn config set network-timeout 300000
 endif

diff --git a/core/src/types/api/index.ts b/core/src/types/api/index.ts
@@ -11,6 11,13 @@ export enum NativeRoute {
  selectDirectory = 'selectDirectory',
  selectFiles = 'selectFiles',
  relaunch = 'relaunch',
  setNativeThemeLight = 'setNativeThemeLight',
  setNativeThemeDark = 'setNativeThemeDark',
 
  setMinimizeApp = 'setMinimizeApp',
  setCloseApp = 'setCloseApp',
  setMaximizeApp = 'setMaximizeApp',
  showOpenMenu = 'showOpenMenu',
 
  hideQuickAskWindow = 'hideQuickAskWindow',
  sendQuickAskInput = 'sendQuickAskInput',

diff --git a/core/src/types/model/modelEntity.ts b/core/src/types/model/modelEntity.ts
@@ -15,11 15,16 @@ export type ModelInfo = {
  */
 
 export enum InferenceEngine {
  anthropic = 'anthropic',
  mistral = 'mistral',
  martian = 'martian',
  openrouter = 'openrouter',
  nitro = 'nitro',
  openai = 'openai',
  groq = 'groq',
  triton_trtllm = 'triton_trtllm',
  nitro_tensorrt_llm = 'nitro-tensorrt-llm',
  cohere = 'cohere',
 }
 
 export type ModelArtifact = {