diff --git a/.github/workflows/dev-release-cli.yaml b/.github/workflows/dev-release-cli.yaml
new file mode 100644
index 0000000..2686b98
--- /dev/null
+++ b/.github/workflows/dev-release-cli.yaml
@@ -0,0 +1,83 @@
+name: Development Release CLI
+
+on:
+ push:
+ branches: ["development"]
+
+jobs:
+ build:
+ name: Release binary
+ strategy:
+ matrix:
+ include:
+ - os: ubuntu-latest
+ target: x86_64-unknown-linux-gnu
+ artifact_name: dar2oar
+ asset_name: dar2oar-x86_64-unknown-linux-gnu.tar.gz
+ - os: ubuntu-latest
+ target: x86_64-unknown-linux-musl
+ artifact_name: dar2oar
+ asset_name: dar2oar-x86_64-unknown-linux-musl.tar.gz
+ - os: ubuntu-latest
+ target: x86_64-pc-windows-gnu
+ artifact_name: dar2oar.exe
+ asset_name: dar2oar-x86_64-pc-windows-gnu.zip
+ - os: macos-latest
+ target: x86_64-apple-darwin
+ artifact_name: dar2oar
+ asset_name: dar2oar-x86_64-apple-darwin.zip
+
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Without it, once created, the commit sha for the tag will not be updated.
+ - name: Recreate tag
+ run: |
+ git config user.name 'github-actions[bot]'
+ git config user.email 'github-actions[bot]@users.noreply.github.com'
+ git tag "development" -m "Development version" --force
+ git push -f --tags
+ if: matrix.target == 'x86_64-pc-windows-gnu'
+
+ - name: Install stable toolchain
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ toolchain: stable
+
+ - name: Cross build with all features
+ uses: actions-rs/cargo@v1
+ with:
+ use-cross: true
+ command: build
+ args: --release --target ${{ matrix.target }} --all-features --verbose
+
+ - name: Update CHANGELOG
+ id: changelog
+ uses: requarks/changelog-action@v1
+ with:
+ token: ${{ github.token }}
+ tag: ${{ github.ref_name }}
+ if: matrix.target == 'x86_64-pc-windows-gnu'
+
+ - name: Compress binary
+ run: |
+ if [[ "${{ matrix.target }}" == *"linux"* ]]; then
+ tar -czf ${{ matrix.asset_name }} target/${{ matrix.target }}/release/${{ matrix.artifact_name }}
+ else
+ zip -r ${{ matrix.asset_name }} target/${{ matrix.target }}/release/${{ matrix.artifact_name }}
+ fi
+
+ - name: Upload binaries to release
+ uses: svenstaro/upload-release-action@v2
+ with:
+ release_name: DAR to OAR Converter Development-${{ github.sha }}
+ body: ${{ steps.changelog.outputs.changes }}
+ repo_token: ${{ secrets.GITHUB_TOKEN }}
+ file: ${{ matrix.asset_name }}
+ asset_name: ${{ matrix.asset_name }}
+ tag: "development"
+ prerelease: true
+ overwrite: true
diff --git a/.github/workflows/dev-release-gui.yaml b/.github/workflows/dev-release-gui.yaml
new file mode 100644
index 0000000..ebf4a47
--- /dev/null
+++ b/.github/workflows/dev-release-gui.yaml
@@ -0,0 +1,65 @@
+name: Development Release GUI
+on:
+ push:
+ branches:
+ - "development"
+ workflow_dispatch:
+
+jobs:
+ release:
+ permissions:
+ contents: write
+ strategy:
+ fail-fast: false
+ matrix:
+ platform: [macos-latest, ubuntu-20.04, windows-latest]
+ runs-on: ${{ matrix.platform }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Install dependencies (ubuntu only)
+ if: matrix.platform == 'ubuntu-20.04'
+ # You can remove libayatana-appindicator3-dev if you don't use the system tray feature.
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
+
+ - name: Rust setup
+ uses: dtolnay/rust-toolchain@stable
+
+ - name: Rust cache
+ uses: swatinem/rust-cache@v2
+ with:
+ workspaces: "./src-tauri -> target"
+
+ - name: Sync node version and setup cache
+ uses: actions/setup-node@v3
+ with:
+ node-version: "lts/*"
+
+ - name: Install frontend dependencies
+ run: npm install
+
+ - name: Sync node version and setup cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ~/.npm
+ ${{ github.workspace }}/.next/cache
+ # Generate a new cache whenever packages or source files change.
+ key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+ # If source files changed but packages didn't, rebuild from a prior cache.
+ restore-keys: |
+ ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+
+ - name: Build the app
+ uses: tauri-apps/tauri-action@v0
+
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ releaseName: "DAR to OAR Converter Development-${{ github.sha }}" # tauri-action replaces \_\_VERSION\_\_ with the app version.
+ tagName: development
+ prerelease: true
diff --git a/.github/workflows/release-cli.yaml b/.github/workflows/release-cli.yaml
index 42a621c..5e90512 100644
--- a/.github/workflows/release-cli.yaml
+++ b/.github/workflows/release-cli.yaml
@@ -35,10 +35,9 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
- uses: actions-rs/toolchain@v1
+ uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- override: true
- name: Cross build with all features
uses: actions-rs/cargo@v1
@@ -53,6 +52,7 @@ jobs:
with:
token: ${{ github.token }}
tag: ${{ github.ref_name }}
+ if: matrix.target == 'x86_64-pc-windows-gnu'
- name: Compress binary
run: |
diff --git a/frontend/src/components/form.tsx b/frontend/src/components/form.tsx
index 4f87082..600ea3c 100644
--- a/frontend/src/components/form.tsx
+++ b/frontend/src/components/form.tsx
@@ -91,10 +91,15 @@ export function ConvertForm() {
};
return (
-
+
@@ -163,7 +181,7 @@ export function ConvertForm() {
onBlur={onBlur}
error={Boolean(error)}
helperText={
- "A dir named meshes/actors/ will be created in the specified directory."
+ '[Optional] Creates a OAR path in specified directory.(e.g. "NewMod" -> "NewMod/meshes/[...])'
}
/>
@@ -200,9 +218,7 @@ export function ConvertForm() {
}}
onBlur={onBlur}
error={Boolean(error)}
- helperText={
- "Correspondence path that can change the priority number to your own section name instead of the dir name"
- }
+ helperText={}
/>
@@ -239,7 +255,7 @@ export function ConvertForm() {
onBlur={onBlur}
error={Boolean(error)}
helperText={
- "Correspondence path that can change the priority number to your own section name instead of the dir name"
+ "[Optional] File path that helps map priority number to a section name."
}
/>
@@ -275,7 +291,7 @@ export function ConvertForm() {
}}
onBlur={onBlur}
error={Boolean(error)}
- helperText={error?.message}
+ helperText={"[Optional]"}
/>
)}
/>
@@ -301,7 +317,7 @@ export function ConvertForm() {
}}
onBlur={onBlur}
error={Boolean(error)}
- helperText={error?.message}
+ helperText={"[Optional]"}
/>
)}
/>
@@ -349,3 +365,28 @@ export function ConvertForm() {
);
}
+
+function MappingHelpBtn() {
+ const handleMappingClick = () =>
+ open(
+ "https://github.com/SARDONYX-sard/dar-to-oar/wiki#what-is-the-mapping-file"
+ );
+
+ return (
+ <>
+
+ [Optional] File path that helps map priority number to a section name.
+
+
+ See {" "}
+
+ [What is the mapping file?]
+
+ (Jump to wiki)
+
+
+ );
+}
diff --git a/frontend/src/components/log_file_btn.tsx b/frontend/src/components/log_file_btn.tsx
index fbada17..b81c043 100644
--- a/frontend/src/components/log_file_btn.tsx
+++ b/frontend/src/components/log_file_btn.tsx
@@ -9,7 +9,7 @@ export const LogFileButton = () => {
sx={{
marginTop: "9px",
width: "100%",
- height: "80%",
+ height: "60%",
}}
variant="outlined"
onClick={async () => openLogFile().catch((e) => toast.error(`${e}`))}
diff --git a/frontend/src/components/pages/converter.tsx b/frontend/src/components/pages/converter.tsx
index f429c2c..a0f5e66 100644
--- a/frontend/src/components/pages/converter.tsx
+++ b/frontend/src/components/pages/converter.tsx
@@ -1,13 +1,13 @@
"use client";
import { ConvertForm } from "@/components/form";
-import { useDynStyleWithStorage, useToastLimit } from "@/hooks";
+import { useDynStyle, useToastLimit } from "@/hooks";
import { Box } from "@mui/material";
import { Toaster } from "react-hot-toast";
export default function Converter() {
useToastLimit(1);
- useDynStyleWithStorage();
+ useDynStyle();
return (
<>
diff --git a/frontend/src/components/pages/settings.tsx b/frontend/src/components/pages/settings.tsx
index d2d5c44..1eb7584 100644
--- a/frontend/src/components/pages/settings.tsx
+++ b/frontend/src/components/pages/settings.tsx
@@ -1,11 +1,12 @@
"use client";
import { Box, TextField } from "@mui/material";
-import { useDynStyle } from "@/hooks";
+import { useDynStyle, useStorageState } from "@/hooks";
import { SelectStyleList } from "./../style_list";
export default function Settings() {
const [style, setStyle] = useDynStyle();
+ const [preset, setPreset] = useStorageState("presetNumber", "0");
return (
{
setStyle(e.target.value);
+ localStorage.setItem("customCSS", e.target.value);
+ setPreset("0");
}}
placeholder="{ body: url('https://localhost' }"
value={style}
@@ -43,7 +46,11 @@ export default function Settings() {
maxHeight: "30%",
}}
>
-
+
);
diff --git a/frontend/src/components/style_list.tsx b/frontend/src/components/style_list.tsx
index 3760db4..ed4e6bf 100644
--- a/frontend/src/components/style_list.tsx
+++ b/frontend/src/components/style_list.tsx
@@ -1,38 +1,20 @@
+import { Tooltip } from "@mui/material";
import MenuItem from "@mui/material/MenuItem";
import Select from "@mui/material/Select";
-import { useEffect } from "react";
-import { useStorageState } from "@/hooks";
-
-function selectPreset(select: string) {
- switch (select) {
- case "1":
- case "2":
- return select;
- default:
- return "0";
- }
-}
+import { selectPreset, presetStyles } from "../utils/styles";
type Props = {
setStyle: (value: string) => void;
+ setPreset: (value: string) => void;
+ preset: string;
};
-export const SelectStyleList = ({ setStyle }: Props) => {
- const [preset, setPreset] = useStorageState("presetNumber", "0");
-
- useEffect(() => {
- const presetNumber = selectPreset(
- localStorage.getItem("presetNumber") ?? ""
- );
- if (presetNumber === "0") {
- setStyle(localStorage.getItem("customCSS") ?? "");
- } else {
- setStyle(presetStyles[presetNumber]);
- }
- }, [setStyle]);
-
+export const SelectStyleList = ({ preset, setPreset, setStyle }: Props) => {
return (
- <>
+
-
+
);
};
-
-const presetStyles = {
- "1": `body {
- background-attachment: fixed;
- background-image: url("https://i.redd.it/red-forest-1920-1080-v0-s9u8ki2rr70a1.jpg?s=139edf608c428656505a143635a0687dec086229");
- background-repeat: no-repeat;
- background-size: cover;
- background-color: #000;
-}
-
-div:has(textarea),
-.MuiOutlinedInput-root {
- background-color: #2424248c;
-}
-
-.MuiButton-outlined {
- color: #ff8e16;
- border-color: #ff8e16;
- background-color: #2424248c;
-}
-.MuiButton-outlined:hover {
- color: #fff;
- background-color: #ff89898b;
-}
-
-.MuiLoadingButton-root {
- color: #fff;
- background-color: #caaa6dc6;
-}
-.MuiLoadingButton-root:hover {
- background-color: #ff8e16;
-}`,
- "2": `body {
- background-attachment: fixed;
- background-image: url("https://images.pexels.com/photos/2817421/pexels-photo-2817421.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750& dpr=1");
- background-repeat: no-repeat;
- background-size: cover;
- background-color: #000;
-}
-
-div:has(textarea),
-.MuiButton-outlined,
-.MuiOutlinedInput-root {
- background-color: #2424248c;
-}
-
-.MuiButton-outlined:hover {
- background-color: #0e0d0dc7;
-}`,
-};
diff --git a/frontend/src/hooks/dyn_style.ts b/frontend/src/hooks/dyn_style.ts
index 823a07b..dd859dc 100644
--- a/frontend/src/hooks/dyn_style.ts
+++ b/frontend/src/hooks/dyn_style.ts
@@ -1,27 +1,14 @@
import { useInsertionEffect, useState } from "react";
-import { useStorageState } from "@/hooks";
+import { selectPreset, presetStyles } from "../utils/styles";
-/**
- * Inject CSS dynamically on the client side. & auto set local storage
- * # NOTE
- * Frequent style recalculation is inevitable,
- * but this hook can solve the delay problem caused by style injection lifecycle discrepancies.
- * - See: [useInsertionEffect](https://react.dev/reference/react/useInsertionEffect)
- */
-export function useDynStyleWithStorage() {
- const [style, setStyle] = useStorageState("customCSS");
-
- useInsertionEffect(() => {
- const styleElement = document.createElement("style");
- styleElement.innerHTML = style;
- document.head.appendChild(styleElement);
- return () => {
- document.head.removeChild(styleElement);
- };
- }, [style]);
-
- return [style, setStyle] as const;
-}
+const getStyle = () => {
+ const presetNumber = selectPreset(localStorage.getItem("presetNumber") ?? "");
+ if (presetNumber === "0") {
+ return localStorage.getItem("customCSS") ?? "";
+ } else {
+ return presetStyles[presetNumber];
+ }
+};
/**
* Inject CSS dynamically on the client side.
@@ -30,8 +17,8 @@ export function useDynStyleWithStorage() {
* but this hook can solve the delay problem caused by style injection lifecycle discrepancies.
* - See: [useInsertionEffect](https://react.dev/reference/react/useInsertionEffect)
*/
-export function useDynStyle() {
- const [style, setStyle] = useState("");
+export function useDynStyle(initialState = getStyle()) {
+ const [style, setStyle] = useState(initialState);
useInsertionEffect(() => {
const styleElement = document.createElement("style");
diff --git a/frontend/src/hooks/index.ts b/frontend/src/hooks/index.ts
index fdf0437..e998bce 100644
--- a/frontend/src/hooks/index.ts
+++ b/frontend/src/hooks/index.ts
@@ -1,3 +1,3 @@
export { useStorageState } from "./storage_state";
-export { useDynStyleWithStorage, useDynStyle } from "./dyn_style";
+export { useDynStyle } from "./dyn_style";
export { useToastLimit } from "./toasts_limit";
diff --git a/frontend/src/utils/styles.ts b/frontend/src/utils/styles.ts
new file mode 100644
index 0000000..c577f60
--- /dev/null
+++ b/frontend/src/utils/styles.ts
@@ -0,0 +1,82 @@
+const preset1 = `body {
+ background-attachment: fixed;
+ background-image: url("https://i.redd.it/red-forest-1920-1080-v0-s9u8ki2rr70a1.jpg?s=139edf608c428656505a143635a0687dec086229");
+ background-repeat: no-repeat;
+ background-size: cover;
+ background-color: #000;
+}
+
+div:has(textarea),
+.MuiOutlinedInput-root {
+ background-color: #2424248c;
+}
+
+.Mui-error {
+ color: #ff1655;
+ background-color: #2f2e2eba;
+}
+
+a,
+span.Mui-checked > svg,
+.MuiInputBase-root.MuiOutlinedInput-root.MuiInputBase-colorPrimary.Mui-focused > fieldset,
+.Mui-selected, /* Bottom Navigation */
+.MuiButton-outlined {
+ color: #ff8e16 !important;
+ border-color: #ff8e16;
+}
+
+
+label.Mui-focused {
+ color: #ff8e16 !important;
+}
+
+.MuiButton-outlined {
+ background-color: #2424248c;
+}
+
+.MuiButton-outlined:hover {
+ color: #fff !important;
+ background-color: #ff89898b;
+}
+
+.MuiLoadingButton-root {
+ color: #fff;
+ background-color: #ab2b7e6e;
+}
+
+.MuiLoadingButton-root:hover {
+ background-color: #fd3b3b6e;
+}`;
+
+const preset2 = `body {
+ background-attachment: fixed;
+ background-image: url("https://images.pexels.com/photos/2817421/pexels-photo-2817421.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750& dpr=1");
+ background-repeat: no-repeat;
+ background-size: cover;
+ background-color: #000;
+}
+
+div:has(textarea),
+.MuiButton-outlined,
+.MuiOutlinedInput-root {
+ background-color: #2424248c;
+}
+
+.MuiButton-outlined:hover {
+ background-color: #0e0d0dc7;
+}`;
+
+export const presetStyles = {
+ "1": preset1,
+ "2": preset2,
+} as const;
+
+export function selectPreset(select: string) {
+ switch (select) {
+ case "1":
+ case "2":
+ return select;
+ default:
+ return "0";
+ }
+}