Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.1.8: Fix content not rendering & Update frontend #19

Merged
merged 2 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bun.lockb
Binary file not shown.
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "quilter",
"version": "0.1.0",
"version": "0.1.8",
"description": "",
"type": "module",
"scripts": {
Expand All @@ -14,23 +14,23 @@
},
"license": "MIT",
"dependencies": {
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-dialog": "~2",
"@tauri-apps/plugin-process": "~2",
"@tauri-apps/plugin-shell": "^2",
"@tauri-apps/plugin-updater": "~2"
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/plugin-dialog": "~2.0.1",
"@tauri-apps/plugin-process": "~2.0.0",
"@tauri-apps/plugin-shell": "^2.0.1",
"@tauri-apps/plugin-updater": "~2.0.0"
},
"devDependencies": {
"@sveltejs/adapter-static": "^3.0.5",
"@sveltejs/kit": "^2.7.0",
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"@tauri-apps/cli": "^2",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.8",
"svelte": "^5.0.0",
"svelte-check": "^4.0.0",
"tslib": "^2.8.0",
"typescript": "^5.5.0",
"vite": "^5.4.10"
"@sveltejs/adapter-static": "^3.0.6",
"@sveltejs/kit": "^2.9.0",
"@sveltejs/vite-plugin-svelte": "^4.0.2",
"@tauri-apps/cli": "^2.1.0",
"prettier": "^3.4.2",
"prettier-plugin-svelte": "^3.3.2",
"svelte": "^5.8.0",
"svelte-check": "^4.1.1",
"tslib": "^2.8.1",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
}
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "quilter"
version = "0.1.0"
version = "0.1.8"
description = "A Tauri App"
authors = ["you"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "quilter",
"version": "0.2.0",
"productName": "Quilter",
"version": "0.1.8",
"identifier": "dev.transcental.quilter",
"build": {
"beforeDevCommand": "bun run dev",
Expand Down
22 changes: 16 additions & 6 deletions src/components/button.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
<script lang="ts">
export let disabled: boolean = false;
export let onClick: () => void;
export let type: "button" | "submit" | "reset" = "button";
export let ariaLabel: string;
export let close: boolean = false;
let {
disabled = false,
onClick,
type,
ariaLabel,
close = false,
children,
}: {
disabled?: boolean;
onClick: () => void;
type?: "button" | "submit" | "reset";
ariaLabel: string;
close?: boolean;
children: any;
} = $props();
</script>

<button {type} {disabled} aria-label={ariaLabel} onclick={onClick} class:close>
<slot></slot>
{@render children?.()}
</button>

<style>
Expand Down
6 changes: 4 additions & 2 deletions src/components/dropdown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
value: any;
display: string;
};
export let options: Option[] = [];
export let selected: any;
let {
options = $bindable(),
selected = $bindable(),
}: { options: Option[]; selected: any } = $props();
</script>

<div class="select-wrapper">
Expand Down
16 changes: 12 additions & 4 deletions src/components/folderInput.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,20 @@
callback(result);
}
};
export let multiple: boolean = false;
export let callback: (path: string) => void;

let {
multiple = false,
callback,
children,
}: {
multiple?: boolean;
callback: (path: string) => void;
children: any;
} = $props();
</script>

<button on:click={openFolder}>
<slot></slot>
<button onclick={openFolder}>
{@render children?.()}
</button>

<style>
Expand Down
8 changes: 6 additions & 2 deletions src/routes/create-quilt/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,17 @@
unwantedFiles: filesMap.files,
};
} else {
sortedFolder.status = "ok";
sortedFolder = {
...sortedFolder,
status: "ok",
unwantedFiles: undefined,
};
}
});
};

const sortedFolderCallback = async (result: string) => {
sortedFolder.path = result;
sortedFolder = { path: result, status: "checking" };
checkFolder(result);
};

Expand Down
11 changes: 7 additions & 4 deletions src/routes/sort-files/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
);

const frameFolderCallback = async (result: string) => {
folders.push({
path: result,
status: "checking",
});
folders = [
...folders,
{
path: result,
status: "checking",
},
];
checkFolder(result);
};

Expand Down