-
-
-
+
+
+ mdi-account-multiple
+
+ Contributors
+
+
+
-
-
- mdi-account-multiple
-
- Contributors
-
-
-
-
+
+
+ mdi-card-account-mail
+
+
+
+
-
-
+ 
- {{ contributor.name }}
-
-
-
-
- mdi-card-account-mail
-
-
-
-
- {{ contributor.name }}
-
-
-
-
-
-
- {{ slotProps.item }}
-
+
@@ -98,28 +94,28 @@
Resource Type: {{ slotProps.item.resourceType }}
Repo: {{ slotProps.item.repository }}
Relation: {{ slotProps.item.relation }} @@ -128,6 +124,7 @@
-
-
-
+
+
-
-
- mdi-clipboard-list
-
- Assets Summary
-
-
+ Assets Summary
+
+
+
+
+
+
diff --git a/web/src/components/DandisetSearchField.vue b/vue3/src/components/DandisetSearchField.vue
similarity index 88%
rename from web/src/components/DandisetSearchField.vue
rename to vue3/src/components/DandisetSearchField.vue
index c3029e657..c4df5899c 100644
--- a/web/src/components/DandisetSearchField.vue
+++ b/vue3/src/components/DandisetSearchField.vue
@@ -4,15 +4,14 @@
@submit="performSearch"
>
@@ -26,7 +25,7 @@
\ No newline at end of file
+
diff --git a/web/src/components/UserStatusBanner.vue b/vue3/src/components/UserStatusBanner.vue
similarity index 92%
rename from web/src/components/UserStatusBanner.vue
rename to vue3/src/components/UserStatusBanner.vue
index 82dd20f70..bc2088b34 100644
--- a/web/src/components/UserStatusBanner.vue
+++ b/vue3/src/components/UserStatusBanner.vue
@@ -4,12 +4,11 @@
single-line
:color="bannerInfo.color"
>
-
- {{ bannerInfo.icon }}
-
+
+
+ {{ bannerInfo.icon }}
+
+
{{ bannerInfo.text }}
diff --git a/vue3/src/main.ts b/vue3/src/main.ts
new file mode 100644
index 000000000..c8fc17224
--- /dev/null
+++ b/vue3/src/main.ts
@@ -0,0 +1,20 @@
+/**
+ * main.ts
+ *
+ * Bootstraps Vuetify and other plugins then mounts the App`
+ */
+
+// Plugins
+import { registerPlugins } from '@/plugins'
+
+// Components
+import App from './App.vue'
+
+// Composables
+import { createApp } from 'vue'
+
+const app = createApp(App)
+
+registerPlugins(app)
+
+app.mount('#app')
diff --git a/vue3/src/plugins/README.md b/vue3/src/plugins/README.md
new file mode 100644
index 000000000..62201c7cf
--- /dev/null
+++ b/vue3/src/plugins/README.md
@@ -0,0 +1,3 @@
+# Plugins
+
+Plugins are a way to extend the functionality of your Vue application. Use this folder for registering plugins that you want to use globally.
diff --git a/vue3/src/plugins/index.ts b/vue3/src/plugins/index.ts
new file mode 100644
index 000000000..b38b73748
--- /dev/null
+++ b/vue3/src/plugins/index.ts
@@ -0,0 +1,20 @@
+/**
+ * plugins/index.ts
+ *
+ * Automatically included in `./src/main.ts`
+ */
+
+// Plugins
+import vuetify from './vuetify'
+import pinia from './pinia'
+import router from '../router'
+
+// Types
+import type { App } from 'vue'
+
+export function registerPlugins (app: App) {
+ app
+ .use(vuetify)
+ .use(router)
+ .use(pinia)
+}
diff --git a/vue3/src/plugins/pinia.ts b/vue3/src/plugins/pinia.ts
new file mode 100644
index 000000000..ed7db6322
--- /dev/null
+++ b/vue3/src/plugins/pinia.ts
@@ -0,0 +1,3 @@
+import { createPinia } from 'pinia';
+
+export default createPinia();
diff --git a/web/src/plugins/vuetify.ts b/vue3/src/plugins/vuetify.ts
similarity index 55%
rename from web/src/plugins/vuetify.ts
rename to vue3/src/plugins/vuetify.ts
index 9c491ecbf..4fc2b170a 100644
--- a/web/src/plugins/vuetify.ts
+++ b/vue3/src/plugins/vuetify.ts
@@ -1,40 +1,55 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify/lib/framework';
+/**
+ * plugins/vuetify.ts
+ *
+ * Framework documentation: https://vuetifyjs.com`
+ */
-import colors from 'vuetify/lib/util/colors';
+// Styles
+import '@mdi/font/css/materialdesignicons.css'
+import 'vuetify/styles'
+import colors from 'vuetify/util/colors';
-Vue.use(Vuetify);
+// Composables
+import { createVuetify } from 'vuetify'
-export default new Vuetify({
+const DandiLightTheme = {
+ dark: false,
+ colors: {
+ primary: colors.lightBlue.darken1,
+ secondary: colors.blueGrey.base,
+ accent: colors.lightBlue.darken1,
+ error: colors.red.base,
+ info: colors.lightBlue.lighten1,
+ dropzone: colors.grey.lighten3,
+ highlight: colors.yellow.lighten4,
+ }
+};
+
+const DandiDarkTheme = {
+ dark: true,
+ colors: {
+ primary: colors.lightBlue.darken3,
+ secondary: colors.grey.base,
+ accent: colors.lightBlue.lighten1,
+ dropzone: colors.grey.darken2,
+ highlight: colors.grey.darken2,
+ }
+};
+
+// https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides
+export default createVuetify({
// Use Girder web components theme
// https://github.com/girder/girder_web_components/blob/master/src/utils/vuetifyConfig.js
theme: {
- dark: false,
- options: {
- customProperties: true,
- },
+ defaultTheme: 'DandiLightTheme',
themes: {
- light: {
- primary: colors.lightBlue.darken1,
- secondary: colors.blueGrey.base,
- accent: colors.lightBlue.darken1,
- error: colors.red.base,
- info: colors.lightBlue.lighten1,
- dropzone: colors.grey.lighten3,
- highlight: colors.yellow.lighten4,
- },
- dark: {
- primary: colors.lightBlue.darken3,
- secondary: colors.grey.base,
- accent: colors.lightBlue.lighten1,
- dropzone: colors.grey.darken2,
- highlight: colors.grey.darken2,
- },
+ DandiLightTheme,
+ DandiDarkTheme,
},
},
icons: {
- iconfont: 'mdi',
- values: {
+ defaultSet: 'mdi',
+ aliases: {
alert: 'mdi-alert-circle',
bitbucket: 'mdi-bitbucket',
box_com: 'mdi-package',
diff --git a/web/src/rest.ts b/vue3/src/rest.ts
similarity index 98%
rename from web/src/rest.ts
rename to vue3/src/rest.ts
index 714abd7bb..58ed74bc7 100644
--- a/web/src/rest.ts
+++ b/vue3/src/rest.ts
@@ -19,7 +19,6 @@ import type {
DandisetContributors,
Organization,
} from '@/types/schema';
-// eslint-disable-next-line import/no-cycle
import { useDandisetStore } from '@/stores/dandiset';
import qs from 'querystring';
@@ -43,7 +42,7 @@ try {
{ redirectUrl: new URL(window.location.origin) }
);
}
-} catch (e) {
+} catch {
oauthClient = null;
}
@@ -111,7 +110,6 @@ const dandiRest = {
const uploads = []
let page = 1;
- // eslint-disable-next-line no-constant-condition
while (true) {
const res = await client.get(`dandisets/${identifier}/uploads/`, {params: { page }});
diff --git a/web/src/router.ts b/vue3/src/router/index.ts
similarity index 88%
rename from web/src/router.ts
rename to vue3/src/router/index.ts
index e1e221ebd..d03e13844 100644
--- a/web/src/router.ts
+++ b/vue3/src/router/index.ts
@@ -1,6 +1,5 @@
-import Vue from 'vue';
-import type { RouteConfig } from 'vue-router';
-import Router from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
+import type { RouteRecordRaw } from 'vue-router';
import HomeView from '@/views/HomeView/HomeView.vue';
import PublicDandisetsView from '@/views/PublicDandisetsView/PublicDandisetsView.vue';
@@ -12,9 +11,7 @@ import FileBrowser from '@/views/FileBrowserView/FileBrowser.vue';
import SearchView from '@/views/SearchView/SearchView.vue';
import StarredDandisetsView from '@/views/StarredDandisetsView/StarredDandisetsView.vue';
-Vue.use(Router);
-
-const routes: RouteConfig[] = [
+const routes: RouteRecordRaw[] = [
{
path: '/',
name: 'home',
@@ -67,4 +64,7 @@ const routes: RouteConfig[] = [
},
];
-export default new Router({ mode: 'history', routes });
+export default createRouter({
+ history: createWebHistory(),
+ routes,
+});
diff --git a/web/src/stores/dandiset.ts b/vue3/src/stores/dandiset.ts
similarity index 98%
rename from web/src/stores/dandiset.ts
rename to vue3/src/stores/dandiset.ts
index 63aad9639..694ccdc86 100644
--- a/web/src/stores/dandiset.ts
+++ b/vue3/src/stores/dandiset.ts
@@ -3,7 +3,6 @@ import { defineStore } from 'pinia';
import axios from 'axios';
import RefParser from '@apidevtools/json-schema-ref-parser';
-// eslint-disable-next-line import/no-cycle
import { dandiRest, user } from '@/rest';
import type { User, Version } from '@/types';
import { draftVersion } from '@/utils/constants';
diff --git a/vue3/src/styles/README.md b/vue3/src/styles/README.md
new file mode 100644
index 000000000..ea861794d
--- /dev/null
+++ b/vue3/src/styles/README.md
@@ -0,0 +1,3 @@
+# Styles
+
+This directory is for configuring the styles of the application.
diff --git a/vue3/src/styles/settings.scss b/vue3/src/styles/settings.scss
new file mode 100644
index 000000000..eafade4a0
--- /dev/null
+++ b/vue3/src/styles/settings.scss
@@ -0,0 +1,24 @@
+/**
+ * src/styles/settings.scss
+ *
+ * Configures SASS variables and Vuetify overwrites
+ */
+
+// https://vuetifyjs.com/features/sass-variables/`
+
+/**
+
+This file is an artifact of the transition from Vuetify 2 to Vuetify 3.
+We want to maintain the same look and feel as before, so this file is used to globally override
+some styles that were changed from Vuetify 2 to Vuetify 3 that are not easy to/impossible to
+change without manual CSS styling.
+ */
+.v-theme--DandiLightTheme[class*="variant-outlined"] {
+ border: thin solid #E0E0E0 !important;
+ color: #424242 !important;
+ font-weight: 400 !important;
+}
+
+.v-theme--DandiLightTheme.v-card {
+ background-color: #FFFFFF;
+}
diff --git a/web/src/title.ts b/vue3/src/title.ts
similarity index 100%
rename from web/src/title.ts
rename to vue3/src/title.ts
diff --git a/web/src/types/index.ts b/vue3/src/types/index.ts
similarity index 95%
rename from web/src/types/index.ts
rename to vue3/src/types/index.ts
index 32a45ef58..fa2f120d9 100644
--- a/web/src/types/index.ts
+++ b/vue3/src/types/index.ts
@@ -16,9 +16,7 @@ export interface Dandiset {
identifier: string,
created: string,
modified: string,
- // eslint-disable-next-line no-use-before-define
draft_version?: Version,
- // eslint-disable-next-line no-use-before-define
most_recent_published_version?: Version,
contact_person?: string,
embargo_status: 'EMBARGOED' | 'UNEMBARGOING' | 'OPEN',
diff --git a/web/src/types/schema.ts b/vue3/src/types/schema.ts
similarity index 99%
rename from web/src/types/schema.ts
rename to vue3/src/types/schema.ts
index 5f99f97cf..88c334288 100644
--- a/web/src/types/schema.ts
+++ b/vue3/src/types/schema.ts
@@ -1,4 +1,3 @@
-/* eslint-disable */
/**
* This file was automatically generated by json-schema-to-typescript.
* DO NOT MODIFY IT BY HAND. All changes should be made through the "yarn migrate" command.
diff --git a/web/src/utils/constants.ts b/vue3/src/utils/constants.ts
similarity index 100%
rename from web/src/utils/constants.ts
rename to vue3/src/utils/constants.ts
diff --git a/web/src/views/CreateDandisetView/CreateDandisetView.vue b/vue3/src/views/CreateDandisetView/CreateDandisetView.vue
similarity index 92%
rename from web/src/views/CreateDandisetView/CreateDandisetView.vue
rename to vue3/src/views/CreateDandisetView/CreateDandisetView.vue
index 339fcb09c..070a6f39b 100644
--- a/web/src/views/CreateDandisetView/CreateDandisetView.vue
+++ b/vue3/src/views/CreateDandisetView/CreateDandisetView.vue
@@ -12,18 +12,17 @@
Embargo this Dandiset
-
+
Repo: {{ slotProps.item.repository }}
Relation: {{ slotProps.item.relation }} @@ -128,6 +124,7 @@
+ The assets summary is being computed, please wait.
+
+
+
+
+
+
+ {{ type }}
+
-
-
-
-
+
+
- The assets summary is being computed, please wait.
-
-
-
-
-
- {{ type }}
-
- mdi-link
+
+
+
+
+ {{ item.identifier }}
+
-
+
-
-
- {{ item.name || item.identifier || item.id || item }}
-
-
-
- mdi-link
-
-
-
- {{ item.name || item.identifier || item.id || item }}
+
+
+
- {{ item.identifier }}
-
-
-
(What is this?)
-
+
mdi-information
@@ -52,8 +51,8 @@
label="Title"
:counter="nameMaxLength"
required
- outlined
- dense
+ variant="outlined"
+ density="compact"
class="my-4"
/>
@@ -69,8 +68,8 @@
label="Description"
:counter="descriptionMaxLength"
required
- outlined
- dense
+ variant="outlined"
+ density="compact"
class="my-4"
/>
@@ -92,8 +91,8 @@
:items="dandiLicenses"
label="License"
class="my-4"
- outlined
- dense
+ variant="outlined"
+ density="compact"
/>
@@ -110,8 +109,8 @@
label="Award number"
:counter="120"
:required="embargoed"
- outlined
- dense
+ variant="outlined"
+ density="compact"
class="my-4"
:rules="awardNumberRules"
/>
@@ -125,7 +124,7 @@
type="submit"
color="primary"
:disabled="saveDisabled"
- depressed
+ variant="flat"
@click="registerDandiset"
>
Register Dandiset
@@ -139,7 +138,7 @@
-
diff --git a/web/src/views/DandisetLandingView/DandisetActions.vue b/vue3/src/views/DandisetLandingView/DandisetActions.vue
similarity index 65%
rename from web/src/views/DandisetLandingView/DandisetActions.vue
rename to vue3/src/views/DandisetLandingView/DandisetActions.vue
index 6d61013c5..6427f1ae2 100644
--- a/web/src/views/DandisetLandingView/DandisetActions.vue
+++ b/vue3/src/views/DandisetLandingView/DandisetActions.vue
@@ -3,68 +3,22 @@
v-if="currentDandiset"
height="100%"
class="px-3 py-1 mb-3"
- outlined
+ variant="outlined"
>
-
+
-
-
-
-
- mdi-download
-
- Download
-
- mdi-chevron-down
-
-
-
-
+
-
-
-
-
- mdi-format-quote-close
-
- Cite As
-
- mdi-chevron-down
-
-
-
-
+
mdi-folder
Files
-
+
+
mdi-note-text
Metadata
-
mdi-clipboard
Manifest
-
@@ -142,7 +97,7 @@
class="justify-center"
>
Dandiset Actions
-
+
+
-
-
+
+
mdi-alert-circle
@@ -51,14 +55,14 @@
-
+
-
+
-
{
- // Prompt user if they try to leave the DLP with unsaved changes in the meditor
- if (!editorInterface.value?.transactionTracker?.isModified()
- // eslint-disable-next-line no-alert
- || window.confirm('You have unsaved changes, are you sure you want to leave?')) {
- next();
- return true;
- }
- return false;
-});
+// // This guards against "soft" page navigations, i.e. using the back/forward buttons or clicking
+// // a link to navigate elsewhere in the SPA. The `beforeunload` event listener below handles
+// // "hard" page navigations, such as refreshing, closing tabs, or clicking external links.
+// onBeforeRouteLeave((to: Route, from: Route, next: NavigationGuardNext) => {
+// // Prompt user if they try to leave the DLP with unsaved changes in the meditor
+// if (!editorInterface.value?.transactionTracker?.isModified()
+// // eslint-disable-next-line no-alert
+// || window.confirm('You have unsaved changes, are you sure you want to leave?')) {
+// next();
+// return true;
+// }
+// return false;
+// });
const route = useRoute();
const router = useRouter();
const store = useDandisetStore();
+const display = useDisplay();
+const isSmDisplay = computed(() => display.smAndDown.value);
const currentDandiset = computed(() => store.dandiset);
const loading = ref(false);
@@ -274,18 +281,18 @@ watch(page, async (newValue, oldValue) => {
});
onMounted(async () => {
- // This guards against "hard" page navigations, i.e. refreshing, closing tabs, or
- // clicking external links. The `beforeRouteLeave` function above handles "soft"
- // page navigations, such as using the back/forward buttons or clicking a link
- // to navigate elsewhere in the SPA.
- window.addEventListener('beforeunload', (e) => {
- // display a confirmation prompt if attempting to navigate away from the
- // page with unsaved changes in the meditor
- if (editorInterface.value?.transactionTracker?.isModified()) {
- e.preventDefault();
- e.returnValue = 'You have unsaved changes, are you sure you want to leave?';
- }
- });
+ // // This guards against "hard" page navigations, i.e. refreshing, closing tabs, or
+ // // clicking external links. The `beforeRouteLeave` function above handles "soft"
+ // // page navigations, such as using the back/forward buttons or clicking a link
+ // // to navigate elsewhere in the SPA.
+ // window.addEventListener('beforeunload', (e) => {
+ // // display a confirmation prompt if attempting to navigate away from the
+ // // page with unsaved changes in the meditor
+ // if (editorInterface.value?.transactionTracker?.isModified()) {
+ // e.preventDefault();
+ // e.returnValue = 'You have unsaved changes, are you sure you want to leave?';
+ // }
+ // });
await fetchNextPage(); // get the current page and total count
});
diff --git a/web/src/views/DandisetLandingView/DandisetMain.vue b/vue3/src/views/DandisetLandingView/DandisetMain.vue
similarity index 86%
rename from web/src/views/DandisetLandingView/DandisetMain.vue
rename to vue3/src/views/DandisetLandingView/DandisetMain.vue
index 0ba38ad7b..fd26e75fa 100644
--- a/web/src/views/DandisetLandingView/DandisetMain.vue
+++ b/vue3/src/views/DandisetLandingView/DandisetMain.vue
@@ -2,14 +2,14 @@
-
+
-
+
-
+
mdi-content-copy
@@ -102,9 +100,9 @@
-
+
- mdi-account
+ mdi-account
@@ -115,15 +113,15 @@
-
+
- mdi-file
+ mdi-file
File Count {{ stats.asset_count }}
-
+
- mdi-server
+ mdi-server
Size {{ transformFilesize(stats.size) }}
@@ -131,21 +129,21 @@
-
+
- mdi-calendar-range
+ mdi-calendar-range
Created {{ formatDate(currentDandiset.created) }}
-
+
- mdi-history
+ mdi-history
Last update {{ formatDate(currentDandiset.modified) }}
-
+
- mdi-gavel
+ mdi-gavel
Licenses:
(none)
-
+
- mdi-account-question
+ mdi-account-question
Access Information:
{{ keyword }}
@@ -218,7 +216,7 @@
{{ item.name }}
@@ -268,10 +266,11 @@ import {
defineComponent, computed, ref,
} from 'vue';
-import filesize from 'filesize';
+import { filesize } from 'filesize';
import { marked } from 'marked';
import moment from 'moment';
import DOMPurify from 'dompurify';
+import { useDisplay } from 'vuetify';
import { useDandisetStore } from '@/stores/dandiset';
import type { AccessInformation, DandisetStats, SubjectMatterOfTheDataset } from '@/types';
@@ -340,8 +339,10 @@ export default defineComponent({
},
setup() {
const store = useDandisetStore();
+ const display = useDisplay();
const currentDandiset = computed(() => store.dandiset);
+ const isXsDisplay = computed(() => display.xs.value);
const transformFilesize = (size: number) => filesize(size, { round: 1, base: 10, standard: 'iec' });
@@ -401,6 +402,7 @@ export default defineComponent({
return {
currentDandiset,
+ isXsDisplay,
formatDate,
stats,
transformFilesize,
diff --git a/web/src/views/DandisetLandingView/DandisetOwners.vue b/vue3/src/views/DandisetLandingView/DandisetOwners.vue
similarity index 83%
rename from web/src/views/DandisetLandingView/DandisetOwners.vue
rename to vue3/src/views/DandisetLandingView/DandisetOwners.vue
index 909c836fa..b2526487c 100644
--- a/web/src/views/DandisetLandingView/DandisetOwners.vue
+++ b/vue3/src/views/DandisetLandingView/DandisetOwners.vue
@@ -1,6 +1,6 @@
-
+
@@ -21,23 +21,21 @@
/>
-
-
+
+
mdi-content-copy
@@ -57,26 +55,26 @@
+
{{ owner.name || owner.username }}
@@ -47,24 +46,24 @@
width="80%"
persistent
>
-
+
-
+
Yes
No, take me back
@@ -46,17 +46,17 @@
>
-
+
-
+
Publish
-
+
Publish Checklist
@@ -123,14 +123,14 @@
Cancel
Publish
@@ -153,12 +153,15 @@
-
-
+
This Version
-
+
{{ formatDate(currentDandiset.modified) }}
@@ -177,9 +180,9 @@
-
+
Other Versions
-
+
{{ formatDate(version.modified) }}
{{ version.version.toUpperCase() }}
-
+
This dandiset is already being published. Please wait for publishing to complete.
-
+
Publish complete.
-
+
Go to published dandiset
@@ -231,12 +233,13 @@ import {
ref,
watchEffect,
} from 'vue';
+import { useDisplay } from 'vuetify';
import axios from 'axios';
import moment from 'moment';
import type { RawLocation } from 'vue-router';
-import { useRoute } from 'vue-router/composables';
+import { useRoute } from 'vue-router';
import { dandiRest, loggedIn as loggedInFunc, user } from '@/rest';
import { useDandisetStore } from '@/stores/dandiset';
@@ -276,7 +279,9 @@ const props = defineProps({
});
const route = useRoute();
const store = useDandisetStore();
+const display = useDisplay();
+const isMdDisplay = computed(() => display.md.value);
const currentDandiset = computed(() => store.dandiset);
const currentVersion = computed(() => store.dandiset?.version);
diff --git a/web/src/views/DandisetLandingView/DandisetSidebar.vue b/vue3/src/views/DandisetLandingView/DandisetSidebar.vue
similarity index 100%
rename from web/src/views/DandisetLandingView/DandisetSidebar.vue
rename to vue3/src/views/DandisetLandingView/DandisetSidebar.vue
diff --git a/web/src/views/DandisetLandingView/DandisetUnembargo.vue b/vue3/src/views/DandisetLandingView/DandisetUnembargo.vue
similarity index 82%
rename from web/src/views/DandisetLandingView/DandisetUnembargo.vue
rename to vue3/src/views/DandisetLandingView/DandisetUnembargo.vue
index e1417c0f0..9c4612b3e 100644
--- a/web/src/views/DandisetLandingView/DandisetUnembargo.vue
+++ b/vue3/src/views/DandisetLandingView/DandisetUnembargo.vue
@@ -1,10 +1,13 @@
-
+
This dandiset has active uploads
@@ -32,19 +35,19 @@
Close
-
-
+
+
Clear Uploads
@@ -56,7 +59,13 @@
Delete all uploads? Once deleted, any partially uploaded data will be lost.
- Delete
+
+ Delete
+
@@ -95,22 +104,22 @@
Yes
No, take me back
@@ -122,24 +131,31 @@
class="mb-4"
no-gutters
>
-
-
+
+
{{ unembargo_in_progress ? 'Unembargoing' : 'Unembargo' }}
mdi-alert
- mdi-lock-open
+
+ mdi-alert
+
+
+ mdi-lock-open
+
@@ -147,12 +163,15 @@
-
-
+
This Version
-
+
{{ formatDate(currentDandiset.modified) }}
@@ -180,7 +199,8 @@ import { dandiRest } from '@/rest';
import { useDandisetStore } from '@/stores/dandiset';
import type { IncompleteUpload } from '@/types';
import DandisetValidationErrors from './DandisetValidationErrors.vue';
-import filesize from 'filesize';
+import { filesize } from 'filesize';
+import { useDisplay } from 'vuetify';
function formatDate(date: string, format: string = 'll'): string {
return moment(date).format(format);
@@ -202,6 +222,9 @@ const uploadHeaders = [
];
const store = useDandisetStore();
+const display = useDisplay();
+
+const isMdDisplay = computed(() => display.md.value);
const currentDandiset = computed(() => store.dandiset);
const unembargo_in_progress = computed(() => currentDandiset.value?.dandiset.embargo_status === 'UNEMBARGOING');
const showWarningDialog = ref(false);
diff --git a/web/src/views/DandisetLandingView/DandisetValidationErrors.vue b/vue3/src/views/DandisetLandingView/DandisetValidationErrors.vue
similarity index 83%
rename from web/src/views/DandisetLandingView/DandisetValidationErrors.vue
rename to vue3/src/views/DandisetLandingView/DandisetValidationErrors.vue
index 80d2aa9dc..6792c1c67 100644
--- a/web/src/views/DandisetLandingView/DandisetValidationErrors.vue
+++ b/vue3/src/views/DandisetLandingView/DandisetValidationErrors.vue
@@ -5,17 +5,14 @@
class="my-2 px-1"
no-gutters
>
-
-
-
-
+
+
+
+
@@ -87,8 +83,8 @@
@@ -120,7 +116,7 @@ import { computed, defineProps, ref} from 'vue';
import type { PropType } from 'vue';
import ValidationErrorDialog from '@/components/DLP/ValidationErrorDialog.vue';
-import { open as meditorOpen } from '@/components/Meditor/state';
+// import { open as meditorOpen } from '@/components/Meditor/state';
import type { Version } from '@/types';
const props = defineProps({
@@ -145,8 +141,8 @@ function openErrorDialog(tab: ErrorCategory) {
selectedTab.value = tab;
}
-function openMeditor() {
- errorDialogOpen.value = false;
- meditorOpen.value = true;
-}
+// function openMeditor() {
+// errorDialogOpen.value = false;
+// // meditorOpen.value = true;
+// }
diff --git a/web/src/views/DandisetLandingView/DownloadDialog.vue b/vue3/src/views/DandisetLandingView/DownloadDialog.vue
similarity index 78%
rename from web/src/views/DandisetLandingView/DownloadDialog.vue
rename to vue3/src/views/DandisetLandingView/DownloadDialog.vue
index 08598cafb..ead114e03 100644
--- a/web/src/views/DandisetLandingView/DownloadDialog.vue
+++ b/vue3/src/views/DandisetLandingView/DownloadDialog.vue
@@ -1,34 +1,51 @@
-
-
+
+
+ mdi-download
+
+ Download
+
+
+
+ mdi-chevron-down
+
+
+
Download full dandiset
-
+
+
Help
mdi-help-circle
@@ -38,10 +55,10 @@
-
+
Use this command in your DANDI CLI
-
+
-
+
Download a different version?
-
-
+
+
-
+
-
+
-
+
-
+
Don't have DANDI CLI?
-
-
+
+
Install the Python client (DANDI CLI)
@@ -108,7 +125,7 @@
pip install "dandi>=0.60.0"
-
+
diff --git a/web/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue b/vue3/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue
similarity index 70%
rename from web/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue
rename to vue3/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue
index c18124aef..1b63f6103 100644
--- a/web/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue
+++ b/vue3/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue
@@ -1,50 +1,45 @@
-
-
+
+
-
- mdi-web
-
- Open with
-
- mdi-chevron-down
-
+
+
+ mdi-web
+
+ Open with
+
+
+
+ mdi-chevron-down
+
+
-
+
-
-
Owners
@@ -22,9 +22,8 @@
+
+
mdi-web
@@ -88,10 +83,3 @@ const neurosiftURL = computed(() => {
});
-
diff --git a/web/src/views/DandisetLandingView/ShareDialog.vue b/vue3/src/views/DandisetLandingView/ShareDialog.vue
similarity index 56%
rename from web/src/views/DandisetLandingView/ShareDialog.vue
rename to vue3/src/views/DandisetLandingView/ShareDialog.vue
index 0ba4fefaf..90536af58 100644
--- a/web/src/views/DandisetLandingView/ShareDialog.vue
+++ b/vue3/src/views/DandisetLandingView/ShareDialog.vue
@@ -2,14 +2,13 @@
-
+
- Share "{{ meta.name }}"
+ Share "{{ meta.name }}"
- mdi-close
-
+ />
@@ -65,7 +62,8 @@
-
+
@@ -87,44 +85,32 @@
-
diff --git a/web/src/views/FileBrowserView/FileBrowser.vue b/vue3/src/views/FileBrowserView/FileBrowser.vue
similarity index 69%
rename from web/src/views/FileBrowserView/FileBrowser.vue
rename to vue3/src/views/FileBrowserView/FileBrowser.vue
index a18072688..54331d406 100644
--- a/web/src/views/FileBrowserView/FileBrowser.vue
+++ b/vue3/src/views/FileBrowserView/FileBrowser.vue
@@ -44,7 +44,7 @@
-
+
-
- mdi-folder
-
- ..
+
+
+ mdi-folder
+
+ ..
+
-
-
- mdi-folder
-
-
- mdi-file
-
-
- {{ item.name }}
-
-
+
-
- mdi-delete
-
-
-
-
-
-
-
-
-
- mdi-open-in-app
-
-
+
+ mdi-folder
- Open asset in browser (you can also click on the item itself)
-
-
-
-
-
-
-
-
- mdi-download
-
-
-
- Download asset
-
-
-
-
-
-
-
-
- mdi-information
-
-
+
+ mdi-file
- View asset metadata
-
-
-
-
-
-
-
- Open With mdi-menu-down
-
-
-
+ {{ item.name }}
+
+
+
+
+
-
- EXTERNAL SERVICES
-
-
-
+ mdi-delete
+
+
+
+
+
+
+
+
+
+ mdi-open-in-app
+
+
+
+ Open asset in browser (you can also click on the item itself)
+
+
+
+
+
+
+
+
+ mdi-download
+
+
+
+ Download asset
+
+
+
+
+
+
+
+
+ mdi-information
+
+
+
+ View asset metadata
+
+
+
+
+
+
+
+ Open With
+ mdi-menu-down
+
+
+
+
-
- {{ el.name }}
-
-
-
-
-
-
-
- {{ fileSize(item) }}
-
+
+ EXTERNAL SERVICES
+
+
+
+
+ {{ el.name }}
+
+
+
+
+
+
+
+ {{ fileSize(item) }}
+
+
@@ -258,7 +264,7 @@
v-if="currentDandiset.asset_count"
:page="page"
:page-count="pages"
- @changePage="changePage($event)"
+ @change-page="changePage($event)"
/>
@@ -270,8 +276,8 @@ import {
computed, onMounted, ref, watch,
} from 'vue';
import type { RawLocation } from 'vue-router';
-import { useRouter, useRoute } from 'vue-router/composables';
-import filesize from 'filesize';
+import { useRouter, useRoute } from 'vue-router';
+import { filesize } from 'filesize';
import { trimEnd } from 'lodash';
import axios from 'axios';
@@ -349,21 +355,21 @@ const EXTERNAL_SERVICES = [
name: 'Neurosift',
regex: /\.nwb$/,
maxsize: Infinity,
- endpoint: 'https://neurosift.app?p=/nwb&url=$asset_dandi_url$&dandisetId=$dandiset_id$&dandisetVersion=$dandiset_version$', // eslint-disable-line max-len
+ endpoint: 'https://neurosift.app?p=/nwb&url=$asset_dandi_url$&dandisetId=$dandiset_id$&dandisetVersion=$dandiset_version$',
},
{
name: 'Neurosift',
regex: /\.nwb\.lindi\.(json|tar)$/,
maxsize: Infinity,
- endpoint: 'https://neurosift.app?p=/nwb&url=$asset_dandi_url$&st=lindi&dandisetId=$dandiset_id$&dandisetVersion=$dandiset_version$', // eslint-disable-line max-len
+ endpoint: 'https://neurosift.app?p=/nwb&url=$asset_dandi_url$&st=lindi&dandisetId=$dandiset_id$&dandisetVersion=$dandiset_version$',
},
{
name: 'Neurosift',
regex: /\.avi$/,
maxsize: Infinity,
- endpoint: 'https://neurosift.app?p=/avi&url=$asset_dandi_url$&dandisetId=$dandiset_id$&dandisetVersion=$dandiset_version$', // eslint-disable-line max-len
+ endpoint: 'https://neurosift.app?p=/avi&url=$asset_dandi_url$&dandisetId=$dandiset_id$&dandisetVersion=$dandiset_version$',
}
];
type Service = typeof EXTERNAL_SERVICES[0];
diff --git a/web/src/views/HomeView/HomeView.vue b/vue3/src/views/HomeView/HomeView.vue
similarity index 78%
rename from web/src/views/HomeView/HomeView.vue
rename to vue3/src/views/HomeView/HomeView.vue
index 914c6f192..4c91c967f 100644
--- a/web/src/views/HomeView/HomeView.vue
+++ b/vue3/src/views/HomeView/HomeView.vue
@@ -6,15 +6,14 @@
-
+
The DANDI Archive
@@ -37,7 +36,7 @@
-
+
@@ -46,12 +45,16 @@
diff --git a/web/src/components/DandisetList.vue b/web/src/components/DandisetList.vue
deleted file mode 100644
index 29c2c67c9..000000000
--- a/web/src/components/DandisetList.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
-
- {{ item.name }}
-
-
-
- {{ item.version }}
-
-
- DRAFT
-
-
- {{ item.dandiset.embargo_status }}
-
-
- DANDI:{{ item.dandiset.identifier }}
- ·
- Contact {{ item.dandiset.contact_person }}
- ·
- Updated on {{ formatDate(item.modified) }}
- ·
-
-
- mdi-file
-
- {{ item.asset_count }}
- ·
-
- mdi-database
-
- {{ filesize(item.size, { round: 1, base: 10, standard: 'iec' }) }}
-
-
-
-
-
-
-
-
-
-
diff --git a/web/src/plugins/pinia.ts b/web/src/plugins/pinia.ts
deleted file mode 100644
index 5d6918fc4..000000000
--- a/web/src/plugins/pinia.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Vue from 'vue';
-import { createPinia, PiniaVuePlugin } from 'pinia';
-
-Vue.use(PiniaVuePlugin);
-
-export default createPinia();
diff --git a/web/src/types/shims-vue.d.ts b/web/src/types/shims-vue.d.ts
deleted file mode 100644
index 96956bb91..000000000
--- a/web/src/types/shims-vue.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module '*.vue' {
- import Vue from 'vue';
-
- export default Vue;
- }
diff --git a/web/src/types/shims-vuetify.d.ts b/web/src/types/shims-vuetify.d.ts
deleted file mode 100644
index 35ae588db..000000000
--- a/web/src/types/shims-vuetify.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module 'vuetify/lib/framework' {
- import Vuetify from 'vuetify';
-
- export default Vuetify;
-}
diff --git a/web/src/types/vjsf.d.ts b/web/src/types/vjsf.d.ts
deleted file mode 100644
index 303380d83..000000000
--- a/web/src/types/vjsf.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module '@koumoul/vjsf/lib/VJsf';
diff --git a/web/src/types/vue-cookie-law.d.ts b/web/src/types/vue-cookie-law.d.ts
deleted file mode 100644
index d6f3a7b6b..000000000
--- a/web/src/types/vue-cookie-law.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'vue-cookie-law';