diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..27627524395b65dfe42d1aefc5d186e48acca2b3
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,11 @@
+name: Test_Action
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: self-hosted
+ steps:
+ - uses: actions/checkout@v1
+ - name: works
+ run: echo hello world
diff --git a/README.md b/README.md
index 7e5bf0ced2ed36396ee0d75aaabba9f79996b27c..c3fbfffc78a9a563c647a8bc0023e04bf5089864 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Interactive Atlas Viewer is an frontend module wrapping around [nehuba](https://
## Getting Started
-A live version of the Interactive Atlas Viewer is available at [https://kg.humanbrainproject.org/viewer/](https://kg.humanbrainproject.org/viewer/). This section is useful for developers who would like to develop this project.
+A live version of the Interactive Atlas Viewer is available at [https://interactive-viewer.apps.hbp.eu](https://interactive-viewer.apps.hbp.eu). This section is useful for developers who would like to develop this project.
### General information
Interactive atlas viewer is built with [Angular (v6.0)](https://angular.io/), [Bootstrap (v4)](http://getbootstrap.com/), and [fontawesome icons](https://fontawesome.com/). Some other notable packages used are: [ng2-charts](https://valor-software.com/ng2-charts/) for charts visualisation, [ngx-bootstrap](https://valor-software.com/ngx-bootstrap/) for UI and [ngrx/store](https://github.com/ngrx/platform) for state management.
diff --git a/deploy/app.js b/deploy/app.js
index 9cff68eecab451b4656f6bb6c39738d722d9d594..95d712170150e7a629c19e03348df9e4aaffc022 100644
--- a/deploy/app.js
+++ b/deploy/app.js
@@ -1,12 +1,10 @@
const path = require('path')
const express = require('express')
-const app = express()
+const app = express.Router()
const session = require('express-session')
const MemoryStore = require('memorystore')(session)
const crypto = require('crypto')
-app.disable('x-powered-by')
-
if (process.env.NODE_ENV !== 'production') {
app.use(require('cors')())
}
@@ -102,7 +100,12 @@ const datasetRouter = require('./datasets')
const pluginRouter = require('./plugins')
const previewRouter = require('./preview')
-app.use('/templates', jsonMiddleware, templateRouter)
+const setResLocalMiddleWare = routePathname => (req, res, next) => {
+ res.locals.routePathname = routePathname
+ next()
+}
+
+app.use('/templates', setResLocalMiddleWare('templates'), jsonMiddleware, templateRouter)
app.use('/nehubaConfig', jsonMiddleware, nehubaConfigRouter)
app.use('/datasets', jsonMiddleware, datasetRouter)
app.use('/plugins', jsonMiddleware, pluginRouter)
@@ -111,4 +114,4 @@ app.use('/preview', jsonMiddleware, previewRouter)
const catchError = require('./catchError')
app.use(catchError)
-module.exports = app
+module.exports = app
\ No newline at end of file
diff --git a/deploy/auth/hbp-oidc.js b/deploy/auth/hbp-oidc.js
index a6963750d8469a224c04018c1ef63209cfa9bfc8..a3dfb823b7e500535da14969f8ea966df5957140 100644
--- a/deploy/auth/hbp-oidc.js
+++ b/deploy/auth/hbp-oidc.js
@@ -2,10 +2,11 @@ const passport = require('passport')
const { configureAuth } = require('./oidc')
const HOSTNAME = process.env.HOSTNAME || 'http://localhost:3000'
+const HOST_PATHNAME = process.env.HOST_PATHNAME || ''
const clientId = process.env.HBP_CLIENTID || 'no hbp id'
const clientSecret = process.env.HBP_CLIENTSECRET || 'no hbp client secret'
const discoveryUrl = 'https://services.humanbrainproject.eu/oidc'
-const redirectUri = `${HOSTNAME}/hbp-oidc/cb`
+const redirectUri = `${HOSTNAME}${HOST_PATHNAME}/hbp-oidc/cb`
const cb = (tokenset, {sub, given_name, family_name, ...rest}, done) => {
return done(null, {
id: `hbp-oidc:${sub}`,
@@ -34,8 +35,8 @@ module.exports = async (app) => {
passport.use('hbp-oidc', oidcStrategy)
app.get('/hbp-oidc/auth', passport.authenticate('hbp-oidc'))
app.get('/hbp-oidc/cb', passport.authenticate('hbp-oidc', {
- successRedirect: '/',
- failureRedirect: '/'
+ successRedirect: `${HOST_PATHNAME}/`,
+ failureRedirect: `${HOST_PATHNAME}/`
}))
} catch (e) {
console.error(e)
diff --git a/deploy/auth/index.js b/deploy/auth/index.js
index 4f0f75a53c987f8207cd943cc7923acd704ef974..0ad0941dfe9804a442d131130410d6a4098acaea 100644
--- a/deploy/auth/index.js
+++ b/deploy/auth/index.js
@@ -1,6 +1,7 @@
const hbpOidc = require('./hbp-oidc')
const passport = require('passport')
const objStoreDb = new Map()
+const HOST_PATHNAME = process.env.HOST_PATHNAME || ''
module.exports = async (app) => {
app.use(passport.initialize())
@@ -29,9 +30,8 @@ module.exports = async (app) => {
})
app.get('/logout', (req, res) => {
- if (req.user && req.user.id)
- objStoreDb.delete(req.user.id)
+ if (req.user && req.user.id) objStoreDb.delete(req.user.id)
req.logout()
- res.redirect('/')
+ res.redirect(`${HOST_PATHNAME}/`)
})
}
\ No newline at end of file
diff --git a/deploy/auth/util.js b/deploy/auth/util.js
index 4236ccae6dc09132aeb9961e5a05cde8fcb8d6d7..278f31cdd32d7fca15a5a0715c72fbf36dc8c767 100644
--- a/deploy/auth/util.js
+++ b/deploy/auth/util.js
@@ -2,25 +2,28 @@ const { configureAuth } = require('./oidc')
const jwtDecode = require('jwt-decode')
const HOSTNAME = process.env.HOSTNAME || 'http://localhost:3000'
+const HOST_PATHNAME = process.env.HOST_PATHNAME || ''
const clientId = process.env.HBP_CLIENTID || 'no hbp id'
const clientSecret = process.env.HBP_CLIENTSECRET || 'no hbp client secret'
const discoveryUrl = 'https://services.humanbrainproject.eu/oidc'
-const redirectUri = `${HOSTNAME}/hbp-oidc/cb`
+const redirectUri = `${HOSTNAME}${HOST_PATHNAME}/hbp-oidc/cb`
let REFRESH_TOKEN = process.env.REFRESH_TOKEN || null
const CLIENT_NOT_INIT = `Client is not initialised.`
const REFRESH_TOKEN_MISSING = `refresh token is missing`
+const REFRESH_ACCESS_TOKEN_MISSING = `access token not defined upon refresh`
+const REFRESH_REFRESH_TOKEN_MISSING = `refresh token not defined upon refresh`
let __client
let __publicAccessToken
const refreshToken = async () => {
- if (!__client)
- throw new Error(CLIENT_NOT_INIT)
- if (!REFRESH_TOKEN)
- throw new Error(REFRESH_TOKEN_MISSING)
+ if (!__client) throw new Error(CLIENT_NOT_INIT)
+ if (!REFRESH_TOKEN) throw new Error(REFRESH_TOKEN_MISSING)
const tokenset = await __client.refresh(REFRESH_TOKEN)
const {access_token: accessToken, refresh_token: refreshToken, id_token: idToken} = tokenset
+ if (!accessToken) throw new Error(REFRESH_ACCESS_TOKEN_MISSING)
+ if (!refreshToken) throw new Error(REFRESH_REFRESH_TOKEN_MISSING)
if (refreshToken !== REFRESH_TOKEN) {
REFRESH_TOKEN = refreshToken
}
diff --git a/deploy/csp/index.js b/deploy/csp/index.js
index b37e4a7cdcf37dc918007d2c0fa0e3cbd64c66a2..46ddff660ca8b7159ada06a06282621cc5e7986c 100644
--- a/deploy/csp/index.js
+++ b/deploy/csp/index.js
@@ -3,7 +3,10 @@ const bodyParser = require('body-parser')
let WHITE_LIST_SRC, DATA_SRC, SCRIPT_SRC
-const reportOnly = process.env.NODE_ENV !== 'production'
+// TODO bandaid solution
+// OKD/nginx reverse proxy seems to strip csp header
+// without it, testSafari.js will trigger no unsafe eval csp
+const reportOnly = true || process.env.NODE_ENV !== 'production'
try {
WHITE_LIST_SRC = JSON.parse(process.env.WHITE_LIST_SRC || '[]')
diff --git a/deploy/datasets/index.js b/deploy/datasets/index.js
index 1a7bc99122ff035e95632d5e6d6772a669a99cf4..3f58252f77ea7b691f81ca063d47456730d856d9 100644
--- a/deploy/datasets/index.js
+++ b/deploy/datasets/index.js
@@ -177,6 +177,7 @@ datasetsRouter.get('/downloadKgFiles', checkKgQuery, async (req, res) => {
try {
const stream = await getDatasetFileAsZip({ user, kgId })
res.setHeader('Content-Type', 'application/zip')
+ res.setHeader('Content-Disposition', `attachment; filename="${kgId}.zip"`)
stream.pipe(res)
} catch (e) {
console.warn('datasets/index#downloadKgFiles', e)
diff --git a/deploy/datasets/query.js b/deploy/datasets/query.js
index b6f0c3f672bb4e57bd92f108a2db99091ada6cff..2cb5682ed8ebf37ab2c6301976fc52043e01241d 100644
--- a/deploy/datasets/query.js
+++ b/deploy/datasets/query.js
@@ -10,7 +10,7 @@ const { init: kgQueryUtilInit, getUserKGRequestParam } = require('./util')
let cachedData = null
let otherQueryResult = null
-const KG_ROOT = process.env.KG_ROOT || `https://kg.humanbrainproject.org`
+const KG_ROOT = process.env.KG_ROOT || `https://kg.humanbrainproject.eu`
const KG_PATH = process.env.KG_PATH || `/query/minds/core/dataset/v1.0.0/interactiveViewerKgQuery-v0_3`
const KG_PARAM = {
size: process.env.KG_SEARCH_SIZE || '1000',
@@ -130,23 +130,15 @@ let juBrainSet = new Set(),
allen2015Set = new Set(),
allen2017Set = new Set()
-readConfigFile('colin.json')
- .then(data => JSON.parse(data))
- .then(json => {
- const juBrain = flattenArray(json.parcellations[0].regions)
- juBrainSet = populateSet(juBrain)
-
- })
- .catch(console.error)
-
readConfigFile('MNI152.json')
.then(data => JSON.parse(data))
.then(json => {
const longBundle = flattenArray(json.parcellations.find(({ name }) => name === 'Fibre Bundle Atlas - Long Bundle').regions)
const shortBundle = flattenArray(json.parcellations.find(({ name }) => name === 'Fibre Bundle Atlas - Short Bundle').regions)
-
+ const jubrain = flattenArray(json.parcellations.find(({ name }) => 'JuBrain Cytoarchitectonic Atlas' === name).regions)
longBundleSet = populateSet(longBundle)
shortBundleSet = populateSet(shortBundle)
+ juBrainSet = populateSet(jubrain)
})
.catch(console.error)
diff --git a/deploy/datasets/supplements/commonSense.js b/deploy/datasets/supplements/commonSense.js
index 404617f8f6e82ba5ff8475dbd5dd0bf27b1069b3..2d1116a3478930b7e120002552746cf624075013 100644
--- a/deploy/datasets/supplements/commonSense.js
+++ b/deploy/datasets/supplements/commonSense.js
@@ -59,14 +59,5 @@ exports.getCommonSenseDsFilter = ({ templateName, parcellationName }) => {
? dsIsRat
: null
- const falseFilters = queryIsHuman({ templateName, parcellationName })
- ? [dsIsMouse, dsIsRat]
- : queryIsMouse({ templateName, parcellationName })
- ? [dsIsHuman, dsIsRat]
- : queryIsRat({ templateName, parcellationName })
- ? [dsIsMouse, dsIsHuman]
- : []
- return ds => trueFilter
- ? trueFilter({ ds }) || (falseFilters.every(filterFn => !filterFn({ ds })))
- : false
+ return ds => trueFilter && trueFilter({ ds })
}
diff --git a/deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json b/deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json
new file mode 100644
index 0000000000000000000000000000000000000000..636b30eac795f47d30830431cb4b0e775b4eed14
--- /dev/null
+++ b/deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json
@@ -0,0 +1,212 @@
+[
+ [
+ "Probabilistic cytoarchitectonic map of Area TE 2.1 (STG) (v5.1)",
+ [
+ {
+ "filename": "Area TE 2.1 (STG) [v5.1, Colin 27, right hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TE 2.1 (STG) [v5.1, Colin 27, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.1_r_N10_nlin2Stdcolin27_5.1_publicDOI_efa4e9b9415b25e5f15f62cae3f85dc7.nii.gz",
+ "position": [
+ 57687872,
+ -10579427,
+ 2794828
+ ]
+ },
+ {
+ "filename": "Area TE 2.1 (STG) [v5.1, Colin 27, left hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TE 2.1 (STG) [v5.1, Colin 27, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.1_l_N10_nlin2Stdcolin27_5.1_publicDOI_b7611bb31d7954fbd78da2466dbd0f20.nii.gz",
+ "position": [
+ -54752402,
+ -14155814,
+ 4981183
+ ]
+ },
+ {
+ "filename": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.1_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_13aac2e4455a8ce628917a9c9fc0b626.nii.gz",
+ "position": [
+ -55002111,
+ -15505517,
+ 5163420
+ ]
+ },
+ {
+ "filename": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.1_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_7e1aaa3048cfff77868cca1c2ee572ae.nii.gz",
+ "position": [
+ 56763205,
+ -9981199,
+ 3148015
+ ]
+ }
+ ]
+ ],
+ [
+ "Probabilistic cytoarchitectonic map of Area TE 2.2 (STG) (v5.1)",
+ [
+ {
+ "filename": "Area TE 2.2 (STG) [v5.1, Colin 27, left hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TE 2.2 (STG) [v5.1, Colin 27, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.2_l_N10_nlin2Stdcolin27_5.1_publicDOI_2622704e8adfe45a66563e39a483e708.nii.gz",
+ "position": [
+ -53471942,
+ -28134287,
+ 10852650
+ ]
+ },
+ {
+ "filename": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.2_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_312d40100d5ad5a083758514d85ba48e.nii.gz",
+ "position": [
+ -54521424,
+ -29405149,
+ 11189029
+ ]
+ },
+ {
+ "filename": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.2_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_33f079dbd0e96f222ac27c5ed4d0bf33.nii.gz",
+ "position": [
+ 55039649,
+ -22056652,
+ 11496780
+ ]
+ },
+ {
+ "filename": "Area TE 2.2 (STG) [v5.1, Colin 27, right hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TE 2.2 (STG) [v5.1, Colin 27, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.2_r_N10_nlin2Stdcolin27_5.1_publicDOI_b2c5dd9c628afe1e50234b32ef557806.nii.gz",
+ "position": [
+ 55434400,
+ -23123733,
+ 10370400
+ ]
+ }
+ ]
+ ],[
+ "Probabilistic cytoarchitectonic map of Area TeI (STG) (v5.1)",
+ [
+ {
+ "filename": "Area TeI (STG) [v5.1, Colin 27, right hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TeI (STG) [v5.1, Colin 27, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI1_r_N10_nlin2Stdcolin27_5.1_publicDOI_390febadfb960f019db219f2017726de.nii.gz",
+ "position": [
+ 50527679,
+ -642644,
+ -5612912
+ ]
+ },
+ {
+ "filename": "Area TeI (STG) [v5.1, Colin 27, left hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TeI (STG) [v5.1, Colin 27, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI1_l_N10_nlin2Stdcolin27_5.1_publicDOI_cd40b4fa9fd491879a4f6eddfcd5ecc3.nii.gz",
+ "position": [
+ -48914649,
+ -3808370,
+ -3908357
+ ]
+ },
+ {
+ "filename": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI1_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_d0163a91613b36333d2f7113762b49ef.nii.gz",
+ "position": [
+ -48886190,
+ -5123482,
+ -3930952
+ ]
+ },
+ {
+ "filename": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI1_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_84d7716eb0afee93bf8ff8625361c4d8.nii.gz",
+ "position": [
+ 48374985,
+ -829541,
+ -5684517
+ ]
+ }
+ ]
+ ],[
+ "Probabilistic cytoarchitectonic map of Area TI (STG) (v5.1)",
+ [
+ {
+ "filename": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI2_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_0d90b238155bc15ca0ec39ca312475a7.nii.gz",
+ "position": [
+ -46764789,
+ -2393771,
+ -10637798
+ ]
+ },
+ {
+ "filename": "Area TI (STG) [v5.1, Colin 27, left hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TI (STG) [v5.1, Colin 27, left hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI2_l_N10_nlin2Stdcolin27_5.1_publicDOI_45fbfa8808ec4de620328650b134bdc3.nii.gz",
+ "position": [
+ -46437396,
+ -730832,
+ -10300790
+ ]
+ },
+ {
+ "filename": "Area TI (STG) [v5.1, Colin 27, right hemisphere]",
+ "templateSpace": "MNI Colin 27",
+ "name": "Area TI (STG) [v5.1, Colin 27, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI2_r_N10_nlin2Stdcolin27_5.1_publicDOI_42dd664fb5c8690e7c149fcb0d821a0e.nii.gz",
+ "position": [
+ 47248486,
+ 920283,
+ -12354141
+ ]
+ },
+ {
+ "filename": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric",
+ "name": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]",
+ "mimetype": "application/nifti",
+ "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI2_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_6d04657cb03e80a480d2332fd88ce368.nii.gz",
+ "position": [
+ 45506411,
+ 637737,
+ -12972330
+ ]
+ }
+ ]
+ ]
+]
\ No newline at end of file
diff --git a/deploy/datasets/supplements/previewFile.js b/deploy/datasets/supplements/previewFile.js
index 2600b01bb9615dab3c7ee4aa18878405bfb18070..7134a9286f324969802a549ffb012fc67a2ff104 100644
--- a/deploy/datasets/supplements/previewFile.js
+++ b/deploy/datasets/supplements/previewFile.js
@@ -4,8 +4,10 @@ const path = require('path')
const DISABLE_RECEPTOR_PREVIEW = process.env.DISABLE_RECEPTOR_PREVIEW
const DISABLE_JUBRAIN_PMAP = process.env.DISABLE_JUBRAIN_PMAP
const DISABLE_JUBRAIN_PMAP_V17 = process.env.DISABLE_JUBRAIN_PMAP_V17
+const DISABLE_JUBRAIN_PMAP_EXTRA = process.env.DISABLE_JUBRAIN_PMAP_EXTRA
const DISABLE_DWM_PMAP = process.env.DISABLE_DWM_PMAP
const HOSTNAME = process.env.HOSTNAME || 'http://localhost:3000'
+const HOST_PATHNAME = process.env.HOST_PATHNAME || ''
let previewMap = new Map(),
previewMapKeySet = new Set()
@@ -24,7 +26,8 @@ Promise.all([
DISABLE_RECEPTOR_PREVIEW ? Promise.resolve([]) : readFile('receptorPreview.json'),
DISABLE_JUBRAIN_PMAP ? Promise.resolve([]) : readFile('pmapJubrainPreview.json'),
DISABLE_DWM_PMAP ? Promise.resolve([]) : readFile('pmapDWMPreview.json'),
- DISABLE_JUBRAIN_PMAP_V17 ? Promise.resolve([]) : readFile('pmapJuBrainV17Preview.json')
+ DISABLE_JUBRAIN_PMAP_V17 ? Promise.resolve([]) : readFile('pmapJuBrainV17Preview.json'),
+ DISABLE_JUBRAIN_PMAP_EXTRA ? Promise.resolve([]) : readFile('pmapJuBrainExtraPreview.json')
])
.then(arrOfA => arrOfA.reduce((acc, item) => acc.concat(item), []))
.then(iterable => {
@@ -48,7 +51,7 @@ exports.getPreviewFile = ({ datasetName, templateSelected }) => previewMap.get(d
...file,
...(file.url && !/^http/.test(file.url)
? {
- url: `${HOSTNAME}/${file.url}`
+ url: `${HOSTNAME}${HOST_PATHNAME}/${file.url}`
}
: {})
}
diff --git a/deploy/datasets/util.js b/deploy/datasets/util.js
index 284d85f89b424538cb45741d467e84a957dd38d7..983ddd931ad7487459f4fd914edbceea69b20812 100644
--- a/deploy/datasets/util.js
+++ b/deploy/datasets/util.js
@@ -1,14 +1,15 @@
const kgQueryUtil = require('./../auth/util')
-let getPublicAccessToken, publicAccessToken
+let getPublicAccessToken
const getUserKGRequestParam = async ({ user }) => {
+ let publicAccessToken
/**
* n.b. ACCESS_TOKEN env var is usually only set during dev
*/
const accessToken = (user && user.tokenset && user.tokenset.access_token) || process.env.ACCESS_TOKEN
const releasedOnly = !accessToken
- if (!accessToken && !publicAccessToken && getPublicAccessToken) {
+ if (!accessToken && getPublicAccessToken) {
publicAccessToken = await getPublicAccessToken()
}
const option = accessToken || publicAccessToken
diff --git a/deploy/server.js b/deploy/server.js
index 9045664cf8a90542b482513e2026eacf291ea016..ce483fb833f85430d3a557af0c66b267fd490fab 100644
--- a/deploy/server.js
+++ b/deploy/server.js
@@ -56,7 +56,22 @@ if (process.env.FLUENT_HOST) {
}
}
+const server = require('express')()
+
const app = require('./app')
const PORT = process.env.PORT || 3000
-app.listen(PORT, () => console.log(`listening on port ${PORT}`))
\ No newline at end of file
+// e.g. HOST_PATHNAME=/viewer
+// n.b. leading slash is important
+// n.b. no trailing slash is important
+const HOST_PATHNAME = process.env.HOST_PATHNAME || ''
+
+if(HOST_PATHNAME !== '') {
+ if (HOST_PATHNAME.slice(0,1) !== '/') throw new Error(`HOST_PATHNAME, if defined and non-empty, should start with a leading slash. HOST_PATHNAME: ${HOST_PATHNAME}`)
+ if (HOST_PATHNAME.slice(-1) === '/') throw new Error(`HOST_PATHNAME, if defined and non-emtpy, should NOT end with a slash. HOST_PATHNAME: ${HOST_PATHNAME}`)
+}
+
+server.disable('x-powered-by')
+
+server.use(HOST_PATHNAME, app)
+server.listen(PORT, () => console.log(`listening on port ${PORT}`))
\ No newline at end of file
diff --git a/deploy/templates/index.js b/deploy/templates/index.js
index 7fe831604d47d6c856849ba24dd8e1c8c4b5b75f..77ac71014049242dab5757bf564e42f1b8830b61 100644
--- a/deploy/templates/index.js
+++ b/deploy/templates/index.js
@@ -2,16 +2,19 @@ const router = require('express').Router()
const query = require('./query')
const path = require('path')
const { detEncoding } = require('nomiseco')
+const url = require('url')
/**
* root path fetches all templates
*/
router.get('/', (req, res, next) => {
- const baseUrl = req.baseUrl
query.getAllTemplates()
.then(templates => {
- const templatesRes = templates.map(v => path.join(baseUrl.slice(1), v))
- res.status(200).send(JSON.stringify(templatesRes))
+
+ const templatesRes = templates.map(v => {
+ return url.resolve(`${res.locals.routePathname}/`, v)
+ })
+ res.status(200).json(templatesRes)
})
.catch(error => next({
code: 500,
diff --git a/package.json b/package.json
index b8e7735b3d7ed847500faa0265e9cbd4ab1231cb..8b3f3a58a9110fbcb592137eda0ce04a153dc267 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"build-min": "webpack --config webpack.prod.js",
"build": "webpack --config webpack.dev.js",
"plugin-server": "node ./src/plugin_examples/server.js",
- "dev-server": "webpack-dev-server --config webpack.dev.js --mode development",
+ "dev-server": "BACKEND_URL=http://localhost:3000/ webpack-dev-server --config webpack.dev.js --mode development",
"dev": "npm run dev-server & (cd deploy; node server.js)",
"dev-server-aot": "PRODUCTION=true GIT_HASH=`git log --pretty=format:'%h' --invert-grep --grep=^.ignore -1` webpack-dev-server --config webpack.aot.js",
"dev-server-all-interfaces": "webpack-dev-server --config webpack.dev.js --mode development --hot --host 0.0.0.0",
diff --git a/src/atlasViewer/atlasViewer.constantService.service.ts b/src/atlasViewer/atlasViewer.constantService.service.ts
index 43a0ae087eb2b564065d419ffcf4bd224e0d9f19..cb6da036d05d4961dbccd1769c7ef5ca5a8c1576 100644
--- a/src/atlasViewer/atlasViewer.constantService.service.ts
+++ b/src/atlasViewer/atlasViewer.constantService.service.ts
@@ -57,7 +57,8 @@ export class AtlasViewerConstantsServices implements OnDestroy {
prevLandmarks.length === newLandmarks.length
}
- public backendUrl = BACKEND_URL
+ // instead of using window.location.href, which includes query param etc
+ public backendUrl = BACKEND_URL || `${window.location.origin}${window.location.pathname}`
/* to be provided by KG in future */
public templateUrlsPr : Promise<string[]> = new Promise((resolve, reject) => {
diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html
index c55b4fe3b5166971a78f4f89785e97905d040087..1b9074a3760022cf3993fbef5d243dc984de52ec 100644
--- a/src/atlasViewer/atlasViewer.template.html
+++ b/src/atlasViewer/atlasViewer.template.html
@@ -7,9 +7,11 @@
<!-- kg tos -->
<ng-template #kgToS>
<h2 mat-dialog-title>Knowledge Graph ToS</h2>
- <mat-dialog-content class="w-50vw">
- <kgtos-component>
- </kgtos-component>
+ <mat-dialog-content>
+ <small>
+ <kgtos-component>
+ </kgtos-component>
+ </small>
</mat-dialog-content>
<mat-dialog-actions class="justify-content-end">
@@ -22,9 +24,11 @@
<!-- cookie -->
<ng-template #cookieAgreementComponent>
<h2 mat-dialog-title>Cookie Disclaimer</h2>
- <mat-dialog-content class="w-50vw">
- <cookie-agreement>
- </cookie-agreement>
+ <mat-dialog-content>
+ <small>
+ <cookie-agreement>
+ </cookie-agreement>
+ </small>
</mat-dialog-content>
<mat-dialog-actions class="justify-content-end">
@@ -106,7 +110,11 @@
<div floatingMouseContextualContainerDirective>
- <div class="d-inline-block" iav-mouse-hover #iavMouseHoverConetxtualBlock="iavMouseHover" contextualBlock>
+ <div *ngIf="!ismobile"
+ class="d-inline-block"
+ iav-mouse-hover
+ #iavMouseHoverConetxtualBlock="iavMouseHover"
+ contextualBlock>
<ng-container
*ngFor="let labelText of iavMouseHoverConetxtualBlock.currentOnHoverObs$ | async | mouseOverTextPipe : selectedParcellation">
diff --git a/src/components/flatTree/flatTree.style.css b/src/components/flatTree/flatTree.style.css
index 2141fb09a515b4b00818afd5f45306edcbeed0c5..f501aada1d1758cdc2bcc57c1d9c12889282bb64 100644
--- a/src/components/flatTree/flatTree.style.css
+++ b/src/components/flatTree/flatTree.style.css
@@ -54,9 +54,14 @@ span[renderText]
border-left:rgba(128,128,128,0.6) 1px dashed;
}
+.render-node-text
+{
+ opacity: 0.8;
+}
+
.render-node-text:hover
{
- color:rgba(219, 181, 86,1);
+ opacity: 1.0;
}
.render-node-level-1
diff --git a/src/components/radiolist/radiolist.style.css b/src/components/radiolist/radiolist.style.css
index 2d8352e629901669d33dd8df685d0d4eaf0549be..d293cda69f806438eef820f796f1f4b075d60699 100644
--- a/src/components/radiolist/radiolist.style.css
+++ b/src/components/radiolist/radiolist.style.css
@@ -1,5 +1,3 @@
-/*@import "~@angular/material/prebuilt-themes/indigo-pink.css";*/
-
:host-context([darktheme="true"]) ul
{
background-color:rgba(30,30,30);
diff --git a/src/index.html b/src/index.html
index f805b632d4972715268dace025282d807365fffe..51f07004e81a25768bbaa6b38fe1458a05318ffc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="google-site-verification" content="fkW3HNDR3bwEn8fdtO-W41KNwbM-RoiL2TSWQAmbK6w" />
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
diff --git a/src/main-aot.ts b/src/main-aot.ts
index 10bfb6cac304ba1bece7e906b4645d09bf093505..f50f694558cc500241e9e8ecff71b988d2938fdc 100644
--- a/src/main-aot.ts
+++ b/src/main-aot.ts
@@ -8,7 +8,7 @@ import { enableProdMode } from '@angular/core';
const requireAll = (r:any) => {r.keys().forEach(r)}
requireAll(require.context('./res/ext', false, /\.json$/))
-requireAll(require.context('./res/images', true, /\.jpg|\.png/))
+requireAll(require.context('./res/images', true, /\.jpg$|\.png$|\.svg$/))
requireAll(require.context(`./plugin_examples`, true))
/* aot === production mode */
diff --git a/src/main.ts b/src/main.ts
index 479dbb34491927cd7ed00952948534c70cdc698f..048f8fae6222ccba576f1547b0a1ab72d1423f64 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,7 @@ import { MainModule } from './main.module';
const requireAll = (r:any) => {r.keys().forEach(r)}
requireAll(require.context('./res/ext',false, /\.json$/))
-requireAll(require.context('./res/images',true,/\.jpg|\.png/))
+requireAll(require.context('./res/images',true,/\.jpg$|\.png$|\.svg$/))
requireAll(require.context(`./plugin_examples`, true))
platformBrowserDynamic().bootstrapModule(MainModule)
\ No newline at end of file
diff --git a/src/res/css/extra_styles.css b/src/res/css/extra_styles.css
index d831b31366539901331ac379181b5c977dc95540..0342c195bd156b65306bb3c43988337b0b3d570f 100644
--- a/src/res/css/extra_styles.css
+++ b/src/res/css/extra_styles.css
@@ -147,7 +147,7 @@ label.perspective-panel-show-slice-views:before
span.regionSelected
{
- color : #dbb556
+ color : rgba(219, 181, 86,1);
}
span.regionNotSelected,
@@ -158,7 +158,7 @@ span.regionSelected
.cursor-default
{
- cursor: default;
+ cursor: default!important;
}
markdown-dom pre code
diff --git a/src/res/ext/colin.json b/src/res/ext/colin.json
index cc450f3455422e968b837474909fbce47be8decc..6c71c879011f52a8a68b78ef6c1065058fec1fda 100644
--- a/src/res/ext/colin.json
+++ b/src/res/ext/colin.json
@@ -9,11 +9,15 @@
{
"name": "JuBrain Cytoarchitectonic Atlas",
"ngId": "jubrain colin v18 left",
- "auxillaryMeshIndices": [ 65535 ],
- "originDatasets":[{
- "kgSchema": "minds/core/dataset/v1.0.0",
- "kgId": "4ac9f0bc-560d-47e0-8916-7b24da9bb0ce"
- }],
+ "auxillaryMeshIndices": [
+ 65535
+ ],
+ "originDatasets": [
+ {
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "4ac9f0bc-560d-47e0-8916-7b24da9bb0ce"
+ }
+ ],
"properties": {
"version": "1.0",
"description": "This dataset contains the whole-brain parcellation of the JuBrain Cytoarchitectonic Atlas (Amunts and Zilles, 2015) in the MNI Colin 27 as well as the MNI ICBM 152 2009c nonlinear asymmetric reference space. The parcellation is derived from the individual probability maps (PMs) of the cytoarchitectonic regions released in the JuBrain Atlas, that are further combined into a Maximum Probability Map (MPM). The MPM is calculated by considering for each voxel the probability of all cytoarchitectonic areas released in the atlas, and determining the most probable assignment (Eickhoff 2005). Note that methodological improvements and integration of new brain structures may lead to small deviations in earlier released datasets.",
@@ -996,9 +1000,6 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/C3HS-8R7",
"synonyms": [],
- "relatedAreas":[
- "Area 7A"
- ],
"rgb": [
52,
20,
@@ -1137,6 +1138,9 @@
62944473
]
}
+ ],
+ "relatedAreas": [
+ "Area 7A"
]
}
]
@@ -1510,9 +1514,6 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/C5QQ-EFB",
"synonyms": [],
- "relatedAreas":[
- "Area PFm"
- ],
"rgb": [
187,
133,
@@ -1571,8 +1572,8 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/F1TJ-54W",
"synonyms": [],
- "relatedAreas":[
- "Area PFop"
+ "relatedAreas": [
+ "Area PF"
],
"rgb": [
226,
@@ -1623,8 +1624,8 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/8DP8-8HE",
"synonyms": [],
- "relatedAreas":[
- "Area PGp"
+ "relatedAreas": [
+ "Area PFcm"
],
"rgb": [
98,
@@ -1675,7 +1676,7 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/V5HY-XTS",
"synonyms": [],
- "relatedAreas":[
+ "relatedAreas": [
"Area PGa"
],
"rgb": [
@@ -1727,7 +1728,7 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/JGM9-ZET",
"synonyms": [],
- "relatedAreas":[
+ "relatedAreas": [
"Area PFt"
],
"rgb": [
@@ -1779,8 +1780,8 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/TB94-HRK",
"synonyms": [],
- "relatedAreas":[
- "Area PFcm"
+ "relatedAreas": [
+ "Area PFm"
],
"rgb": [
53,
@@ -1871,6 +1872,9 @@
30721440
]
}
+ ],
+ "relatedAreas": [
+ "Area PGp"
]
},
{
@@ -1920,6 +1924,9 @@
24917260
]
}
+ ],
+ "relatedAreas": [
+ "Area PFop"
]
}
]
@@ -2758,6 +2765,9 @@
1637838
]
}
+ ],
+ "relatedAreas": [
+ "Area hOc1"
]
}
]
@@ -2941,7 +2951,7 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/F9P8-ZVW",
"synonyms": [],
- "relatedAreas":[
+ "relatedAreas": [
"Area 44v",
"Area 44d"
],
@@ -3385,7 +3395,7 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/5HSF-81J",
"synonyms": [],
- "relatedAreas":[
+ "relatedAreas": [
"Area 4p"
],
"rgb": [
@@ -4877,7 +4887,7 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/MV3G-RET",
"synonyms": [],
- "relatedAreas":[
+ "relatedAreas": [
"Area Te1"
],
"rgb": [
@@ -4938,8 +4948,8 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/F2JH-KVV",
"synonyms": [],
- "relatedAreas":[
- "Area FG1"
+ "relatedAreas": [
+ "Area FG2"
],
"rgb": [
67,
@@ -5079,6 +5089,9 @@
-12612536
]
}
+ ],
+ "relatedAreas": [
+ "Area FG1"
]
},
{
@@ -5088,7 +5101,7 @@
"labelIndex": null,
"doi": "https://doi.org/10.25493/13RG-FYV",
"synonyms": [],
- "relatedAreas":[
+ "relatedAreas": [
"Area FG2"
],
"rgb": [
@@ -6071,4 +6084,4 @@
"name": "MNI Colin 27",
"description": "A stereotaxic average of 27 T1-weighted MRI scans of the same individual. (Holmes et al., 1998), mapped to fit the MNI305 space. Although not capturing brain variability, it is well established in neuroscience due to its high definition. HBP provides the JuBrain probabilistic cytoarchitectonic atlas (Amunts et al.) in this space."
}
-}
+}
\ No newline at end of file
diff --git a/src/res/images/ebrains-logo-dark.svg b/src/res/images/ebrains-logo-dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..07efd73a6543f1585f19d96c1b60c10096be6d87
--- /dev/null
+++ b/src/res/images/ebrains-logo-dark.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="195.36511mm"
+ height="72.386971mm"
+ viewBox="0 0 195.36511 72.386971"
+ version="1.1"
+ id="svg10463"
+ inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
+ sodipodi:docname="ebrains-logo-light.svg">
+ <defs
+ id="defs10457" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="360.62249"
+ inkscape:cy="-188.92002"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata10460">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-10.418633,-26.461277)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path9759"
+ d="m 100.86129,53.406057 h 11.58381 v 2.399165 h -8.79602 v 5.630664 h 8.19242 v 2.389516 h -8.19242 v 5.656851 h 8.90489 v 2.400543 h -11.69268 z m 0,0"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9761"
+ d="m 122.98846,69.491897 c 2.68027,0 3.73585,-1.164442 3.73585,-2.716109 0,-1.759761 -1.39869,-3.202566 -3.63665,-3.202566 h -4.12309 v 5.918675 z m -0.288,-8.093216 c 1.87688,0 3.33759,-1.136883 3.33759,-2.922821 0,-1.533755 -1.05558,-2.696821 -3.26594,-2.696821 h -3.80754 v 5.619642 z m -6.52364,-7.992624 h 6.76755 c 3.9329,0 5.82771,2.119424 5.82771,4.853451 0,2.309593 -1.41662,3.464388 -3.11298,3.897093 v 0.18052 c 1.83141,0.09922 3.83508,1.714283 3.83508,4.573713 0,2.833245 -1.94028,4.971962 -6.23425,4.971962 h -7.08311 z m 0,0"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9763"
+ d="m 139.11563,62.491463 c 2.71614,0 3.853,-1.209916 3.853,-3.29351 0,-2.093243 -1.13686,-3.402375 -3.88881,-3.402375 h -3.50022 v 6.695885 z m -6.32379,-9.085406 h 6.58562 c 4.28572,0 6.39685,2.389521 6.39685,5.791896 0,2.480469 -1.12723,4.367001 -3.39273,5.204849 l 4.09691,7.479994 h -3.17638 l -3.75239,-6.992166 h -3.97012 v 6.992166 h -2.78776 z m 0,0"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9765"
+ d="m 158.834,64.646716 -2.7244,-7.885133 h -0.14467 l -2.7244,7.885133 z m -11.06015,7.23608 6.64905,-18.476739 h 3.22048 l 6.64901,18.476739 h -2.95864 l -1.68811,-4.890659 h -7.21678 l -1.69637,4.890659 z m 0,0"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9767"
+ d="m 169.7384,71.882796 h -2.78776 V 53.406057 h 2.78776 z m 0,0"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9769"
+ d="m 188.70987,71.882796 h -2.56318 l -9.39133,-13.551628 h -0.17085 v 13.551628 h -2.78779 V 53.406057 h 2.57969 l 9.40099,13.568168 h 0.17085 V 53.406057 h 2.76162 z m 0,0"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9771"
+ d="m 199.01758,55.562687 c -2.27376,0 -3.7083,1.163063 -3.7083,2.732648 -0.008,1.768025 1.91273,2.444642 3.35689,2.815333 l 1.80386,0.468535 c 2.34541,0.577398 5.31372,1.867242 5.31372,5.196585 0,3.130901 -2.49838,5.412933 -6.83782,5.412933 -4.14101,0 -6.73033,-2.065679 -6.91088,-5.412933 h 2.79604 c 0.16263,2.011934 1.94857,2.968291 4.09554,2.968291 2.37299,0 4.09554,-1.190625 4.09554,-2.994475 0,-1.642624 -1.52411,-2.291681 -3.49885,-2.815334 l -2.18419,-0.595312 c -2.96831,-0.8034 -4.80797,-2.309593 -4.80797,-4.881013 0,-3.184644 2.84152,-5.30407 6.54981,-5.30407 3.75239,0 6.3693,2.146985 6.45061,5.105633 h -2.68855 c -0.19844,-1.704634 -1.70603,-2.696821 -3.82545,-2.696821"
+ style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9773"
+ d="m 46.260668,26.461277 -17.89384,4.890657 -13.0514,13.183693 -4.71149,17.94068 4.89204,17.893823 13.02519,12.960449 17.91864,5.517666 18.07436,-5.607238 12.95908,-13.026593 4.80243,-18.097779 -4.892,-17.893823 -13.18094,-13.050022 z m 0,0"
+ style="fill:#191919;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9775"
+ d="m 76.643658,81.048127 c -2.08637,-0.618741 -4.15618,-1.295358 -6.19979,-2.065679 -5.97105,-2.254472 -10.86996,-6.299012 -16.86168,-8.429458 -5.49561,-1.952683 -11.2696,-3.166735 -17.01603,-4.107932 -1.29811,-0.213599 -2.64996,-0.508498 -3.9715,-0.498854 -3.67936,0.02617 -6.44094,2.30684 -8.37018,5.222768 -2.01196,3.037197 -4.95681,7.240211 -8.55486,9.373412"
+ style="fill:none;stroke:#ffffff;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9777"
+ d="m 77.582118,79.803757 c -2.3482,-0.666969 -4.67985,-1.397328 -6.97703,-2.244823 -5.84288,-2.156629 -10.77351,-5.921428 -16.51441,-8.335751 -4.7432,-1.9954 -9.6435,-3.875046 -14.59205,-5.304071 -5.2958,-1.529625 -9.61732,0.846116 -13.37797,4.289834 -2.32477,2.129067 -4.73357,4.186478 -7.28158,6.046829 -1.22506,0.89435 -2.69268,2.024338 -4.24984,2.849785"
+ style="fill:none;stroke:#ffffff;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9779"
+ d="m 77.954158,78.406429 c -2.5218,-0.68902 -5.02292,-1.446943 -7.48411,-2.341287 -5.60448,-2.036742 -10.47585,-5.849771 -15.65452,-8.771213 -4.12859,-2.330263 -9.14191,-6.163967 -14.01191,-6.688998 -5.67337,-0.611852 -9.70138,2.881476 -14.19651,5.670626 -3.0014,1.861729 -6.03169,3.687629 -9.14192,5.363325 -1.10243,0.593937 -2.42948,1.429025 -3.79512,2.051899"
+ style="fill:none;stroke:#ffffff;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9781"
+ d="m 78.298678,77.10556 c -2.70235,-0.680752 -5.38124,-1.446943 -7.99677,-2.428105 -5.86076,-2.19797 -10.78727,-7.249858 -15.57182,-11.142814 -4.82314,-3.924655 -9.66692,-8.320596 -16.40279,-5.323364 -4.04865,1.801095 -7.98572,3.890203 -11.99307,5.782249 -3.40236,1.605415 -6.81302,3.197049 -10.26498,4.689466 -0.97289,0.420298 -2.15251,1.070734 -3.34451,1.553048"
+ style="fill:none;stroke:#ffffff;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9783"
+ d="m 78.648698,75.788155 c -3.04546,-0.704176 -6.05648,-1.528244 -8.94072,-2.718869 -7.09687,-2.928332 -10.5089,-10.322887 -14.92967,-16.038987 -3.6697,-4.745964 -9.72481,-3.097829 -14.37569,-1.293977 -5.5893,2.167652 -11.18415,4.325662 -16.78862,6.453352 -3.11852,1.185111 -6.23838,2.366092 -9.37479,3.50435 -0.71797,0.260448 -1.59441,0.694533 -2.47361,1.029397"
+ style="fill:none;stroke:#ffffff;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9785"
+ d="m 79.191668,73.739012 c -3.70279,-0.723468 -7.36565,-1.666049 -10.62193,-3.436826 -5.4846,-2.980698 -7.61369,-9.526382 -10.92235,-14.495585 -2.26134,-3.394109 -6.32379,-5.470813 -10.35869,-4.362869 -1.66193,0.456131 -3.29766,1.054199 -4.93889,1.577851 -6.76067,2.160765 -13.52133,4.320151 -20.28059,6.480916 -3.76481,1.20165 -7.52824,2.404674 -11.29302,3.607702"
+ style="fill:none;stroke:#ffffff;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9787"
+ d="m 79.784188,71.50659 c -4.20712,-1.278821 -8.29578,-2.790526 -11.90346,-5.503884 -4.68397,-3.525023 -8.25997,-8.695423 -12.16258,-13.021085 -4.06661,-4.507562 -9.16259,-4.252623 -14.34401,-2.473579 -6.10472,2.095997 -12.19976,4.227822 -18.26588,6.432685 -3.50573,1.276064 -7.01146,2.563148 -10.47034,3.964614 -0.45752,0.186034 -1.10243,0.38585 -1.78456,0.621496"
+ style="fill:none;stroke:#ffffff;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9789"
+ d="m 80.859068,67.457915 c -3.86126,-1.473124 -7.69221,-3.006882 -11.26959,-5.112523 -5.65961,-3.333475 -10.24019,-8.060145 -15.21217,-12.300371 -4.69498,-4.005954 -9.85985,-3.999064 -15.40922,-1.933384 -5.43222,2.022958 -10.83963,4.118955 -16.18919,6.349999 -3.1805,1.325671 -6.35412,2.685796 -9.44231,4.219552 -0.58705,0.290766 -1.28019,0.598069 -1.983,0.941199"
+ style="fill:none;stroke:#ffffff;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9791"
+ d="m 82.064858,62.90901 c -9.00687,-4.499296 -17.77393,-9.321052 -26.47762,-14.410147 -5.3013,-3.097829 -10.43725,-5.827723 -16.81209,-3.595299 -4.1589,1.455208 -8.24477,3.210828 -12.27966,4.970582 -3.52228,1.536513 -7.02388,3.147437 -10.39044,5.000899 -1.30774,0.719336 -2.80843,1.496552 -4.14514,2.437752"
+ style="fill:none;stroke:#ffffff;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9793"
+ d="m 81.552238,59.473562 c -4.14792,-2.541106 -8.29719,-5.038109 -12.68899,-7.167179 -4.34495,-2.108397 -8.847,-3.927408 -13.27464,-5.852527 -4.7184,-2.049145 -9.21081,-4.595759 -14.50661,-4.429015 -4.88513,0.152961 -9.39133,2.611381 -13.69907,4.705999 -4.78454,2.326128 -10.67844,4.967827 -14.94483,8.761568"
+ style="fill:none;stroke:#ffffff;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path9795"
+ d="m 80.430508,55.367006 c -3.70416,-2.831868 -7.37802,-5.519043 -11.72435,-7.442782 -4.03077,-1.781807 -8.43361,-2.824981 -12.64627,-4.081752 -3.89982,-1.165818 -7.78867,-2.479089 -11.72849,-3.501595 -5.63478,-1.464853 -11.00226,0.294901 -15.9687,2.841516 -5.32197,2.729893 -11.00638,5.988953 -15.42573,10.28981"
+ style="fill:none;stroke:#ffffff;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/src/res/images/ebrains-logo-light.svg b/src/res/images/ebrains-logo-light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8b6c31da284be20b8881a48077e98cd3d977443a
--- /dev/null
+++ b/src/res/images/ebrains-logo-light.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="195.36647mm"
+ height="72.386963mm"
+ viewBox="0 0 195.36647 72.386963"
+ version="1.1"
+ id="svg10559"
+ inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
+ sodipodi:docname="ebrains-logo-dark.svg">
+ <defs
+ id="defs10553" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="352.05365"
+ inkscape:cy="-37.491452"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata10556">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-12.685806,-66.526755)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path10007"
+ d="m 103.12986,93.471535 h 11.58378 V 95.8707 h -8.79602 v 5.63066 h 8.19107 v 2.38952 h -8.19107 v 5.65685 h 8.90351 v 2.40054 h -11.69127 z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10009"
+ d="m 125.257,109.55737 c 2.67892,0 3.73451,-1.16444 3.73451,-2.71611 0,-1.75976 -1.39873,-3.20256 -3.63527,-3.20256 h -4.1231 v 5.91867 z m -0.28938,-8.09321 c 1.87688,0 3.339,-1.13689 3.339,-2.922819 0,-1.53376 -1.05558,-2.696824 -3.26594,-2.696824 h -3.80754 v 5.619643 z m -6.52227,-7.992625 h 6.76618 c 3.93294,0 5.82774,2.119424 5.82774,4.853446 0,2.309599 -1.41527,3.464389 -3.11164,3.897099 v 0.18052 c 1.83145,0.0992 3.83371,1.71428 3.83371,4.57371 0,2.83324 -1.9389,4.97196 -6.23422,4.97196 h -7.08177 z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10011"
+ d="m 141.3842,102.55694 c 2.71473,0 3.85159,-1.20992 3.85159,-3.293512 0,-2.093237 -1.13686,-3.402372 -3.88743,-3.402372 h -3.5016 v 6.695884 z m -6.3252,-9.085405 h 6.58703 c 4.28431,0 6.39548,2.389521 6.39548,5.791893 0,2.480472 -1.12724,4.367002 -3.39136,5.204852 l 4.09553,7.47999 h -3.175 l -3.7538,-6.99216 h -3.97012 v 6.99216 H 135.059 Z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10013"
+ d="m 161.10254,104.71219 -2.72578,-7.885129 h -0.1433 l -2.72439,7.885129 z m -11.06153,7.23608 6.64905,-18.476735 h 3.22048 l 6.64904,18.476735 h -2.95867 l -1.6867,-4.89066 h -7.21815 l -1.69499,4.89066 z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10015"
+ d="M 172.00559,111.94827 H 169.2178 V 93.471535 h 2.78779 z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10017"
+ d="m 190.97703,111.94827 h -2.56177 l -9.39133,-13.551629 h -0.17226 v 13.551629 h -2.78776 V 93.471535 h 2.58107 l 9.39958,13.568165 h 0.17227 V 93.471535 h 2.7602 z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10019"
+ d="m 201.28477,95.628165 c -2.27242,0 -3.70695,1.163063 -3.70695,2.732646 -0.01,1.768029 1.91272,2.444639 3.35555,2.815329 l 1.80382,0.46854 c 2.34682,0.5774 5.31509,1.86724 5.31509,5.19658 0,3.1309 -2.49975,5.41294 -6.83919,5.41294 -4.14101,0 -6.73033,-2.06568 -6.91085,-5.41294 h 2.79742 c 0.1626,2.01194 1.94854,2.96829 4.0955,2.96829 2.373,0 4.09554,-1.19062 4.09554,-2.99447 0,-1.64262 -1.5241,-2.29168 -3.50022,-2.81533 l -2.18282,-0.59532 c -2.96827,-0.8034 -4.80934,-2.30959 -4.80934,-4.881009 0,-3.184642 2.84152,-5.304068 6.54981,-5.304068 3.7538,0 6.3693,2.146985 6.45061,5.105628 h -2.68855 c -0.19844,-1.704629 -1.70462,-2.696816 -3.82542,-2.696816"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10021"
+ d="m 48.527842,66.526755 -17.89243,4.890657 -13.051401,13.183693 -4.7129,17.940675 4.89204,17.89383 13.025225,12.96045 17.918608,5.51766 18.074357,-5.60724 12.960455,-13.02659 4.801093,-18.09778 -4.89204,-17.89382 -13.180942,-13.050022 z m 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10023"
+ d="m 78.910827,121.1136 c -2.086326,-0.61874 -4.156146,-1.29536 -6.198412,-2.06568 -5.972421,-2.25447 -10.869964,-6.29901 -16.86306,-8.42945 -5.494229,-1.95269 -11.269591,-3.16674 -17.015987,-4.10794 -1.296741,-0.21359 -2.648585,-0.50849 -3.971502,-0.49885 -3.679366,0.0262 -6.439605,2.30684 -8.370217,5.22277 -2.010551,3.03719 -4.95681,7.24021 -8.554861,9.37341"
+ style="fill:none;stroke:#191919;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10025"
+ d="m 79.850662,119.86923 c -2.349569,-0.66697 -4.681183,-1.39733 -6.978401,-2.24482 -5.842884,-2.15663 -10.772106,-5.92143 -16.514411,-8.33575 -4.743204,-1.9954 -9.64212,-3.87505 -14.592017,-5.30407 -5.294418,-1.52963 -9.617357,0.84611 -13.376628,4.28983 -2.326146,2.12907 -4.734947,4.18648 -7.28292,6.04683 -1.223716,0.89435 -2.691307,2.02434 -4.249874,2.84979"
+ style="fill:none;stroke:#191919;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10027"
+ d="m 80.221362,118.4719 c -2.521831,-0.68902 -5.022956,-1.44694 -7.484145,-2.34128 -5.6031,-2.03674 -10.475843,-5.84977 -15.653139,-8.77122 -4.128592,-2.33026 -9.143259,-6.16396 -14.013248,-6.68899 -5.671998,-0.61185 -9.700014,2.88147 -14.195179,5.67062 -3.001363,1.86173 -6.031689,3.68763 -9.143294,5.36333 -1.102431,0.59393 -2.429476,1.42902 -3.795116,2.0519"
+ style="fill:none;stroke:#191919;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10029"
+ d="m 80.565849,117.17104 c -2.702314,-0.68076 -5.37986,-1.44695 -7.995356,-2.42811 -5.862177,-2.19797 -10.788685,-7.24986 -15.571822,-11.14281 -4.824519,-3.924662 -9.666957,-8.320597 -16.404167,-5.323369 -4.047313,1.801099 -7.985759,3.890209 -11.993068,5.782249 -3.401024,1.60542 -6.811644,3.19705 -10.265021,4.68947 -0.972894,0.4203 -2.152504,1.07073 -3.343134,1.55305"
+ style="fill:none;stroke:#191919;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10031"
+ d="m 80.915874,115.85363 c -3.04546,-0.70418 -6.055077,-1.52824 -8.940694,-2.71887 C 64.879656,110.20643 61.466248,102.81188 57.046896,97.095781 53.37716,92.349813 47.320707,93.997948 42.671203,95.8018 c -5.590717,2.167651 -11.184186,4.32566 -16.790036,6.45335 -3.118485,1.18511 -6.238381,2.36609 -9.373406,3.50435 -0.71794,0.26045 -1.59576,0.69453 -2.47495,1.0294"
+ style="fill:none;stroke:#191919;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10033"
+ d="m 81.458836,113.80449 c -3.70279,-0.72347 -7.365613,-1.66605 -10.621928,-3.43683 -5.483225,-2.9807 -7.612274,-9.52638 -10.922317,-14.495581 -2.26,-3.394109 -6.323825,-5.470813 -10.357342,-4.362869 -1.663277,0.456131 -3.297661,1.054199 -4.940266,1.577851 -6.759293,2.160765 -13.519926,4.32015 -20.280594,6.480917 -3.763434,1.201652 -7.528208,2.404672 -11.293018,3.607702"
+ style="fill:none;stroke:#191919;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10035"
+ d="M 82.051397,111.57207 C 77.844239,110.29324 73.75699,108.78154 70.149275,106.06818 65.463927,102.54316 61.889301,97.372761 57.986696,93.047099 53.920119,88.539537 48.824141,88.794476 43.64134,90.57352 c -6.104713,2.095997 -12.19842,4.227822 -18.265915,6.432681 -3.505729,1.27607 -7.011458,2.563147 -10.468964,3.964619 -0.45886,0.18603 -1.1038,0.38585 -1.78594,0.62149"
+ style="fill:none;stroke:#191919;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10037"
+ d="M 83.126275,107.52339 C 79.26498,106.05027 75.435438,104.51651 71.858023,102.41087 66.197069,99.077391 61.616462,94.350725 56.645894,90.110499 51.950916,86.104545 46.784627,86.111435 41.235291,88.177115 c -5.432249,2.022958 -10.838286,4.118955 -16.189219,6.349999 -3.180504,1.325671 -6.354128,2.685797 -9.440931,4.219547 -0.58702,0.29077 -1.28157,0.598067 -1.98438,0.941197"
+ style="fill:none;stroke:#191919;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10039"
+ d="M 84.33341,102.97449 C 75.32657,98.475191 66.558101,93.653436 57.855781,88.564341 52.554483,85.466512 47.418532,82.736618 41.042356,84.969042 c -4.158932,1.455208 -8.244804,3.210828 -12.2797,4.970582 -3.520898,1.536513 -7.023876,3.147437 -10.390399,5.000899 -1.306406,0.719336 -2.807086,1.496552 -4.145136,2.437748"
+ style="fill:none;stroke:#191919;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10041"
+ d="M 83.820788,99.539038 C 79.672899,96.997931 75.522256,94.500931 71.130419,92.371861 66.785468,90.263464 62.283424,88.444453 57.855781,86.519334 53.138752,84.470189 48.645,81.923575 43.349171,82.090319 38.46542,82.24328 33.957873,84.7017 29.650104,86.796318 24.866931,89.122446 18.971697,91.764145 14.705271,95.557886"
+ style="fill:none;stroke:#191919;stroke-width:0.35277775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path10043"
+ d="M 82.697684,95.432484 C 78.993518,92.600616 75.321067,89.913441 70.973327,87.989702 66.943969,86.207895 62.539752,85.164721 58.328467,83.90795 54.427238,82.742132 50.539803,81.428861 46.598606,80.406355 40.963794,78.941502 35.596349,80.701256 30.631285,83.247871 25.309279,85.977764 19.623489,89.236824 15.205511,93.537681"
+ style="fill:none;stroke:#191919;stroke-width:0.7055555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/src/theme.scss b/src/theme.scss
index e85cfdce26366235f96280ccae6f742f46218b35..2603ff81c7c0cd003777a057e40f570cc59ae9f6 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -19,3 +19,29 @@ $iv-dark-theme: mat-dark-theme($iv-dark-theme-primary, $iv-dark-theme-accent,
{
@include angular-material-theme($iv-dark-theme);
}
+
+.iav-dialog-class
+{
+
+ @media (min-width: 576px) {
+
+ }
+
+ // Medium devices (tablets, 768px and up)
+ @media (min-width: 768px) {
+
+ max-width: 50vw!important;
+ }
+
+ // Large devices (desktops, 992px and up)
+ @media (min-width: 992px) {
+
+ max-width: 50vw!important;
+ }
+
+ // Extra large devices (large desktops, 1200px and up)
+ @media (min-width: 1200px) {
+
+ max-width: 50vw!important;
+ }
+}
diff --git a/src/ui/databrowserModule/kgSingleDatasetService.service.ts b/src/ui/databrowserModule/kgSingleDatasetService.service.ts
index 1d3e18a6b87b339a65582bc087c3713ede3c9b18..5a758272d1b9e16017c8efd51e63a4949f6da022 100644
--- a/src/ui/databrowserModule/kgSingleDatasetService.service.ts
+++ b/src/ui/databrowserModule/kgSingleDatasetService.service.ts
@@ -46,14 +46,14 @@ export class KgSingleDatasetService implements OnDestroy{
public datasetHasPreview({ name } : { name: string } = { name: null }){
if (!name) throw new Error('kgSingleDatasetService#datasetHashPreview name must be defined')
- const _url = new URL(`${this.constantService.backendUrl}datasets/hasPreview`)
+ const _url = new URL(`datasets/hasPreview`, this.constantService.backendUrl )
const searchParam = _url.searchParams
searchParam.set('datasetName', name)
return this.http.get(_url.toString())
}
public getInfoFromKg({ kgId, kgSchema = 'minds/core/dataset/v1.0.0' }: Partial<KgQueryInterface>) {
- const _url = new URL(`${this.constantService.backendUrl}datasets/kgInfo`)
+ const _url = new URL(`datasets/kgInfo`, this.constantService.backendUrl )
const searchParam = _url.searchParams
searchParam.set('kgSchema', kgSchema)
searchParam.set('kgId', kgId)
@@ -64,26 +64,12 @@ export class KgSingleDatasetService implements OnDestroy{
})
}
- public downloadZipFromKg({ kgSchema = 'minds/core/dataset/v1.0.0', kgId } : Partial<KgQueryInterface>, filename = 'download'){
- const _url = new URL(`${this.constantService.backendUrl}datasets/downloadKgFiles`)
+ public getDownloadZipFromKgHref({ kgSchema = 'minds/core/dataset/v1.0.0', kgId }){
+ const _url = new URL(`datasets/downloadKgFiles`, this.constantService.backendUrl)
const searchParam = _url.searchParams
searchParam.set('kgSchema', kgSchema)
searchParam.set('kgId', kgId)
- return fetch(_url.toString())
- .then(res => {
- if (res.status >= 400) throw new Error(res.status.toString())
- return res.blob()
- })
- .then(data => this.simpleDownload(data, filename))
- }
-
- public simpleDownload(data, filename) {
- const blob = new Blob([data], { type: 'application/zip'})
- const url= window.URL.createObjectURL(blob);
- const anchor = document.createElement("a");
- anchor.download = filename + '.zip';
- anchor.href = url;
- anchor.click();
+ return _url.toString()
}
public showPreviewList(template: TemplateRef<any>){
diff --git a/src/ui/databrowserModule/singleDataset/detailedView/singleDataset.template.html b/src/ui/databrowserModule/singleDataset/detailedView/singleDataset.template.html
index 8321998876bf131bef4e8a55259e4640d76b8cb5..372748eb628a6ce175acb08e79f93d5bae9d3bd0 100644
--- a/src/ui/databrowserModule/singleDataset/detailedView/singleDataset.template.html
+++ b/src/ui/databrowserModule/singleDataset/detailedView/singleDataset.template.html
@@ -1,14 +1,11 @@
<!-- title -->
-<mat-card-subtitle *ngIf="!simpleMode">
+<mat-card-subtitle>
{{ name }}
</mat-card-subtitle>
-<mat-card-content *ngIf="simpleMode">
- <small>
- {{ name }}
- </small>
- <mat-grid-list [cols]="kgReference.length + (preview ? 1 : 0) + (downloadEnabled ? 2 : 0)" rowHeight="4em">
+<mat-card-content mat-dialog-content>
+ <mat-grid-list *ngIf="false" [cols]="kgReference.length + (preview ? 1 : 0) + (downloadEnabled ? 2 : 0)" rowHeight="4em">
<!-- explore -->
<mat-grid-tile *ngFor="let kgRef of kgReference">
@@ -47,29 +44,27 @@
<!-- download -->
<mat-grid-tile *ngIf="downloadEnabled">
- <button
- matTooltip="Download"
- iav-stop="click mousedown"
- (click)="downloadZipFromKg()"
- [disabled]="downloadInProgress"
- mat-icon-button>
- <i class="ml-1 fas" [ngClass]="!downloadInProgress? 'fa-download' :'fa-spinner fa-pulse'"></i>
- </button>
+ <a [href]="dlFromKgHref"
+ target="_blank"
+ iav-stop="click mousedown">
+ <button
+ matTooltip="Download"
+ [disabled]="downloadInProgress"
+ mat-icon-button>
+ <i class="ml-1 fas" [ngClass]="!downloadInProgress? 'fa-download' :'fa-spinner fa-pulse'"></i>
+ </button>
+ </a>
</mat-grid-tile>
</mat-grid-list>
-</mat-card-content>
-<!-- description -->
-<mat-card-content *ngIf="!simpleMode">
+ <!-- description -->
<small>
- <markdown-dom [markdown]="description">
+ <markdown-dom class="d-block" [markdown]="description">
</markdown-dom>
</small>
-</mat-card-content>
-<!-- publications -->
-<mat-card-content *ngIf="!simpleMode">
+ <!-- publications -->
<small class="d-block mb-2"
*ngFor="let publication of publications">
<a *ngIf="publication.doi; else plainText"
@@ -86,7 +81,7 @@
<!-- footer -->
-<mat-card-actions *ngIf="!simpleMode">
+<mat-card-actions>
<!-- explore -->
<a *ngFor="let kgRef of kgReference"
@@ -114,19 +109,21 @@
<!-- download -->
- <button
- (click)="downloadZipFromKg()"
- [disabled]="downloadInProgress"
- [matTooltip]="tooltipText"
- class="m-2"
- *ngIf="files.length > 0"
- mat-button
- color="basic">
- <span>
- Download as Zip
- </span>
- <i class="ml-1 fas" [ngClass]="!downloadInProgress? 'fa-download' :'fa-spinner fa-pulse'"></i>
- </button>
+ <a *ngIf="files.length > 0"
+ [href]="dlFromKgHref"
+ target="_blank">
+ <button
+ [disabled]="downloadInProgress"
+ [matTooltip]="tooltipText"
+ class="m-2"
+ mat-button
+ color="basic">
+ <span>
+ Download as Zip
+ </span>
+ <i class="ml-1 fas" [ngClass]="!downloadInProgress? 'fa-download' :'fa-spinner fa-pulse'"></i>
+ </button>
+ </a>
<button mat-button
mat-dialog-close
diff --git a/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html b/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html
index b96dfd4ea577601da0d32014d4b6ccc211af0417..452f019150bdfd99c1367a571cd1f1cf5495aedb 100644
--- a/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html
+++ b/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html
@@ -87,15 +87,17 @@
</button>
<!-- download -->
- <button mat-menu-item
- *ngIf="downloadEnabled"
- class="no-focus"
- iav-stop="mousedown click"
- (click)="downloadZipFromKg()"
- [disabled]="downloadInProgress">
- <mat-icon [ngClass]="{'fa-spinner': downloadInProgress}" fontSet="fas" [fontIcon]="!downloadInProgress? 'fa-download' :'fa-pulse'"></mat-icon>
- Download
- </button>
+ <a *ngIf="downloadEnabled"
+ [href]="dlFromKgHref"
+ target="_blank"
+ iav-stop="mousedown click">
+ <button mat-menu-item
+ class="no-focus"
+ [disabled]="downloadInProgress">
+ <mat-icon [ngClass]="{'fa-spinner': downloadInProgress}" fontSet="fas" [fontIcon]="!downloadInProgress? 'fa-download' :'fa-pulse'"></mat-icon>
+ Download
+ </button>
+ </a>
</ng-template>
</mat-menu>
@@ -127,11 +129,13 @@
</button>
<!-- download dataset -->
- <button mat-icon-button
- *ngIf="downloadEnabled"
- iav-stop="click mousedown"
- (click)="downloadZipFromKg()"
- [disabled]="downloadInProgress">
- <i class="fas" [ngClass]="!downloadInProgress? 'fa-download' :'fa-spinner fa-pulse'"></i>
- </button>
+ <a *ngIf="downloadEnabled"
+ [href]="dlFromKgHref"
+ target="_blank"
+ iav-stop="click mousedown">
+ <button mat-icon-button
+ [disabled]="downloadInProgress">
+ <i class="fas" [ngClass]="!downloadInProgress? 'fa-download' :'fa-spinner fa-pulse'"></i>
+ </button>
+ </a>
</ng-template>
\ No newline at end of file
diff --git a/src/ui/databrowserModule/singleDataset/singleDataset.base.ts b/src/ui/databrowserModule/singleDataset/singleDataset.base.ts
index b7ad552e6e84e0cb7a4f34fdfd8919290b50ce10..d0a8341adf725e656f086cfd8d4af590a5a9e808 100644
--- a/src/ui/databrowserModule/singleDataset/singleDataset.base.ts
+++ b/src/ui/databrowserModule/singleDataset/singleDataset.base.ts
@@ -39,7 +39,7 @@ export class SingleDatasetBase implements OnInit {
/**
* sic!
*/
- private kgReference: string[] = []
+ public kgReference: string[] = []
public files: File[] = []
private methods: string[] = []
/**
@@ -52,6 +52,8 @@ export class SingleDatasetBase implements OnInit {
public fetchingSingleInfoInProgress = false
public downloadInProgress = false
+ public dlFromKgHref: string = null
+
public favedDataentries$: Observable<DataEntry[]>
constructor(
private dbService: DatabrowserService,
@@ -76,6 +78,7 @@ export class SingleDatasetBase implements OnInit {
ngOnInit() {
const { kgId, kgSchema, dataset } = this
+ this.dlFromKgHref = this.singleDatasetService.getDownloadZipFromKgHref({ kgSchema, kgId })
if ( dataset ) {
const { name, description, kgReference, publications, files, preview, ...rest } = dataset
this.name = name
@@ -155,20 +158,4 @@ export class SingleDatasetBase implements OnInit {
this.previewingFile.emit(file)
this.singleDatasetService.previewFile(file, this.dataset)
}
-
- downloadZipFromKg() {
- this.downloadInProgress = true
- this.cdr.markForCheck()
-
- const { kgId, kgSchema } = this
- this.singleDatasetService.downloadZipFromKg({
- kgId,
- kgSchema
- }, this.name)
- .catch(err => this.constantService.catchError(err))
- .finally(() => {
- this.downloadInProgress = false
- this.cdr.markForCheck()
- })
- }
}
diff --git a/src/ui/logoContainer/logoContainer.component.ts b/src/ui/logoContainer/logoContainer.component.ts
index 05688ff1d7abe974d528be0a05e4fd1328b1bf92..31eec2ab88fc61f9dffa4629938fd53b952b37a5 100644
--- a/src/ui/logoContainer/logoContainer.component.ts
+++ b/src/ui/logoContainer/logoContainer.component.ts
@@ -1,4 +1,4 @@
-import { Component } from "@angular/core";
+import { Component, HostBinding } from "@angular/core";
@Component({
selector : 'logo-container',
@@ -9,5 +9,12 @@ import { Component } from "@angular/core";
})
export class LogoContainer{
-
+ // only used to define size
+ public imgSrc = USE_LOGO === 'hbp'
+ ? 'res/image/HBP_Primary_RGB_WhiteText.png'
+ : USE_LOGO === 'ebrains'
+ ? `res/image/ebrains-logo-light.svg`
+ : null
+
+ public useLogo = USE_LOGO
}
\ No newline at end of file
diff --git a/src/ui/logoContainer/logoContainer.style.css b/src/ui/logoContainer/logoContainer.style.css
index 9dd71db9f2fa74d747564654fbe0a87d2204a2a4..91bc7c075edf34d257af94804bfb7b2d33acdb81 100644
--- a/src/ui/logoContainer/logoContainer.style.css
+++ b/src/ui/logoContainer/logoContainer.style.css
@@ -1,10 +1,19 @@
+:host-context([darktheme="true"]) [uselogo="ebrains"][hbpLogoContainer]
+{
+ background-image:url('res/image/ebrains-logo-light.svg')
+}
+
+:host-context([darktheme="false"]) [uselogo="ebrains"][hbpLogoContainer]
+{
+ background-image:url('res/image/ebrains-logo-dark.svg')
+}
-:host-context([darktheme="true"]) [hbpLogoContainer]
+:host-context([darktheme="true"]) [uselogo="hbp"][hbpLogoContainer]
{
background-image:url('res/image/HBP_Primary_RGB_WhiteText.png')
}
-:host-context([darktheme="false"]) [hbpLogoContainer]
+:host-context([darktheme="false"]) [uselogo="hbp"][hbpLogoContainer]
{
background-image:url('res/image/HBP_Primary_RGB_BlackText.png')
}
diff --git a/src/ui/logoContainer/logoContainer.template.html b/src/ui/logoContainer/logoContainer.template.html
index 1c50cd29202bd9b1886cfdca6810a678c54c4635..c4a53a91cd74411c941a717c8a7f1d6189ce146d 100644
--- a/src/ui/logoContainer/logoContainer.template.html
+++ b/src/ui/logoContainer/logoContainer.template.html
@@ -1,3 +1,3 @@
-<span hbpLogoContainer>
- <img src = "res/image/HBP_Primary_RGB_WhiteText.png" />
+<span [attr.uselogo]="useLogo" hbpLogoContainer>
+ <img [src]="imgSrc" />
</span>
\ No newline at end of file
diff --git a/src/ui/nehubaContainer/nehubaContainer.template.html b/src/ui/nehubaContainer/nehubaContainer.template.html
index 3e827ac7dd6143fd7506c7decea0b2c7092d9292..57f43e43fd0445365348ff101f4753cb8080634e 100644
--- a/src/ui/nehubaContainer/nehubaContainer.template.html
+++ b/src/ui/nehubaContainer/nehubaContainer.template.html
@@ -1,7 +1,7 @@
<ng-template #container>
</ng-template>
-<ui-splashscreen iav-stop="mousedown mouseup touchstart touchmove touchend" (contextmenu)="$event.stopPropagation();" *ngIf="!viewerLoaded">
+<ui-splashscreen iav-stop="mousedown mouseup touchstart touchmove touchend" *ngIf="!viewerLoaded">
</ui-splashscreen>
<!-- spatial landmarks overlay -->
diff --git a/src/ui/nehubaContainer/splashScreen/splashScreen.style.css b/src/ui/nehubaContainer/splashScreen/splashScreen.style.css
index 49774d56632717713c75fc404f681049c0e06e5c..105dc67a4356e82b8e3bbcc42997610af3ccc898 100644
--- a/src/ui/nehubaContainer/splashScreen/splashScreen.style.css
+++ b/src/ui/nehubaContainer/splashScreen/splashScreen.style.css
@@ -1,8 +1,9 @@
:host
{
- display: block;
+ display: inline-block;
overflow: auto;
height: 100%;
+ width: 100%;
}
.font-stretch
diff --git a/src/ui/nehubaContainer/splashScreen/splashScreen.template.html b/src/ui/nehubaContainer/splashScreen/splashScreen.template.html
index a63adbeb71157ff8282a9abda4d5e30e58d79924..90dfb6b6cba80c3c4979146bd7cef5826d7af42d 100644
--- a/src/ui/nehubaContainer/splashScreen/splashScreen.template.html
+++ b/src/ui/nehubaContainer/splashScreen/splashScreen.template.html
@@ -1,43 +1,47 @@
-<div
- #parentContainer
- class="m-5 d-flex flex-row flex-wrap justify-content-center align-items-stretch pe-none">
- <mat-card
- (mousedown)="activatedTemplate$.next(template)"
- matRipple
- *ngFor="let template of loadedTemplate$ | async | filterNull"
- class="m-3 col-md-12 col-lg-6 pe-all mw-400px">
- <mat-card-header>
- <mat-card-title class="text-nowrap font-stretch">
- {{ template.properties.name }}
- </mat-card-title>
- </mat-card-header>
- <img
- [src]="template.properties.name | getTemplateImageSrcPipe"
- [srcset]="template.properties.name | getTemplateImageSrcPipe | imgSrcSetPipe"
- sizes="(max-width:576px) 90vw;(max-width: 768px) 50vw; 400px"
- [alt]="'Screenshot of ' + template.properties.name"
- mat-card-image />
- <mat-card-content>
- {{ template.properties.description }}
- </mat-card-content>
+<!-- n.b. div wrapper is required for scrolling to work properly -->
+<div class="h-100 w-100 overflow-auto">
- <mat-card-content>
- <mat-card-subtitle class="text-nowrap">
- Parcellations available
- </mat-card-subtitle>
- <button
- (mousedown)="$event.stopPropagation()"
- (click)="$event.stopPropagation(); selectTemplateParcellation(template, parcellation)"
- *ngFor="let parcellation of template.parcellations"
- mat-button
- color="primary">
- {{ parcellation.name }}
- </button>
- </mat-card-content>
+ <div
+ #parentContainer
+ class="p-5 w-100 d-flex flex-row flex-wrap justify-content-center align-items-stretch pe-all">
+ <mat-card
+ (mousedown)="activatedTemplate$.next(template)"
+ matRipple
+ *ngFor="let template of loadedTemplate$ | async | filterNull"
+ class="m-3 col-md-12 col-lg-6 pe-all mw-400px">
+ <mat-card-header>
+ <mat-card-title class="text-nowrap font-stretch">
+ {{ template.properties.name }}
+ </mat-card-title>
+ </mat-card-header>
+ <img
+ [src]="template.properties.name | getTemplateImageSrcPipe"
+ [srcset]="template.properties.name | getTemplateImageSrcPipe | imgSrcSetPipe"
+ sizes="(max-width:576px) 90vw;(max-width: 768px) 50vw; 400px"
+ [alt]="'Screenshot of ' + template.properties.name"
+ mat-card-image />
+ <mat-card-content>
+ {{ template.properties.description }}
+ </mat-card-content>
- <!-- required... or on ripple, angular adds 16px margin to the bottom -->
- <!-- see https://github.com/angular/components/issues/10898 -->
- <mat-card-footer>
- </mat-card-footer>
- </mat-card>
+ <mat-card-content>
+ <mat-card-subtitle class="text-nowrap">
+ Parcellations available
+ </mat-card-subtitle>
+ <button
+ iav-stop="mousedown touchstart click"
+ (click)="selectTemplateParcellation(template, parcellation)"
+ *ngFor="let parcellation of template.parcellations"
+ mat-button
+ color="primary">
+ {{ parcellation.name }}
+ </button>
+ </mat-card-content>
+
+ <!-- required... or on ripple, angular adds 16px margin to the bottom -->
+ <!-- see https://github.com/angular/components/issues/10898 -->
+ <mat-card-footer>
+ </mat-card-footer>
+ </mat-card>
+ </div>
</div>
\ No newline at end of file
diff --git a/src/ui/sharedModules/angularMaterial.module.ts b/src/ui/sharedModules/angularMaterial.module.ts
index 3d2399feb928cbb29784c61219766f66e0fe4d89..0b02dfe49874d8b0f80575e4b418db810b5fb09c 100644
--- a/src/ui/sharedModules/angularMaterial.module.ts
+++ b/src/ui/sharedModules/angularMaterial.module.ts
@@ -21,14 +21,18 @@ import {
MatExpansionModule,
MatGridListModule,
MatIconModule,
- MatMenuModule
-
+ MatMenuModule,
+ MAT_DIALOG_DEFAULT_OPTIONS,
+ MatDialogConfig
} from '@angular/material';
import { ScrollingModule as ExperimentalScrollingModule } from '@angular/cdk-experimental/scrolling'
import { NgModule } from '@angular/core';
import {DragDropModule} from "@angular/cdk/drag-drop";
+
+const defaultDialogOption: MatDialogConfig = new MatDialogConfig()
+
@NgModule({
imports: [
MatButtonModule,
@@ -84,5 +88,12 @@ import {DragDropModule} from "@angular/cdk/drag-drop";
MatMenuModule,
ExperimentalScrollingModule
],
+ providers: [{
+ provide: MAT_DIALOG_DEFAULT_OPTIONS,
+ useValue: {
+ ...defaultDialogOption,
+ panelClass: 'iav-dialog-class'
+ }
+ }]
})
export class AngularMaterialModule { }
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 4007a30c18e11c74bc2854ad9eff4e621525379a..8e85daee2ef8e949504faa2cba66baf1a5861953 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -12,4 +12,5 @@ declare var PLUGINDEV : string
declare var BUNDLEDPLUGINS : string[]
declare var VERSION : string
declare var PRODUCTION: boolean
-declare var BACKEND_URL: string
\ No newline at end of file
+declare var BACKEND_URL: string
+declare var USE_LOGO: string
\ No newline at end of file
diff --git a/webpack.staticassets.js b/webpack.staticassets.js
index 05119ba58f3c746b113b673b7abb41849d63bfab..5732303b88538bc26c52a14a36737dca17560735 100644
--- a/webpack.staticassets.js
+++ b/webpack.staticassets.js
@@ -15,7 +15,7 @@ module.exports = {
]
},
{
- test : /jpg|png/,
+ test : /\.jpg$|\.png$|\.svg$/,
exclude : /export\_nehuba|index/,
use : {
loader : 'file-loader',
@@ -47,15 +47,6 @@ module.exports = {
context : 'src'
}
}]
- },
- {
- test: /indigo-pink\.css/,
- use: {
- loader: 'file-loader',
- options: {
- name: '[name].[ext]'
- }
- }
}
]
},
@@ -78,9 +69,9 @@ module.exports = {
PRODUCTION: process.env.PRODUCTION
? true
: false,
- BACKEND_URL: JSON.stringify(process.env.BACKEND_URL || 'http://localhost:3000/')
+ BACKEND_URL: (process.env.BACKEND_URL && JSON.stringify(process.env.BACKEND_URL)) || 'null',
+ USE_LOGO: JSON.stringify(process.env.USE_LOGO || 'hbp' || 'ebrains' )
})
- // ...ignoreArr.map(dirname => new webpack.IgnorePlugin(/\.\/plugin_examples/))
],
resolve: {
extensions: [