Skip to content
Snippets Groups Projects
Commit 4644bb46 authored by Kenzo-Hugo Hillion's avatar Kenzo-Hugo Hillion :recycle:
Browse files

add help and try using commit git in footer

parent 121cd418
No related branches found
No related tags found
2 merge requests!59Prod,!54Add build number based on commit hash
...@@ -44,7 +44,8 @@ services: ...@@ -44,7 +44,8 @@ services:
- backend - backend
- postgresql - postgresql
environment: environment:
- NODE_ENV=development NODE_ENV: development
GIT_COMMIT: local-test
nginx: nginx:
image: nginx:1.13.12-alpine image: nginx:1.13.12-alpine
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</v-content> </v-content>
<v-footer class="pa-3"> <v-footer class="pa-3">
<v-spacer></v-spacer> <v-spacer></v-spacer>
<div>Some footer (<span class="font-italic font-weight-light">hash latest commit</span>)</div> <div>Some footer (<span class="font-italic font-weight-light">{{commitHash}}</span>)</div>
</v-footer> </v-footer>
</v-app> </v-app>
</template> </template>
...@@ -25,5 +25,11 @@ export default { ...@@ -25,5 +25,11 @@ export default {
// //
}; };
}, },
computed: {
commitHash() {
return process.env.GIT_COMMIT;
console.log(process.env)
},
}
}; };
</script> </script>
...@@ -7,13 +7,10 @@ ...@@ -7,13 +7,10 @@
<span>DB</span> <span>DB</span>
</v-toolbar-title> </v-toolbar-title>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn flat> <Help/>
<span>Sign in</span> <v-btn href="https://gitlab.pasteur.fr/metagenomics/metagenedb" flat target="_blank" class="ma-0 pa-2">
<v-icon right>exit_to_app</v-icon> <span>Source</span>
</v-btn> <v-icon class="ml-1">fab fa-gitlab</v-icon>
<v-btn flat>
<span>Help</span>
<v-icon right>help</v-icon>
</v-btn> </v-btn>
</v-toolbar> </v-toolbar>
...@@ -24,9 +21,10 @@ ...@@ -24,9 +21,10 @@
<script> <script>
import Drawer from '@/components/Drawer.vue'; import Drawer from '@/components/Drawer.vue';
import Help from '@/components/help/help.vue';
export default { export default {
components: { Drawer }, components: { Drawer, Help },
data() { data() {
return { return {
drawer: false, drawer: false,
......
<div class="help">
<v-dialog v-model="dialog" fullscreen hide-overlay transition="dialog-bottom-transition">
<template v-slot:activator="{ on }">
<v-btn flat v-on="on">Help<v-icon>help</v-icon></v-btn>
</template>
<v-card>
<v-toolbar dark color="primary">
<v-btn icon dark @click="dialog = false">
<v-icon>close</v-icon>
</v-btn>
<v-toolbar-title>Help</v-toolbar-title>
</v-toolbar>
<v-list two-line subheader>
<v-list-tile>
<v-list-tile-avatar>
<v-icon class="primary lighten-2" dark>
fas fa-code
</v-icon>
</v-list-tile-avatar>
<v-list-tile-content>
<v-list-tile-title>API documentation</v-list-tile-title>
<v-list-tile-sub-title>Documentation about different endpoints of metageneDB API</v-list-tile-sub-title>
</v-list-tile-content>
<v-list-tile-avatar>
<v-btn href="/api/swagger" flat icon target="_blank">
<v-icon class="tertiary--text">
open_in_new
</v-icon>
</v-btn>
</v-list-tile-avatar>
</v-list-tile>
<v-list-tile>
<v-list-tile-avatar>
<v-icon class="primary lighten-2" dark>
fab fa-gitlab
</v-icon>
</v-list-tile-avatar>
<v-list-tile-content>
<v-list-tile-title>GitLab repository</v-list-tile-title>
<v-list-tile-sub-title>Access to source code of the project</v-list-tile-sub-title>
</v-list-tile-content>
<v-list-tile-avatar>
<v-btn href="/api/swagger" flat icon target="_blank">
<v-icon class="tertiary--text">
open_in_new
</v-icon>
</v-btn>
</v-list-tile-avatar>
</v-list-tile>
</v-list>
</v-card>
</v-dialog>
</div>
\ No newline at end of file
export default {
data () {
return {
dialog: false,
}
},
}
\ No newline at end of file
<template src="./help.html" lang="html"></template>
<script src="./help.js" lang="js"></script>
\ No newline at end of file
<div class="compare"> <div class="compare">
<v-flex> <v-flex>
<v-toolbar class="secondary darken-1 white--text" dense> <v-toolbar class="secondary darken-1 white--text" dense>
<v-icon class="white--text">far fa-chart-bar</v-icon> <v-icon class="white--text">far fa-clone</v-icon>
<v-toolbar-title>Taxonomy comparison</v-toolbar-title> <v-toolbar-title>Taxonomy comparison</v-toolbar-title>
<v-spacer/> <v-spacer/>
<v-flex xs3 md2> <v-flex xs3 md2>
......
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