From 2c1adc050d64d08b0995767050fbad58c0bf8ba8 Mon Sep 17 00:00:00 2001 From: Sanjay Soundarajan Date: Thu, 7 Nov 2024 15:33:11 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20=20merge:=20staging=20to=20main?= =?UTF-8?q?=20(#159)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Heath Harrelson Co-authored-by: Erik Benton Co-authored-by: Erik Benton Co-authored-by: Aydawka Co-authored-by: Aydan <62059163+Aydawka@users.noreply.github.com> --- components/download/FolderSelector.vue | 35 +- components/download/StepNav.vue | 3 +- components/side/DatasetSize.vue | 2 +- composables/useDownloadAgreementForm.ts | 11 + dev/datasetRecord.json | 1218 ++++++----------- nuxt.config.ts | 5 + .../[datasetid]/access/diabetes-research.vue | 126 ++ pages/datasets/[datasetid]/access/index.vue | 25 +- pages/datasets/[datasetid]/access/license.vue | 22 +- pages/datasets/[datasetid]/access/login.vue | 4 +- .../[datasetid]/access/research-purpose.vue | 288 +++- pages/datasets/[datasetid]/access/select.vue | 2 +- .../datasets/[datasetid]/access/submitted.vue | 16 +- .../datasets/[datasetid]/access/training.vue | 6 +- prisma/schema.prisma | 57 +- server/api/datasets/[datasetid]/index.get.ts | 22 +- server/api/datasets/index.get.ts | 19 +- server/api/dev/index.post.ts | 76 +- server/api/downloads/agreement/create.post.ts | 22 + server/api/downloads/request/create.post.ts | 11 +- types/download.d.ts | 7 + 21 files changed, 1043 insertions(+), 934 deletions(-) create mode 100644 composables/useDownloadAgreementForm.ts create mode 100644 pages/datasets/[datasetid]/access/diabetes-research.vue diff --git a/components/download/FolderSelector.vue b/components/download/FolderSelector.vue index 6e604fb..e7f8ea6 100644 --- a/components/download/FolderSelector.vue +++ b/components/download/FolderSelector.vue @@ -1,4 +1,6 @@ diff --git a/components/download/StepNav.vue b/components/download/StepNav.vue index 2dbb903..de7279e 100644 --- a/components/download/StepNav.vue +++ b/components/download/StepNav.vue @@ -3,8 +3,9 @@ import type { StepsProps } from "naive-ui"; const steps = [ "Overview", - "Training", "Log In", + "Diabetes Research", + "Training", "Research Purpose", "License", "Select Data", diff --git a/components/side/DatasetSize.vue b/components/side/DatasetSize.vue index 1e9ae1e..4524132 100644 --- a/components/side/DatasetSize.vue +++ b/components/side/DatasetSize.vue @@ -14,7 +14,7 @@ const props = defineProps({ }, }); -const parsedSize = byteSize(props.size).toString(); +const parsedSize = byteSize(props.size, { precision: 2 }).toString();