Merge branch 'apl-setup' into staging

aplbrain · Feb 5, 2025 · e698e9f · e698e9f
2 parents c169df2 + 0205147
commit e698e9f
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,11 @@
-# DANDI Archive
+# EMBER-DANDI Archive
 
 ![](https://www.dandiarchive.org/assets/dandi_logo.svg)
 
+## EMBER: Ecosystem for Multi-modal Brain-behavior Experimentation and Research
+
+[EMBER](https://app.emberarchive.org) is the BRAIN Initiative data archive for multi-modal neurophysical and behavioral data, supporting the Brain Behavior Quantification and Synchronization (BBQS) Program.
+
 ## DANDI: Distributed Archives for Neurophysiology Data Integration
 
 [DANDI](https://dandiarchive.org/) is a platform for publishing, sharing, and processing neurophysiology data
@@ -13,7 +17,7 @@ collaboration within and across labs, as well as the entry point for research.
 
 ## Structure
 
-The dandi-archive repository contains a Django-based [backend](dandiapi/) to run the DANDI REST API, and a
+The ember-dandi-archive repository contains a Django-based [backend](dandiapi/) to run the DANDI REST API, and a
 Vue-based [frontend](web/) to provide a user interface to the archive.
 
 ## Resources

diff --git a/dandiapi/api/admin.py b/dandiapi/api/admin.py
@@ -31,8 +31,8 @@
 if TYPE_CHECKING:
     from django.http.request import HttpRequest
 
-admin.site.site_header = 'DANDI Admin'
-admin.site.site_title = 'DANDI Admin'
+admin.site.site_header = 'EMBER-DANDI Admin'
+admin.site.site_title = 'EMBER-DANDI Admin'
 
 
 class UserMetadataInline(TabularInline):

diff --git a/dandiapi/urls.py b/dandiapi/urls.py
@@ -58,7 +58,7 @@
 
 schema_view = get_schema_view(
     openapi.Info(
-        title='DANDI Archive',
+        title='EMBER-DANDI Archive',
         default_version='v1',
         description='The BRAIN Initiative archive for publishing and sharing '
         'cellular neurophysiology data',

diff --git a/web/README.md b/web/README.md
@@ -1,12 +1,12 @@
-# DANDI Archive Web Application ![ci](https://github.com/dandi/dandi-archive/actions/workflows/frontend-ci.yml/badge.svg) [![Netlify Status](https://api.netlify.com/api/v1/badges/e7424684-fbdb-4b77-a546-d5757a0f7552/deploy-status)](https://app.netlify.com/sites/gui-dandiarchive-org/deploys)
-The DANDI Archive web application (i.e. the dandi-archive frontend).
+# EMBER-DANDI Archive Web Application ![ci](https://github.com/dandi/dandi-archive/actions/workflows/frontend-ci.yml/badge.svg) [![Netlify Status](https://api.netlify.com/api/v1/badges/e7424684-fbdb-4b77-a546-d5757a0f7552/deploy-status)](https://app.netlify.com/sites/gui-dandiarchive-org/deploys)
+The EMBER-DANDI Archive web application (i.e. the dandi-archive frontend).
 
 ## Develop
 
 ### Build and Run
 
 ```bash
-git clone https://github.com/dandi/dandi-archive
+git clone https://github.com/aplbrain/dandi-archive
 cd web
 yarn install
 yarn run serve
@@ -17,7 +17,7 @@ Instead, install and use `yarnpkg`.
 
 The web app will be served at `http://localhost:8085/`.
 
-To be useful, this app requires a server component, which you can run locally; see the [instructions](https://github.com/dandi/dandi-archive/#dandi-archive).
+To be useful, this app requires a server component, which you can run locally; see the [instructions](https://github.com/aplbrain/dandi-archive/#dandi-archive).
 
 ### Test
 

diff --git a/web/index.html b/web/index.html
@@ -5,13 +5,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="/favicon.ico">
-    <title>DANDI Archive</title>
+    <title>EMBER-DANDI Archive</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but the DANDI Archive doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but the EMBER-DANDI Archive doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>

diff --git a/web/public/favicon.ico b/web/public/favicon.ico
diff --git a/web/src/assets/ember-logo.png b/web/src/assets/ember-logo.png
diff --git a/web/src/components/AppBar/AppBar.vue b/web/src/components/AppBar/AppBar.vue
@@ -50,14 +50,16 @@
         </v-list-item-group>
       </v-list>
     </v-menu>
-    <router-link to="/">
+    <router-link to="/" class="d-flex align-center text-decoration-none">
       <v-img
-        alt="DANDI logo"
+        alt="EMBER logo"
         contain
-        width="100px"
+        height="40px"
+        width="30px"
         :src="logo"
         class="mr-3"
       />
+      <span class="flex-grow-1 font-weight-bold mr-3">EMBER-DANDI</span>
     </router-link>
     <v-toolbar-items v-if="!$vuetify.breakpoint.mobile">
       <template v-for="navItem in navItems">
@@ -145,7 +147,7 @@ import {
   dandiAboutUrl, dandiDocumentationUrl, dandiHelpUrl, dandihubUrl,
 } from '@/utils/constants';
 import UserMenu from '@/components/AppBar/UserMenu.vue';
-import logo from '@/assets/logo.svg';
+import logo from '@/assets/ember-logo.png';
 
 interface NavigationItem {
   text: string,

diff --git a/web/src/components/AppBar/UserMenu.vue b/web/src/components/AppBar/UserMenu.vue
@@ -8,7 +8,7 @@
         icon
         v-on="on"
       >
-        <v-avatar color="light-blue lighten-4">
+        <v-avatar color="secondary lighten-2">
           <span class="primary--text">
             {{ userInitials }}
           </span>

diff --git a/web/src/components/DandisetList.vue b/web/src/components/DandisetList.vue
@@ -23,8 +23,8 @@
             v-if="item.version && item.version !== 'draft'"
             class="mr-1"
             small
-            color="light-blue lighten-4"
-            text-color="light-blue darken-3"
+            color="primary lighten-4"
+            text-color="primary darken-3"
           >
             <b>{{ item.version }}</b>
           </v-chip>

diff --git a/web/src/components/DandisetsPage.vue b/web/src/components/DandisetsPage.vue
@@ -40,7 +40,7 @@
       </div>
       <v-chip-group
         :value="sortOption"
-        active-class="white light-blue--text"
+        active-class="white primary--text"
         dark
         mandatory
       >

diff --git a/web/src/plugins/vuetify.ts b/web/src/plugins/vuetify.ts
@@ -15,18 +15,18 @@ export default new Vuetify({
     },
     themes: {
       light: {
-        primary: colors.lightBlue.darken1,
-        secondary: colors.blueGrey.base,
-        accent: colors.lightBlue.darken1,
+        primary: colors.red.darken4,
+        secondary: colors.orange.darken2,
+        accent: colors.yellow.accent3,
         error: colors.red.base,
-        info: colors.lightBlue.lighten1,
+        info: colors.yellow.darken3,
         dropzone: colors.grey.lighten3,
         highlight: colors.yellow.lighten4,
       },
       dark: {
-        primary: colors.lightBlue.darken3,
-        secondary: colors.grey.base,
-        accent: colors.lightBlue.lighten1,
+        primary: colors.red.lighten2,
+        secondary: colors.orange.darken4,
+        accent: colors.yellow.accent3,
         dropzone: colors.grey.darken2,
         highlight: colors.grey.darken2,
       },

diff --git a/web/src/title.ts b/web/src/title.ts
@@ -2,7 +2,7 @@ import Vue from 'vue';
 
 import type { DirectiveBinding } from 'vue/types/options';
 
-const TITLE = 'DANDI Archive';
+const TITLE = 'EMBER-DANDI Archive';
 
 const setPageTitle = (el: HTMLElement, binding: DirectiveBinding) => {
   if (binding?.value) {

diff --git a/web/src/utils/constants.ts b/web/src/utils/constants.ts
@@ -1,5 +1,6 @@
-const dandiUrl = 'https://dandiarchive.org';
-const dandiAboutUrl = 'https://www.dandiarchive.org/';
+const dandiOriginalUrl = 'https://dandiarchive.org';
+const dandiUrl = 'https://app.emberarchive.org'; // TOOD - change to emberarchive.org soon
+const dandiAboutUrl = 'https://app.emberarchive.org/about';
 const dandiDocumentationUrl = 'https://www.dandiarchive.org/handbook/10_using_dandi/';
 const dandiHelpUrl = 'https://github.com/dandi/helpdesk/issues/new/choose';
 const dandihubUrl = 'https://hub.dandiarchive.org/';

diff --git a/web/src/views/DandisetLandingView/DandisetOwners.vue b/web/src/views/DandisetLandingView/DandisetOwners.vue
@@ -61,8 +61,8 @@
                   id="manage"
                   depressed
                   :disabled="manageOwnersDisabled"
-                  color="light-blue lighten-5"
-                  class="light-blue--text text--lighten-1 justify-start"
+                  color="secondary lighten-1"
+                  class="justify-start"
                   block
                   v-on="on"
                 >

diff --git a/web/src/views/HomeView/HomeView.vue b/web/src/views/HomeView/HomeView.vue
@@ -22,14 +22,14 @@
             align="center"
           >
             <v-col class="splash-text my-12">
-              <div class="text-h2 font-weight-thin text-center light-blue--text text--darken-1">
-                The DANDI Archive
+              <div class="text-h2 font-weight-thin text-center primary--text">
+                The EMBER-DANDI Archive
               </div>
               <div class="text-h6 font-weight-light text-center">
-                The BRAIN Initiative archive for publishing and sharing
+                An instance of DANDI, the BRAIN Initiative archive for publishing and sharing
                 neurophysiology data including electrophysiology,
                 optophysiology, and behavioral time-series, and images from
-                immunostaining experiments.
+                immunostaining experiments, to support the NIH BBQS Program.
               </div>
             </v-col>
           </v-row>
@@ -50,7 +50,7 @@ import { watchEffect } from 'vue';
 import { useRoute, useRouter } from 'vue-router/composables';
 import StatsBar from '@/views/HomeView/StatsBar.vue';
 import DandisetSearchField from '@/components/DandisetSearchField.vue';
-import logo from '@/assets/logo.svg';
+import logo from '@/assets/ember-logo.png';
 
 /**
 * Redirect old hash URLS to the correct one. This is only done on

diff --git a/web/src/views/HomeView/SingleStat.vue b/web/src/views/HomeView/SingleStat.vue
@@ -12,7 +12,7 @@
       </v-col>
     </v-row>
     <v-row
-      class="text-h6 font-weight-light text-center light-blue--text text--lighten-1"
+      class="text-h6 font-weight-light text-center secondary--text text--lighten-1"
       no-gutters
     >
       <v-col
@@ -22,6 +22,7 @@
         <a
           v-if="href"
           :href="href"
+          class="secondary--text text--lighten-1"
         >
           {{ name }}</a>
         <span v-else>