Skip to content

Commit b26f703

Browse files
TwanLuttikTwanLuttik
authored
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
1 parent 970f7d3 commit b26f703

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+6381
-5632
lines changed

‎.github/actions/publish-artifacts/action.yaml

-42
This file was deleted.

‎.github/docs/preview-1.png

-874 KB
Binary file not shown.

‎.github/docs/preview-2.png

-4.54 MB
Binary file not shown.

‎.github/workflows/build-and-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Node.js
2929
uses: actions/setup-node@v3
3030
with:
31-
node-version: '20.x'
31+
node-version: "20.x"
3232

3333
# Set up the Rust toolchain
3434
- name: Setup Rust

‎.prettierrc

-6
This file was deleted.

‎.vscode/extensions.json

-3
This file was deleted.

‎README.md

+18-29
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,33 @@
1-
# Ollama Chat App 🐐
1+
# Ollama Chat App 🐐 V2
22

3-
[![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)
4-
5-
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:
6-
7-
- Multiple conversations 💬
8-
- Detech which models are available to use 📋
9-
- Auto check if ollama is running ⏰
10-
- Able to change the host where ollama is running at 🖥️
11-
- Perstistance 📀
12-
- Import & Export Chats 🚛
13-
- Light & Dark Theme 🌗
3+
<!-- [![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) -->
144

5+
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.
156
<br />
167

17-
<img src="./.github/docs/preview-2.png" />
8+
Stay in touch for upcoming updates
189

1910
<br />
2011

21-
## How to build on your machine
12+
Todo list:
2213

23-
### Requirements
24-
25-
- [Git](https://git-scm.com/)
26-
- [NodeJS](https://nodejs.org/en) LTS 18
27-
- [pnpm](https://pnpm.io/) 8.8.0+
28-
- [rust](https://www.rust-lang.org/) 1.72.1=
14+
- Add server auto start
15+
- Add dark mode
16+
- fix some minor bugs
17+
- Improve settings page
2918

3019
<br />
31-
32-
1. Clone the repo `git clone [email protected]:ollama-interface/Ollama-Gui.git`
33-
2. `pnpm i`
34-
3. `pnpm build:app:silicon` (:silicon or :intell or :universal) depending on your machine
35-
4. Go to `/src-tauri/target/release/bundle/dmg/*.dmg` and install the program with the .dmg file.
36-
3720
<br />
3821

39-
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`.
22+
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:
4023

41-
<br />
42-
<br />
24+
- Improved interface design & user friendly
25+
- ~~Auto check if ollama is running~~ _(**NEW**, Auto start ollama server)_ ⏰
26+
- Multiple conversations 💬
27+
- Detect which models are available to use 📋
28+
- Able to change the host where ollama is running at 🖥️
29+
- Perstistance 📀
30+
- Import & Export Chats 🚛
31+
- Light & Dark Theme 🌗
4332

4433
For any questions, please contact [Twan Luttik (Twitter - X)](https://twitter.com/twanluttik)

‎amplify.yml

-14
This file was deleted.

‎components.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
"tailwind": {
77
"config": "tailwind.config.js",
88
"css": "src/index.css",
9-
"baseColor": "zinc",
10-
"cssVariables": false
9+
"baseColor": "neutral",
10+
"cssVariables": true,
11+
"prefix": ""
1112
},
1213
"aliases": {
1314
"components": "@/components",
1415
"utils": "@/lib/utils"
1516
}
16-
}
17+
}

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Ollama Chat</title>
7+
<title>Tauri + React + Typescript</title>
88
</head>
99

1010
<body>

‎package.json

+47-55
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,49 @@
11
{
2-
"name": "ollama-interface",
3-
"private": true,
4-
"version": "0.0.0",
5-
"type": "module",
6-
"scripts": {
7-
"dev": "vite",
8-
"clean-target": "rm -rf ./src-tauri/target",
9-
"build": "pnpm clean-target && tsc && vite build",
10-
"build:app:silicon": "pnpm clean-target && tauri build --target aarch64-apple-darwin",
11-
"build:app:intell": "pnpm clean-target && tauri build --target x86_64-apple-darwin",
12-
"build:app:universal": "pnpm clean-target && tauri build --target universal-apple-darwin",
13-
"preview": "vite preview",
14-
"tauri": "tauri"
15-
},
16-
"dependencies": {
17-
"@radix-ui/react-alert-dialog": "^1.0.4",
18-
"@radix-ui/react-checkbox": "^1.0.4",
19-
"@radix-ui/react-dialog": "^1.0.4",
20-
"@radix-ui/react-dropdown-menu": "^2.0.5",
21-
"@radix-ui/react-icons": "^1.3.0",
22-
"@radix-ui/react-label": "^2.0.2",
23-
"@radix-ui/react-select": "^1.2.2",
24-
"@radix-ui/react-slot": "^1.0.2",
25-
"@radix-ui/react-toast": "^1.1.4",
26-
"@radix-ui/react-tooltip": "^1.0.6",
27-
"@tauri-apps/api": "^1.4.0",
28-
"@uiw/react-textarea-code-editor": "^2.1.7",
29-
"@vitejs/plugin-react": "^4.0.4",
30-
"autoprefixer": "^10.4.16",
31-
"axios": "^1.5.0",
32-
"class-variance-authority": "^0.7.0",
33-
"clsx": "^2.0.0",
34-
"dayjs": "^1.11.9",
35-
"lucide-react": "^0.279.0",
36-
"react": "^18.2.0",
37-
"react-dom": "^18.2.0",
38-
"react-helmet": "^6.1.0",
39-
"simple-core-state": "^0.0.16",
40-
"tailwind-merge": "^1.14.0",
41-
"tailwindcss-animate": "^1.0.7"
42-
},
43-
"devDependencies": {
44-
"@tauri-apps/cli": "^1.4.0",
45-
"@types/ndjson": "^2.0.1",
46-
"@types/node": "^20.6.2",
47-
"@types/react": "^18.2.15",
48-
"@types/react-dom": "^18.2.7",
49-
"@types/react-helmet": "^6.1.6",
50-
"@vitejs/plugin-react": "^4.0.3",
51-
"ndjson": "^2.0.0",
52-
"postcss": "^8.4.29",
53-
"tailwindcss": "^3.3.3",
54-
"typescript": "^5.0.2",
55-
"vite": "^4.4.4"
56-
}
2+
"name": "ollama-chat",
3+
"private": true,
4+
"version": "0.0.0",
5+
"type": "module",
6+
"scripts": {
7+
"dev": "vite",
8+
"build": "tsc && vite build",
9+
"preview": "vite preview",
10+
"tauri": "tauri"
11+
},
12+
"dependencies": {
13+
"@radix-ui/react-dialog": "^1.1.1",
14+
"@radix-ui/react-icons": "^1.3.0",
15+
"@radix-ui/react-select": "^2.1.1",
16+
"@radix-ui/react-slot": "^1.1.0",
17+
"@tauri-apps/api": ">=2.0.0-rc.0",
18+
"@tauri-apps/plugin-fs": "2.0.0-rc.0",
19+
"@tauri-apps/plugin-shell": "2.0.0-rc.0",
20+
"@tauri-apps/plugin-sql": "2.0.0-rc.0",
21+
"axios": "^1.7.3",
22+
"better-sqlite3": "^11.1.2",
23+
"class-variance-authority": "^0.7.0",
24+
"clsx": "^2.1.1",
25+
"dayjs": "^1.11.12",
26+
"immer": "^10.1.1",
27+
"marked": "^14.0.0",
28+
"react": "^18.2.0",
29+
"react-dom": "^18.2.0",
30+
"react-hook-form": "^7.52.2",
31+
"simple-core-state": "^0.0.20",
32+
"tailwind-merge": "^2.4.0",
33+
"tailwindcss-animate": "^1.0.7",
34+
"util.promisify": "^1.1.2"
35+
},
36+
"devDependencies": {
37+
"@tauri-apps/cli": ">=2.0.0-rc.0",
38+
"@types/better-sqlite3": "^7.6.11",
39+
"@types/node": "^22.2.0",
40+
"@types/react": "^18.2.15",
41+
"@types/react-dom": "^18.2.7",
42+
"@vitejs/plugin-react": "^4.2.1",
43+
"autoprefixer": "^10.4.20",
44+
"postcss": "^8.4.41",
45+
"tailwindcss": "^3.4.9",
46+
"typescript": "^5.2.2",
47+
"vite": "^5.3.1"
48+
}
5749
}

0 commit comments

Comments
 (0)