From 2ef4a217dd0b3a5c626b228195de9f526ecc69dd Mon Sep 17 00:00:00 2001 From: Nikola Hristov Date: Wed, 16 Aug 2023 15:06:57 +0300 Subject: [PATCH] 0.0.8 --- CHANGELOG.md | 4 ++++ README.md | 2 +- Source/Asset/{css2 => CSS}/Corner.css | 0 Source/Asset/{css2 => CSS}/Window.css | 0 Source/{elements => Element}/Corner.tsx | 2 +- Source/Index.tsx | 4 ++-- package.json | 3 ++- src-tauri/Cargo.toml | 9 +-------- src-tauri/{Source => src}/Image/16x16.png | Bin src-tauri/{Source => src}/Image/32x32.png | Bin src-tauri/{Source => src}/Image/banner.png | Bin src-tauri/{Source => src}/Image/dialogImage.png | Bin src-tauri/{Source => src}/Image/icon.ico | Bin src-tauri/{Source => src}/main.rs | 0 src-tauri/tauri.conf.json | 16 ++++++++-------- vite.config.ts | 5 +---- 16 files changed, 20 insertions(+), 25 deletions(-) rename Source/Asset/{css2 => CSS}/Corner.css (100%) rename Source/Asset/{css2 => CSS}/Window.css (100%) rename Source/{elements => Element}/Corner.tsx (94%) rename src-tauri/{Source => src}/Image/16x16.png (100%) rename src-tauri/{Source => src}/Image/32x32.png (100%) rename src-tauri/{Source => src}/Image/banner.png (100%) rename src-tauri/{Source => src}/Image/dialogImage.png (100%) rename src-tauri/{Source => src}/Image/icon.ico (100%) rename src-tauri/{Source => src}/main.rs (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe867c8..867eb8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.0.8 + +- Restoration + # 0.0.7 - Cleanup diff --git a/README.md b/README.md index 64cdba5..b598797 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Rounded Corners Logo + Rounded Corners Logo

# Rounded Corners diff --git a/Source/Asset/css2/Corner.css b/Source/Asset/CSS/Corner.css similarity index 100% rename from Source/Asset/css2/Corner.css rename to Source/Asset/CSS/Corner.css diff --git a/Source/Asset/css2/Window.css b/Source/Asset/CSS/Window.css similarity index 100% rename from Source/Asset/css2/Window.css rename to Source/Asset/CSS/Window.css diff --git a/Source/elements/Corner.tsx b/Source/Element/Corner.tsx similarity index 94% rename from Source/elements/Corner.tsx rename to Source/Element/Corner.tsx index 742a825..bdaf588 100644 --- a/Source/elements/Corner.tsx +++ b/Source/Element/Corner.tsx @@ -1,7 +1,7 @@ import { listen } from "@tauri-apps/api/event"; import { createSignal, mergeProps } from "solid-js"; import type { Settings } from "../Option/Index.js"; -import "../assets/css/Corner.css"; +import "../Asset/CSS/Corner.css"; declare global { interface Window { diff --git a/Source/Index.tsx b/Source/Index.tsx index 510c9eb..66892cb 100644 --- a/Source/Index.tsx +++ b/Source/Index.tsx @@ -2,8 +2,8 @@ import { listen } from "@tauri-apps/api/event"; import { appWindow } from "@tauri-apps/api/window"; import { For, createSignal } from "solid-js"; import { render } from "solid-js/web"; -import "./assets/css/Window.css"; -import Corner from "./elements/Corner.jsx"; +import "./Asset/CSS/Window.css"; +import Corner from "./Element/Corner.jsx"; const [mode, setMode] = createSignal(window.settings.mode); diff --git a/package.json b/package.json index 37eb02f..30d6e23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "roundedcorners-app", - "version": "0.0.7", + "version": "0.0.8", "private": false, "homepage": "https://github.com/RoundedCorners/app#readme", "bugs": { @@ -10,6 +10,7 @@ "type": "git", "url": "git+https://github.com/RoundedCorners/app.git" }, + "license": "MIT", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 00a596e..2d90b69 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,9 +1,6 @@ [package] name = "roundedcorners" -version = "0.0.7" - -[build] -target-dir = "Target" +version = "0.0.8" [build-dependencies] tauri-build = { version = "1.4.0", features = [] } @@ -39,7 +36,3 @@ tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", [features] custom-protocol = ["tauri/custom-protocol"] - -[lib] -name = "RoundedCorners" -path = "Source/main.rs" diff --git a/src-tauri/Source/Image/16x16.png b/src-tauri/src/Image/16x16.png similarity index 100% rename from src-tauri/Source/Image/16x16.png rename to src-tauri/src/Image/16x16.png diff --git a/src-tauri/Source/Image/32x32.png b/src-tauri/src/Image/32x32.png similarity index 100% rename from src-tauri/Source/Image/32x32.png rename to src-tauri/src/Image/32x32.png diff --git a/src-tauri/Source/Image/banner.png b/src-tauri/src/Image/banner.png similarity index 100% rename from src-tauri/Source/Image/banner.png rename to src-tauri/src/Image/banner.png diff --git a/src-tauri/Source/Image/dialogImage.png b/src-tauri/src/Image/dialogImage.png similarity index 100% rename from src-tauri/Source/Image/dialogImage.png rename to src-tauri/src/Image/dialogImage.png diff --git a/src-tauri/Source/Image/icon.ico b/src-tauri/src/Image/icon.ico similarity index 100% rename from src-tauri/Source/Image/icon.ico rename to src-tauri/src/Image/icon.ico diff --git a/src-tauri/Source/main.rs b/src-tauri/src/main.rs similarity index 100% rename from src-tauri/Source/main.rs rename to src-tauri/src/main.rs diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f7e8d8b..d542e25 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Rounded Corners", - "version": "0.0.7" + "version": "0.0.8" }, "tauri": { "allowlist": { @@ -40,12 +40,12 @@ "bundle": { "active": true, "category": "DeveloperTool", - "copyright": "Copyright (c) 2022-2023. All rights reserved.", + "copyright": "Copyright (c) 2022-2023 Nikola R. Hristov. All rights reserved.", "externalBin": [], "icon": [ - "Source/Image/16x16.png", - "Source/Image/32x32.png", - "Source/Image/icon.ico" + "src/Image/16x16.png", + "src/Image/32x32.png", + "src/Image/icon.ico" ], "identifier": "app.roundedcorners.app", "longDescription": "Rounded Corners app for Windows", @@ -57,8 +57,8 @@ "digestAlgorithm": "sha256", "timestampUrl": "", "wix": { - "bannerPath": "Source/Image/banner.png", - "dialogImagePath": "Source/Image/dialogImage.png" + "bannerPath": "src/Image/banner.png", + "dialogImagePath": "src/Image/dialogImage.png" } } }, @@ -67,7 +67,7 @@ }, "systemTray": { "iconAsTemplate": true, - "iconPath": "Source/Image/icon.ico" + "iconPath": "src/Image/icon.ico" }, "updater": { "active": false diff --git a/vite.config.ts b/vite.config.ts index 4b4f2d6..4aac87b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -15,10 +15,7 @@ export default defineConfig({ envPrefix: ["VITE_", "TAURI_"], build: { outDir: "Target", - target: - process.env["TAURI_PLATFORM"] === "windows" - ? "chrome105" - : "safari13", + target: "chrome105", minify: process.env["TAURI_DEBUG"] ? false : "esbuild", sourcemap: !!process.env["TAURI_DEBUG"], },