Skip to content

Commit cc3b111

Browse files
committed
Fix dashboard toggle and hopefully fix csp issue in production.
1 parent e2930e9 commit cc3b111

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

apps/fluster/src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"style-src": "'self' 'unsafe-inline'",
2525
"img-src": "*",
2626
"script-src": "'self' 'unsafe-inline' 'unsafe-eval' *",
27-
"connect-src": "*",
27+
"connect-src": "'self' 'unsafe-inline' 'unsafe-eval' *",
2828
"frame-src": "*"
2929
},
3030
"assetProtocol": {

apps/fluster/src/features/dashboard/presentation/dashboards/dashboard/v0_dashboard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export function Dashboard() {
150150
</CardDescription>
151151
</CardHeader>
152152
<CardContent>
153-
<div className="grid grid-cols-1 @[450px]/dashboard:grid-cols-2 gap-3 @[600px]/dashboard:grid-cols-4 @[900px]/dashboard:grid-cols-6">
153+
<div className="grid grid-cols-1 @[450px]/dashboard:grid-cols-2 gap-3 @[600px]/dashboard:grid-cols-3 @[900px]/dashboard:grid-cols-6">
154154
{dashboardStaticData.quickCreateItems.map((item) => (
155155
<QuickActionCard key={`quick-action-${item.id}`} item={item} />
156156
))}

apps/fluster/src/features/settings/presentation/pages/general.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
showToast,
1111
SwitchInput,
1212
} from "@fluster.io/dev";
13-
import React, { type ReactNode } from "react";
13+
import React, { useEffect, type ReactNode } from "react";
1414
import { SettingPageTitle } from "../components/setting_page_title";
1515
import { useForm } from "react-hook-form";
1616
import { zodResolver } from "@hookform/resolvers/zod";
@@ -137,6 +137,7 @@ export const GeneralSettingsPage = connector(
137137
}
138138
);
139139

140+
form.watch((formState) => console.log("formState: ", formState))
140141
return (
141142
<Form {...form}>
142143
<SettingPageContainer>

packages/fluster_developer/src/components/inputs/checkbox_group/index.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { type ReactNode } from "react";
1+
import React, { useMemo, type ReactNode } from "react";
22
import { Checkbox } from "../../shad/checkbox";
33
import { Label } from "../../shad/label";
44
import { FormInputProps } from "../types";
@@ -18,6 +18,7 @@ interface CheckboxGroupProps<T extends FieldValues, J extends ValidValue>
1818
items: CheckboxGroupItem<J>[];
1919
}
2020

21+
2122
export const CheckboxGroup = <T extends FieldValues, J extends ValidValue>(
2223
props: CheckboxGroupProps<T, J>
2324
): ReactNode => {
@@ -31,13 +32,8 @@ export const CheckboxGroup = <T extends FieldValues, J extends ValidValue>(
3132
{props.items.map((item) => {
3233
return (
3334
<div
34-
className="flex items-start gap-3 cursor-pointer"
35-
onClick={() => {
36-
props.form.setValue(
37-
props.name,
38-
item.value as PathValue<T, typeof props.name>
39-
);
40-
}}
35+
key={`checkbox-item-${item.label}-${item.value}`}
36+
className="flex items-start gap-3"
4137
>
4238
<Checkbox
4339
id="terms-2"

0 commit comments

Comments
 (0)