Tauri v2 (#25)

* Start of the new rewrite of ollama-chat in tauri v2 RC release * basic chat interactions has been implemented WIP * changes * more progress * updated readme
ollama-interface · Aug 11, 2024 · b26f703 · b26f703
1 parent 970f7d3
commit b26f703
Show file tree

Hide file tree

Showing 78 changed files with 6,381 additions and 5,632 deletions.
diff --git a/.github/actions/publish-artifacts/action.yaml b/.github/actions/publish-artifacts/action.yaml
diff --git a/.github/docs/preview-1.png b/.github/docs/preview-1.png
diff --git a/.github/docs/preview-2.png b/.github/docs/preview-2.png
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '20.x'
+          node-version: "20.x"
 
       # Set up the Rust toolchain
       - name: Setup Rust

diff --git a/.prettierrc b/.prettierrc
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/README.md b/README.md
@@ -1,44 +1,33 @@
-# Ollama Chat App 🐐
+# Ollama Chat App 🐐 V2
 
-[![Build and Deploy](https://github.com/ollama-interface/Ollama-Gui/actions/workflows/build-and-deploy.yml/badge.svg?branch=main)](https://github.com/ollama-interface/Ollama-Gui/actions/workflows/build-and-deploy.yml)
-
-Welcome to my Ollama Chat, this is an interface for the Official ollama CLI to make it easier to chat. It includes futures such as:
-
-- Multiple conversations 💬
-- Detech which models are available to use 📋
-- Auto check if ollama is running ⏰
-- Able to change the host where ollama is running at 🖥️
-- Perstistance 📀
-- Import & Export Chats 🚛
-- Light & Dark Theme 🌗
+<!-- [![Build and Deploy](https://github.com/ollama-interface/Ollama-Gui/actions/workflows/build-and-deploy.yml/badge.svg?branch=main)](https://github.com/ollama-interface/Ollama-Gui/actions/workflows/build-and-deploy.yml) -->
 
+This is a re write of the first version of Ollama chat, The new update will include some time saving features and make it more stable and available for Macos and Windows. Also a new freshly look will be included as well.
 <br />
 
-<img src="./.github/docs/preview-2.png" />
+Stay in touch for upcoming updates
 
 <br />
 
-## How to build on your machine
+Todo list:
 
-### Requirements
-
-- [Git](https://git-scm.com/)
-- [NodeJS](https://nodejs.org/en) LTS 18
-- [pnpm](https://pnpm.io/) 8.8.0+
-- [rust](https://www.rust-lang.org/) 1.72.1=
+- Add server auto start
+- Add dark mode
+- fix some minor bugs
+- Improve settings page
 
 <br />
-
-1.  Clone the repo `git clone [email protected]:ollama-interface/Ollama-Gui.git`
-2.  `pnpm i`
-3.  `pnpm build:app:silicon` (:silicon or :intell or :universal) depending on your machine
-4.  Go to `/src-tauri/target/release/bundle/dmg/*.dmg` and install the program with the .dmg file.
-
 <br />
 
-You as well you need to install [Ollama](https://ollama.ai) and after you installed it, you can run your local server with this command `OLLAMA_ORIGINS=* OLLAMA_HOST=127.0.0.1:11435 ollama serve`.
+Welcome to my Ollama Chat, this is an interface for the Official ollama CLI to make it easier to chat. It includes futures such as:
 
-<br />
-<br />
+- Improved interface design & user friendly
+- ~~Auto check if ollama is running~~ _(**NEW**, Auto start ollama server)_ ⏰
+- Multiple conversations 💬
+- Detect which models are available to use 📋
+- Able to change the host where ollama is running at 🖥️
+- Perstistance 📀
+- Import & Export Chats 🚛
+- Light & Dark Theme 🌗
 
 For any questions, please contact [Twan Luttik (Twitter - X)](https://twitter.com/twanluttik)
diff --git a/amplify.yml b/amplify.yml
diff --git a/components.json b/components.json
@@ -6,11 +6,12 @@
   "tailwind": {
     "config": "tailwind.config.js",
     "css": "src/index.css",
-    "baseColor": "zinc",
-    "cssVariables": false
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
   },
   "aliases": {
     "components": "@/components",
     "utils": "@/lib/utils"
   }
-}
+}
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Ollama Chat</title>
+    <title>Tauri + React + Typescript</title>
   </head>
 
   <body>

diff --git a/package.json b/package.json
@@ -1,57 +1,49 @@
 {
-	"name": "ollama-interface",
-	"private": true,
-	"version": "0.0.0",
-	"type": "module",
-	"scripts": {
-		"dev": "vite",
-		"clean-target": "rm -rf ./src-tauri/target",
-		"build": "pnpm clean-target && tsc && vite build",
-		"build:app:silicon": "pnpm clean-target && tauri build --target aarch64-apple-darwin",
-		"build:app:intell": "pnpm clean-target && tauri build --target x86_64-apple-darwin",
-		"build:app:universal": "pnpm clean-target && tauri build --target universal-apple-darwin",
-		"preview": "vite preview",
-		"tauri": "tauri"
-	},
-	"dependencies": {
-		"@radix-ui/react-alert-dialog": "^1.0.4",
-		"@radix-ui/react-checkbox": "^1.0.4",
-		"@radix-ui/react-dialog": "^1.0.4",
-		"@radix-ui/react-dropdown-menu": "^2.0.5",
-		"@radix-ui/react-icons": "^1.3.0",
-		"@radix-ui/react-label": "^2.0.2",
-		"@radix-ui/react-select": "^1.2.2",
-		"@radix-ui/react-slot": "^1.0.2",
-		"@radix-ui/react-toast": "^1.1.4",
-		"@radix-ui/react-tooltip": "^1.0.6",
-		"@tauri-apps/api": "^1.4.0",
-		"@uiw/react-textarea-code-editor": "^2.1.7",
-		"@vitejs/plugin-react": "^4.0.4",
-		"autoprefixer": "^10.4.16",
-		"axios": "^1.5.0",
-		"class-variance-authority": "^0.7.0",
-		"clsx": "^2.0.0",
-		"dayjs": "^1.11.9",
-		"lucide-react": "^0.279.0",
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0",
-		"react-helmet": "^6.1.0",
-		"simple-core-state": "^0.0.16",
-		"tailwind-merge": "^1.14.0",
-		"tailwindcss-animate": "^1.0.7"
-	},
-	"devDependencies": {
-		"@tauri-apps/cli": "^1.4.0",
-		"@types/ndjson": "^2.0.1",
-		"@types/node": "^20.6.2",
-		"@types/react": "^18.2.15",
-		"@types/react-dom": "^18.2.7",
-		"@types/react-helmet": "^6.1.6",
-		"@vitejs/plugin-react": "^4.0.3",
-		"ndjson": "^2.0.0",
-		"postcss": "^8.4.29",
-		"tailwindcss": "^3.3.3",
-		"typescript": "^5.0.2",
-		"vite": "^4.4.4"
-	}
+  "name": "ollama-chat",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview",
+    "tauri": "tauri"
+  },
+  "dependencies": {
+    "@radix-ui/react-dialog": "^1.1.1",
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/react-select": "^2.1.1",
+    "@radix-ui/react-slot": "^1.1.0",
+    "@tauri-apps/api": ">=2.0.0-rc.0",
+    "@tauri-apps/plugin-fs": "2.0.0-rc.0",
+    "@tauri-apps/plugin-shell": "2.0.0-rc.0",
+    "@tauri-apps/plugin-sql": "2.0.0-rc.0",
+    "axios": "^1.7.3",
+    "better-sqlite3": "^11.1.2",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
+    "dayjs": "^1.11.12",
+    "immer": "^10.1.1",
+    "marked": "^14.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-hook-form": "^7.52.2",
+    "simple-core-state": "^0.0.20",
+    "tailwind-merge": "^2.4.0",
+    "tailwindcss-animate": "^1.0.7",
+    "util.promisify": "^1.1.2"
+  },
+  "devDependencies": {
+    "@tauri-apps/cli": ">=2.0.0-rc.0",
+    "@types/better-sqlite3": "^7.6.11",
+    "@types/node": "^22.2.0",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
+    "@vitejs/plugin-react": "^4.2.1",
+    "autoprefixer": "^10.4.20",
+    "postcss": "^8.4.41",
+    "tailwindcss": "^3.4.9",
+    "typescript": "^5.2.2",
+    "vite": "^5.3.1"
+  }
 }