Skip to content
Snippets Groups Projects
Commit 075da3eb authored by Remi  PLANEL's avatar Remi PLANEL
Browse files

Merge branch 'dev' into structure-db-with-molstar

parents 1ab97326 c382702a
No related branches found
No related tags found
1 merge request!131Merge relevant Abstract and references
This commit is part of merge request !131. Comments created here will be created in the context of that merge request.
...@@ -324,7 +324,7 @@ build:dev:wiki: ...@@ -324,7 +324,7 @@ build:dev:wiki:
BASE_URL: /wiki/ BASE_URL: /wiki/
before_script: before_script:
- *docker-login - *docker-login
- "sed -i 's/MEILISEARCH_API_KEY/${$MEILI_API_KEY}/g' nuxt.config.ts" # - "sed -i 's/MEILISEARCH_API_KEY/${$MEILI_API_KEY}/g' nuxt.config.ts"
rules: rules:
- if: $CI_COMMIT_BRANCH != "main" - if: $CI_COMMIT_BRANCH != "main"
......
...@@ -56,7 +56,7 @@ ARG BASE_URL=/ ...@@ -56,7 +56,7 @@ ARG BASE_URL=/
ARG MEILI_HOST=http://localhost:7700 ARG MEILI_HOST=http://localhost:7700
ARG MEILI_API_KEY ARG MEILI_API_KEY
ENV NODE_OPTIONS=--max_old_space_size=8192 ENV NODE_OPTIONS=--max_old_space_size=12288
ENV NUXT_APP_BASE_URL=${BASE_URL} ENV NUXT_APP_BASE_URL=${BASE_URL}
# nuxt module # nuxt module
......
...@@ -13,18 +13,19 @@ import { useDisplay, useTheme } from "vuetify"; ...@@ -13,18 +13,19 @@ import { useDisplay, useTheme } from "vuetify";
const { navigation } = useContent(); const { navigation } = useContent();
// const drawer = ref(true); // const drawer = ref(true);
// const computedNavigation = computed(() => { const computedNavigation = computed(() => {
// return navigation.value console.log(navigation.value)
// .filter(({ _path }) => { return navigation.value
// return _path !== "/refseq"; .filter(({ layout }) => {
// }) return layout !== "db"
})
// }); });
</script> </script>
<template> <template>
<v-navigation-drawer :model-value="drawer" :border="1" color="background"> <v-navigation-drawer :model-value="drawer" :border="1" color="background">
<v-list nav density="compact" :lines="false"> <v-list nav density="compact" :lines="false">
<NavNavigation :navigation="navigation" /> <NavNavigation :navigation="computedNavigation" />
</v-list> </v-list>
</v-navigation-drawer> </v-navigation-drawer>
</template> </template>
\ No newline at end of file
...@@ -188,7 +188,6 @@ watch(filterInputValues, (newSoF) => { ...@@ -188,7 +188,6 @@ watch(filterInputValues, (newSoF) => {
watch(search, () => { searchOrFilter() }) watch(search, () => { searchOrFilter() })
const filterStep = computed(() => { const filterStep = computed(() => {
return filterInputValues.value !== null && filterInputValues.value.length > 0 ? filterInputValues.value?.length % 3 : null return filterInputValues.value !== null && filterInputValues.value.length > 0 ? filterInputValues.value?.length % 3 : null
}) })
......
--- ---
layout: db layout: db
navigation: false
--- ---
::refseq-db ::refseq-db
:: ::
--- ---
layout: db layout: db
navigation: false
--- ---
::structure-db ::structure-db
:: ::
\ No newline at end of file
<template> <template>
<v-card-text>
<v-card-text> <ContentDoc />
<ContentDoc /> </v-card-text>
</v-card-text>
</template> </template>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment