diff --git a/README.md b/README.md
index 9433f01..de5dfaf 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,11 @@ So here's DevTools-X -- an x-platform non-electron, collection of dev-tools that
+### NOTE
+
+After migrating to tauri v2, app is facing minor bugs again, (because of tauri) You might see basic css breaking or app not working on specific platform. Please
+open a bug in issue tracker if you do. I will fix it if anything I can fix on my side.
+
## Installation
### Download prebuilt binaries
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index f2e5dc6..0495628 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -181,6 +181,7 @@ fn main() {
.title("DevTools-X")
.inner_size(1000.0, 850.0)
.resizable(true)
+ .min_inner_size(900.0, 800.0)
.fullscreen(false)
.build()?;
// #[cfg(debug_assertions)]
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 01abfe1..2ae4fcb 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -65,6 +65,7 @@
},
"dangerousDisableAssetCspModification": ["style-src"],
"csp": {
+ "connect-src": ["ipc:", "http://ipc.localhost"],
"default-src": [
"'self'",
"blob:",
diff --git a/src/App.tsx b/src/App.tsx
index 5615566..a2cf527 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -37,7 +37,7 @@ import { Settings } from "./Layout/Settings";
import { useDisclosure, useWindowEvent } from "@mantine/hooks";
import { trackOtherEvent, trackPageView } from "./utils/analytics";
import { db } from "./utils";
-import { ask, message } from "@tauri-apps/plugin-dialog";
+import { ask } from "@tauri-apps/plugin-dialog";
import { relaunch } from "@tauri-apps/plugin-process";
// Lazy load components
@@ -159,12 +159,8 @@ function App() {
async function init() {
const update = await check();
if (update === null) {
- await message("Failed to check for updates.\nPlease try again later.", {
- title: "Error",
- kind: "error",
- okLabel: "OK",
- });
- return;
+ console.log("no update");
+ // can re use this logic to manually check for updates
} else if (update?.available) {
const yes = await ask(
`Update to ${update.version} is available!\n\nRelease notes: ${update.body}`,
@@ -247,9 +243,9 @@ function App() {
id="navbar"
defaultSize={5}
maxSize={20}
- minSize={5}
+ minSize={8}
collapsible
- collapsedSize={4}
+ collapsedSize={5}
ref={panelRef}
onCollapse={() => {
setIconMode(true);
diff --git a/src/Features/url/UrlParser.tsx b/src/Features/url/UrlParser.tsx
index 5ad1462..2a778c8 100644
--- a/src/Features/url/UrlParser.tsx
+++ b/src/Features/url/UrlParser.tsx
@@ -23,7 +23,7 @@ export default function UrlParser() {
const onSubmit: FormEventHandler = (e) => {
e.preventDefault();
if (!key || !value) return;
- searchParams.set(key, value);
+ searchParams.append(key, value);
setSearchParams(searchParams);
setUrl(
url.split("?")[0] +
@@ -76,7 +76,7 @@ export default function UrlParser() {
-
+
Key
@@ -84,15 +84,16 @@ export default function UrlParser() {
- {Array.from(searchParams.keys()).map((key, i) => (
+ {[...new Set(searchParams.keys())].map((key, i) => (
{key}
- {searchParams.get(key)}
+ {searchParams.getAll(key).join(", ")}
))}
{
let key = e.currentTarget.value;
@@ -103,6 +104,7 @@ export default function UrlParser() {
{
let value = e.currentTarget.value;
diff --git a/src/Layout/Navbar/ColorIcons.tsx b/src/Layout/Navbar/ColorIcons.tsx
index 552bc52..a33b359 100644
--- a/src/Layout/Navbar/ColorIcons.tsx
+++ b/src/Layout/Navbar/ColorIcons.tsx
@@ -4,6 +4,8 @@ export const Package = () => (
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
(
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
(
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
@@ -80,6 +86,8 @@ export const Safe = () => (
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
@@ -122,6 +130,8 @@ export const Picture = () => (
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
(
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
@@ -182,6 +194,8 @@ export const MindMap = () => (
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
(
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
@@ -231,6 +247,8 @@ export const Electricity = () => (
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
(
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
enableBackground="new 0 0 48 48"
+ height={20}
+ width={20}
>
{
return (
-
+
{group.group}
diff --git a/src/Layout/Navbar/index.tsx b/src/Layout/Navbar/index.tsx
index c0ecb3d..9f7bb43 100644
--- a/src/Layout/Navbar/index.tsx
+++ b/src/Layout/Navbar/index.tsx
@@ -167,7 +167,7 @@ export const Navbar = ({ iconMode, setIconMode }: Props) => {