From b00beca6821de289cc1d65502e14ddfb20304eed Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Thu, 7 Sep 2023 19:30:50 +0200
Subject: [PATCH] edit gitlab
---
components/EditGitlab.vue | 16 ++++-------
components/Nav/Navigation.vue | 2 +-
components/content/ArticleDoi.vue | 3 +-
components/content/ListSystems.vue | 6 ++--
content/0.index.md | 42 +---------------------------
content/2.defense-systems/0.index.md | 2 +-
6 files changed, 14 insertions(+), 57 deletions(-)
diff --git a/components/EditGitlab.vue b/components/EditGitlab.vue
index 2ccddd60..632e0952 100644
--- a/components/EditGitlab.vue
+++ b/components/EditGitlab.vue
@@ -1,28 +1,24 @@
<template>
<v-row>
<v-col>
- <v-btn prepend-icon="mdi-github" variant="text" size="small" :href="path" target="_blank">Edit on github</v-btn>
+ <v-btn prepend-icon="mdi-gitlab" variant="text" size="small" :href="path" target="_blank">Edit on gitlab</v-btn>
</v-col>
</v-row>
</template>
<script setup lang="ts">
import { ref } from "vue";
const { page } = useContent();
-// const owner = ref("mdm-lab");
-const owner = ref("rplanel");
-// const repo = ref("wiki");
-const repo = ref("defense-finder-wiki-test");
-// const branch = ref("main");
-const branch = ref("dev");
+const owner = ref("mdm-lab");
+const repo = ref("wiki");
+const branch = ref("main");
-// const baseUrl = ref(new URL("https://gitlab.pasteur.fr"));
-const baseUrl = ref(new URL("https://github.com"))
+const baseUrl = ref(new URL("https://gitlab.pasteur.fr"));
// https://github.com/rplanel/defense-finder-wiki-test/edit/dev/content/1.introduction/0.index.md
const path = ref(
new URL(
- `/${owner.value}/${repo.value}/edit/${branch.value}/content/${page.value._file}`,
+ `/${owner.value}/${repo.value}/-/edit/${branch.value}/content/${page.value._file}`,
baseUrl.value
).href
);
diff --git a/components/Nav/Navigation.vue b/components/Nav/Navigation.vue
index 6ead9e06..b82e0514 100644
--- a/components/Nav/Navigation.vue
+++ b/components/Nav/Navigation.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
</script>
<template>
- <template v-for="navItem in props.navigation">
+ <template v-for="navItem in props.navigation" :key="navItem?.title">
<v-list-group v-if="navItem?.children" :value="navItem.title">
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" :title="navItem.title" color="primary" exact nav></v-list-item>
diff --git a/components/content/ArticleDoi.vue b/components/content/ArticleDoi.vue
index 03ce4602..4464434b 100644
--- a/components/content/ArticleDoi.vue
+++ b/components/content/ArticleDoi.vue
@@ -1,6 +1,7 @@
<script setup lang="ts">
const props = defineProps<{
doi: string;
+ divider: boolean
}>();
const { article } = useFetchArticle(props.doi)
@@ -39,5 +40,5 @@ console.log(article)
</v-expand-transition>
</v-card>
</v-list-item>
- <v-divider inset></v-divider>
+ <v-divider v-if="props.divider" inset></v-divider>
</template>
\ No newline at end of file
diff --git a/components/content/ListSystems.vue b/components/content/ListSystems.vue
index b6536466..6c5efb7a 100644
--- a/components/content/ListSystems.vue
+++ b/components/content/ListSystems.vue
@@ -18,8 +18,8 @@ const headers = ref([{
<v-toolbar>
<v-toolbar-title>Defense Systems</v-toolbar-title>
- <v-text-field v-model="search" density="compact" variant="underlined" append-inner-icon="mdi-magnify" label="Search"
- single-line hide-details class="mx-2"></v-text-field>
+ <v-text-field v-model="search" density="compact" variant="underlined" append-inner-icon="mdi-magnify"
+ label="Search" single-line hide-details class="mx-2"></v-text-field>
</v-toolbar>
<v-data-table :items-per-page="itemsPerParge" v-model:sort-by="sortBy" :headers="headers" :items="props.systems"
:search="search">
@@ -28,7 +28,7 @@ const headers = ref([{
item.columns.system }}</v-chip>
</template>
<template #[`item.dois`]="{ item }">
- <ReferencesList :items="item.columns.dois"></ReferencesList>
+ <ArticleDoiList :items="item.columns.dois" :divider="false" />
</template>
</v-data-table>
</v-card>
diff --git a/content/0.index.md b/content/0.index.md
index e3f71907..f66ffa6a 100644
--- a/content/0.index.md
+++ b/content/0.index.md
@@ -47,7 +47,7 @@ Makarova KS, Wolf YI, Snir S, Koonin EV. Defense islands in bacterial and archae
Tal N, Sorek R. SnapShot: Bacterial immunity. Cell. 2022 Feb 3;185(3):578-578.e1. doi: 10.1016/j.cell.2021.12.029. PMID: 35120666.
-::references-list
+::article-doi-list
---
items:
- 10.1126/science.1138140
@@ -58,44 +58,4 @@ items:
- 10.1038/s41586-019-1894-8
- 10.1128/jb.64.4.557-569.1952
---
-<<<<<<< HEAD
::
-=======
-#title
-DefenseFinder Wiki
-
-#description
-A comprehensive effort to map microbial defense systems against their viruses
-::
-
-
-
-
-::card-grid
-#title
-What's included
-
-#root
-:ellipsis
-
-#default
- ::card
- #title
- Nuxt Architecture.
- #description
- Harness the full power of Nuxt and the Nuxt ecosystem.
- ::
- ::card
- #title
- Vue Components.
- #description
- Use built-in components (or your own!) inside your content.
- ::
- ::card
- #title
- Write Markdown.
- #description
- Enjoy the ease and simplicity of Markdown and discover MDC syntax.
- ::
-::
->>>>>>> main
diff --git a/content/2.defense-systems/0.index.md b/content/2.defense-systems/0.index.md
index 1b1e188f..897d91ad 100644
--- a/content/2.defense-systems/0.index.md
+++ b/content/2.defense-systems/0.index.md
@@ -35,7 +35,7 @@ systems:
## References
-::references-list
+::article-doi-list
---
items:
- 10.1101/2021.09.02.458658
--
GitLab