From e28e62632043b441f6da2802414dc1533c3e8d52 Mon Sep 17 00:00:00 2001 From: Bhavya Jain Date: Mon, 3 Jun 2024 17:36:13 +0530 Subject: [PATCH 1/2] Fix loader showing up in nprogress --- app/routes/_layout+/settings.general.tsx | 4 ++-- app/styles/nprogress.css | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/routes/_layout+/settings.general.tsx b/app/routes/_layout+/settings.general.tsx index 0a2cc1314..4d5ee7913 100644 --- a/app/routes/_layout+/settings.general.tsx +++ b/app/routes/_layout+/settings.general.tsx @@ -138,7 +138,7 @@ export async function loader({ context, request }: LoaderFunctionArgs) { currentOrganization.organization.owner.tier.tierLimit ), user, - curriences: Object.keys(Currency) + curriences: Object.keys(Currency), }) ); } catch (cause) { @@ -208,7 +208,7 @@ export async function action({ context, request }: ActionFunctionArgs) { } export default function GeneralPage() { - const { currentOrganization, user, canExportAssets, curriences} = + const { currentOrganization, user, canExportAssets, curriences } = useLoaderData(); const navigation = useNavigation(); const zo = useZorm("NewQuestionWizardScreen", EditWorkspaceFormSchema); diff --git a/app/styles/nprogress.css b/app/styles/nprogress.css index ac1f8a04e..06be2b255 100644 --- a/app/styles/nprogress.css +++ b/app/styles/nprogress.css @@ -6,3 +6,7 @@ #nprogress .peg { @apply shadow-lg shadow-primary-700; } + +#nprogress .spinner { + @apply hidden; +} From f56923aa96b173089e4a1e2ca3d8e6f8eff7bdd9 Mon Sep 17 00:00:00 2001 From: Donkoko Date: Tue, 4 Jun 2024 11:53:04 +0300 Subject: [PATCH 2/2] adding valuation to the csv import demo --- public/static/shelf.nu-example-asset-import-from-content.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/static/shelf.nu-example-asset-import-from-content.csv b/public/static/shelf.nu-example-asset-import-from-content.csv index f178395e5..77766912d 100644 --- a/public/static/shelf.nu-example-asset-import-from-content.csv +++ b/public/static/shelf.nu-example-asset-import-from-content.csv @@ -1,2 +1,2 @@ -title;description;category;tags;location;custodian;cf: Serial number,type:text;cf:brand, type:option;cf:purchase date, type:date -AMD Radeon RX 6800 XT;GPU from my new home PC.;PC Components;High priority, small;Storage room 2;Some guy;WQE239123d;amd;01-feb-2023 +title;description;category;tags;location;valuation;custodian;cf: Serial number,type:text;cf:brand, type:option;cf:purchase date, type:date +AMD Radeon RX 6800 XT;GPU from my new home PC.;PC Components;High priority, small;Storage room 2;100;Some guy;WQE239123d;amd;01-feb-2023