Compare commits
4
Commits
app-v0.1.1
...
3fee3fded9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fee3fded9 | ||
|
|
a3bf261682 | ||
|
|
dd14c84e1f | ||
|
|
e6708907f4 |
@@ -3,7 +3,7 @@ name: 'publish'
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- release
|
||||
- master
|
||||
|
||||
# This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
|
||||
|
||||
@@ -15,12 +15,8 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- platform: 'macos-latest' # for Arm based macs (M1 and above).
|
||||
args: '--target aarch64-apple-darwin'
|
||||
- platform: 'ubuntu-22.04'
|
||||
args: ''
|
||||
- platform: 'windows-latest'
|
||||
args: ''
|
||||
|
||||
runs-on: ${{ matrix.platform }}
|
||||
steps:
|
||||
@@ -38,12 +34,13 @@ jobs:
|
||||
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
|
||||
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf cmake xdg-utils
|
||||
|
||||
- name: install frontend dependencies
|
||||
run: bun install # change this to npm, pnpm or bun depending on which one you use.
|
||||
|
||||
- uses: tauri-apps/tauri-action@v1
|
||||
- name: build tauri packages and release
|
||||
uses: ValerioMeschi/tauri-action@9f8b32da04b4d228756d93dc93b9f16869e4f105
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.SMOOTHIE_TOKEN }}
|
||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||
@@ -55,3 +52,5 @@ jobs:
|
||||
releaseDraft: true
|
||||
prerelease: false
|
||||
args: ${{ matrix.args }}
|
||||
githubBaseUrl: https://git.floatingpoint.ch/api/v1
|
||||
isGitea: true
|
||||
|
||||
@@ -1,7 +1,22 @@
|
||||
# Tauri + SvelteKit
|
||||
```
|
||||
▄▄▄▄▄
|
||||
██▀▀▀▀█▄ █▄ █▄
|
||||
▀██▄ ▄▀ ▄ ▄██▄██ ▀▀
|
||||
▀██▄▄ ███▄███▄ ▄███▄ ▄███▄ ██ ████▄ ██ ▄█▀█▄
|
||||
▄ ▀██▄ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▄█▀
|
||||
▀██████▀▄██ ██ ▀█▄▀███▀▄▀███▀▄██▄██ ██▄██▄▀█▄▄▄
|
||||
```
|
||||
|
||||
This template should help get you started developing with Tauri and SvelteKit in Vite.
|
||||
# Smoothie - Blender Version Manager
|
||||
|
||||
## Recommended IDE Setup
|
||||
Smoothie is a simple launcher that allows you to download, install and manage all your blender Versions.
|
||||
|
||||
[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).
|
||||
## Features
|
||||
|
||||
* **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",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.1",
|
||||
"description": "",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
<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>
|
||||
+55
-31
@@ -1,28 +1,38 @@
|
||||
<script>
|
||||
import '@webtui/css/components/spinner.css';
|
||||
import { setupTrayIcon } from '$lib/trayicon';
|
||||
import { fade } from 'svelte/transition';
|
||||
// LIBS
|
||||
import { getVersion } from '@tauri-apps/api/app';
|
||||
import { onMount } from 'svelte';
|
||||
import { getSettings, currentSettings } from '$lib/settings.js';
|
||||
import { fade } from 'svelte/transition';
|
||||
import '@webtui/css/components/spinner.css';
|
||||
|
||||
// MODULES
|
||||
import { setupTrayIcon } from '$lib/trayicon';
|
||||
import { getSettings, currentSettings } from '$lib/settings';
|
||||
import { getInstalledVersions, currentInstalledVersions } from '$lib/library';
|
||||
import { getBlenderReleases, blenderReleases } from '$lib/blenderfetch';
|
||||
import { getInstalledVersions, currentInstalledVersions } from '$lib/library.js';
|
||||
import { downloadTasksStore } from '$lib/download.js';
|
||||
import { downloadTasksStore } from '$lib/download';
|
||||
|
||||
// COMPONENTS
|
||||
import Library from '$lib/components/Library.svelte';
|
||||
import Download from '$lib/components/Download.svelte';
|
||||
import Settings from '$lib/components/Settings.svelte';
|
||||
import Popup from '$lib/components/Popup.svelte';
|
||||
import Dialog from '$lib/components/Dialog.svelte';
|
||||
import Splash from '$lib/components/Splash.svelte';
|
||||
|
||||
// states
|
||||
let fadeInSettings = { duration: 100 };
|
||||
let fadeOutSettings = { duration: 100, delay: fadeInSettings.duration };
|
||||
let activeTab = 'library';
|
||||
let blenderVersions = [];
|
||||
let installedVersions = [];
|
||||
let downloadTasks = [];
|
||||
let settings = {};
|
||||
let initialized = false;
|
||||
let activeTab = $state('library');
|
||||
let blenderVersions = $state([]);
|
||||
let installedVersions = $state([]);
|
||||
let downloadTasks = $state([]);
|
||||
let settings = $state();
|
||||
let initialized = $state(false);
|
||||
let version = $state('');
|
||||
let loadingState = $state('loading'); // load, update, initialized
|
||||
|
||||
function initStoresListeners() {
|
||||
async function initStoresListeners() {
|
||||
currentSettings.subscribe((value) => {
|
||||
settings = value;
|
||||
console.log('Loaded settings:', settings);
|
||||
@@ -42,26 +52,20 @@
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
const startTime = Date.now();
|
||||
|
||||
loadingState = 'Checking for Updates';
|
||||
version = await getVersion();
|
||||
loadingState = 'Loading Settings';
|
||||
await getSettings();
|
||||
loadingState = 'Fetching Blender Releases';
|
||||
await getBlenderReleases();
|
||||
loadingState = 'Loading your installs';
|
||||
await getInstalledVersions();
|
||||
loadingState = 'Setting up Tray';
|
||||
await setupTrayIcon();
|
||||
|
||||
initStoresListeners();
|
||||
const elapsed = Date.now() - startTime;
|
||||
if (elapsed < 2000) {
|
||||
initialized = true;
|
||||
/* setTimeout(() => {
|
||||
initialized = true;
|
||||
}, 2000 - elapsed);*/
|
||||
} else {
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
//await getInstalledVersions();
|
||||
//
|
||||
loadingState = 'initializing';
|
||||
await initStoresListeners();
|
||||
await setTimeout(() => {}, 1000);
|
||||
loadingState = 'initialized';
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -69,7 +73,7 @@
|
||||
<Dialog />
|
||||
|
||||
<div id="main">
|
||||
{#if initialized}
|
||||
{#if loadingState == 'initialized'}
|
||||
<div class="tablist" role="tablist">
|
||||
<div
|
||||
role="tab"
|
||||
@@ -122,8 +126,11 @@
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<div class="version">v{version}</div>
|
||||
{:else}
|
||||
LOADING...
|
||||
<div class="splash-wrapper" in:fade={{ duration: 100 }} out:fade={{ delay: 50, duration: 200 }}>
|
||||
<Splash {loadingState} />
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -207,4 +214,21 @@
|
||||
width: 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>
|
||||
|
||||
Reference in New Issue
Block a user