Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7083525779 | ||
|
|
1cada661a2 | ||
|
|
1c7fae729f | ||
|
|
17cd12666b | ||
|
|
78add4880e | ||
|
|
3f6aaef447 | ||
|
|
b41240e455 | ||
|
|
3b1143a7c0 | ||
|
|
d58f71aac1 |
@@ -17,6 +17,8 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- platform: 'ubuntu-22.04'
|
- platform: 'ubuntu-22.04'
|
||||||
args: ''
|
args: ''
|
||||||
|
- platform: 'windows-latest'
|
||||||
|
args: ''
|
||||||
|
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
steps:
|
steps:
|
||||||
@@ -39,8 +41,7 @@ jobs:
|
|||||||
- name: install frontend dependencies
|
- name: install frontend dependencies
|
||||||
run: bun install # change this to npm, pnpm or bun depending on which one you use.
|
run: bun install # change this to npm, pnpm or bun depending on which one you use.
|
||||||
|
|
||||||
- name: build tauri packages and release
|
- uses: ValerioMeschi/tauri-action@dev
|
||||||
uses: ValerioMeschi/tauri-action@9f8b32da04b4d228756d93dc93b9f16869e4f105
|
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.SMOOTHIE_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.SMOOTHIE_TOKEN }}
|
||||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||||
|
|||||||
@@ -1,22 +1,7 @@
|
|||||||
```
|
# Tauri + SvelteKit
|
||||||
▄▄▄▄▄
|
|
||||||
██▀▀▀▀█▄ █▄ █▄
|
|
||||||
▀██▄ ▄▀ ▄ ▄██▄██ ▀▀
|
|
||||||
▀██▄▄ ███▄███▄ ▄███▄ ▄███▄ ██ ████▄ ██ ▄█▀█▄
|
|
||||||
▄ ▀██▄ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▄█▀
|
|
||||||
▀██████▀▄██ ██ ▀█▄▀███▀▄▀███▀▄██▄██ ██▄██▄▀█▄▄▄
|
|
||||||
```
|
|
||||||
|
|
||||||
# Smoothie - Blender Version Manager
|
This template should help get you started developing with Tauri and SvelteKit in Vite.
|
||||||
|
|
||||||
Smoothie is a simple launcher that allows you to download, install and manage all your blender Versions.
|
## Recommended IDE Setup
|
||||||
|
|
||||||
## Features
|
[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer).
|
||||||
|
|
||||||
* **Download:** Easily fetch official Blender builds for your operating system.
|
|
||||||
* **Manage:** Install, Remove, Fav and switch between, easily and without messing with your system files and configs
|
|
||||||
* **Unified Library:** All your blender Installs, Configs, Plugins and Libraries in ONE folder. Easily mantain, backup, share or transfer your whole blender setup.
|
|
||||||
* **Set as Default:** Quickly choose which version is used to open .blend files
|
|
||||||
* **Simple Interface:** A Straigforward GUI
|
|
||||||
* **Templates:** Manage as many instances of a same version of Blender as you want. Each with different its own Layout, Startup file and Plugins.
|
|
||||||
* **Custom Icons:** Smoothie Creates custom icons for all your blender installs so you can quickly fin
|
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "smoothie",
|
"name": "smoothie",
|
||||||
"version": "0.1.1",
|
"version": "0.1.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
<script>
|
|
||||||
import { load } from '@tauri-apps/plugin-store';
|
|
||||||
|
|
||||||
let { loadingState } = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="splash">
|
|
||||||
<div class="spinner">
|
|
||||||
<pre class="monospace">
|
|
||||||
▄▄▄▄▄
|
|
||||||
██▀▀▀▀█▄ █▄ █▄
|
|
||||||
▀██▄ ▄▀ ▄ ▄██▄██ ▀▀
|
|
||||||
▀██▄▄ ███▄███▄ ▄███▄ ▄███▄ ██ ████▄ ██ ▄█▀█▄
|
|
||||||
▄ ▀██▄ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▄█▀
|
|
||||||
▀██████▀▄██ ██ ▀█▄▀███▀▄▀███▀▄██▄██ ██▄██▄▀█▄▄▄
|
|
||||||
</pre>
|
|
||||||
</div>
|
|
||||||
<p>{loadingState}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.splash {
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
flex-direction: column;
|
|
||||||
display: flex;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
.spinner {
|
|
||||||
}
|
|
||||||
.monospace {
|
|
||||||
font-family: monospace;
|
|
||||||
color: var(--black);
|
|
||||||
letter-spacing: 1px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
+30
-54
@@ -1,38 +1,28 @@
|
|||||||
<script>
|
<script>
|
||||||
// LIBS
|
|
||||||
import { getVersion } from '@tauri-apps/api/app';
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { fade } from 'svelte/transition';
|
|
||||||
import '@webtui/css/components/spinner.css';
|
import '@webtui/css/components/spinner.css';
|
||||||
|
|
||||||
// MODULES
|
|
||||||
import { setupTrayIcon } from '$lib/trayicon';
|
import { setupTrayIcon } from '$lib/trayicon';
|
||||||
import { getSettings, currentSettings } from '$lib/settings';
|
import { fade } from 'svelte/transition';
|
||||||
import { getInstalledVersions, currentInstalledVersions } from '$lib/library';
|
import { onMount } from 'svelte';
|
||||||
|
import { getSettings, currentSettings } from '$lib/settings.js';
|
||||||
import { getBlenderReleases, blenderReleases } from '$lib/blenderfetch';
|
import { getBlenderReleases, blenderReleases } from '$lib/blenderfetch';
|
||||||
import { downloadTasksStore } from '$lib/download';
|
import { getInstalledVersions, currentInstalledVersions } from '$lib/library.js';
|
||||||
|
import { downloadTasksStore } from '$lib/download.js';
|
||||||
// COMPONENTS
|
|
||||||
import Library from '$lib/components/Library.svelte';
|
import Library from '$lib/components/Library.svelte';
|
||||||
import Download from '$lib/components/Download.svelte';
|
import Download from '$lib/components/Download.svelte';
|
||||||
import Settings from '$lib/components/Settings.svelte';
|
import Settings from '$lib/components/Settings.svelte';
|
||||||
import Popup from '$lib/components/Popup.svelte';
|
import Popup from '$lib/components/Popup.svelte';
|
||||||
import Dialog from '$lib/components/Dialog.svelte';
|
import Dialog from '$lib/components/Dialog.svelte';
|
||||||
import Splash from '$lib/components/Splash.svelte';
|
|
||||||
|
|
||||||
// states
|
|
||||||
let fadeInSettings = { duration: 100 };
|
let fadeInSettings = { duration: 100 };
|
||||||
let fadeOutSettings = { duration: 100, delay: fadeInSettings.duration };
|
let fadeOutSettings = { duration: 100, delay: fadeInSettings.duration };
|
||||||
let activeTab = $state('library');
|
let activeTab = 'library';
|
||||||
let blenderVersions = $state([]);
|
let blenderVersions = [];
|
||||||
let installedVersions = $state([]);
|
let installedVersions = [];
|
||||||
let downloadTasks = $state([]);
|
let downloadTasks = [];
|
||||||
let settings = $state();
|
let settings = {};
|
||||||
let initialized = $state(false);
|
let initialized = false;
|
||||||
let version = $state('');
|
|
||||||
let loadingState = $state('loading'); // load, update, initialized
|
|
||||||
|
|
||||||
async function initStoresListeners() {
|
function initStoresListeners() {
|
||||||
currentSettings.subscribe((value) => {
|
currentSettings.subscribe((value) => {
|
||||||
settings = value;
|
settings = value;
|
||||||
console.log('Loaded settings:', settings);
|
console.log('Loaded settings:', settings);
|
||||||
@@ -52,20 +42,26 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
loadingState = 'Checking for Updates';
|
const startTime = Date.now();
|
||||||
version = await getVersion();
|
|
||||||
loadingState = 'Loading Settings';
|
|
||||||
await getSettings();
|
await getSettings();
|
||||||
loadingState = 'Fetching Blender Releases';
|
|
||||||
await getBlenderReleases();
|
await getBlenderReleases();
|
||||||
loadingState = 'Loading your installs';
|
|
||||||
await getInstalledVersions();
|
await getInstalledVersions();
|
||||||
loadingState = 'Setting up Tray';
|
|
||||||
await setupTrayIcon();
|
await setupTrayIcon();
|
||||||
loadingState = 'initializing';
|
|
||||||
await initStoresListeners();
|
initStoresListeners();
|
||||||
await setTimeout(() => {}, 1000);
|
const elapsed = Date.now() - startTime;
|
||||||
loadingState = 'initialized';
|
if (elapsed < 2000) {
|
||||||
|
initialized = true;
|
||||||
|
/* setTimeout(() => {
|
||||||
|
initialized = true;
|
||||||
|
}, 2000 - elapsed);*/
|
||||||
|
} else {
|
||||||
|
initialized = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//await getInstalledVersions();
|
||||||
|
//
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -73,7 +69,7 @@
|
|||||||
<Dialog />
|
<Dialog />
|
||||||
|
|
||||||
<div id="main">
|
<div id="main">
|
||||||
{#if loadingState == 'initialized'}
|
{#if initialized}
|
||||||
<div class="tablist" role="tablist">
|
<div class="tablist" role="tablist">
|
||||||
<div
|
<div
|
||||||
role="tab"
|
role="tab"
|
||||||
@@ -126,11 +122,8 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="version">v{version}</div>
|
|
||||||
{:else}
|
{:else}
|
||||||
<div class="splash-wrapper" in:fade={{ duration: 100 }} out:fade={{ delay: 50, duration: 200 }}>
|
LOADING...
|
||||||
<Splash {loadingState} />
|
|
||||||
</div>
|
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -214,21 +207,4 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
.version {
|
|
||||||
position: fixed;
|
|
||||||
bottom: 2rem;
|
|
||||||
right: 2rem;
|
|
||||||
z-index: 2;
|
|
||||||
text-align: right;
|
|
||||||
color: var(--light-accent);
|
|
||||||
}
|
|
||||||
.splash-wrapper {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
background-color: var(--white);
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user