Skip to content
This repository has been archived by the owner on Feb 23, 2022. It is now read-only.

Commit

Permalink
Merge pull request #93 from multinet-app/sidebar-refactor
Browse files Browse the repository at this point in the history
Factor the Sidebar component out of the views that reference it
  • Loading branch information
waxlamp committed Jul 26, 2019
2 parents e961c34 + c22d9c9 commit 3d7ed66
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 34 deletions.
6 changes: 6 additions & 0 deletions client/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<template>
<v-app id="app">
<sidebar />
<router-view :apps='apps' />
</v-app>
</template>

<script>
import Sidebar from '@/components/Sidebar'
export default {
name: 'app',
components: {
Sidebar,
},
data () {
return {
apps: [],
Expand Down
12 changes: 0 additions & 12 deletions client/src/views/FrontPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
fill-height
fluid
>
<sidebar />

<v-content>
<div class="getting-started">
<v-icon
Expand All @@ -22,16 +20,6 @@
</v-container>
</template>

<script>
import Sidebar from '@/components/Sidebar'
export default {
components: {
Sidebar
}
}
</script>

<style>
.getting-started {
align-items: flex-start;
Expand Down
6 changes: 0 additions & 6 deletions client/src/views/GraphDetail.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<v-container fluid>
<sidebar />

<v-content>
<h1>Graph: {{`${this.workspace}/${this.graph}`}}</h1>
<div id="graph-details">
Expand Down Expand Up @@ -52,7 +50,6 @@

<script>
import api from '@/api'
import Sidebar from '@/components/Sidebar'
export default {
name: 'GraphDetail',
Expand All @@ -61,9 +58,6 @@ export default {
return `${url}/?workspace=${this.workspace}&graph=${this.graph}`;
},
},
components: {
Sidebar
},
props: ['workspace', 'graph', 'apps'],
data () {
return {
Expand Down
6 changes: 0 additions & 6 deletions client/src/views/NodeDetail.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<v-container fluid>
<sidebar />

<v-content>
<h1>Node: {{`${this.workspace}/${this.graph}/${this.node}`}}</h1>
<div style="border-style: solid;">
Expand Down Expand Up @@ -53,13 +51,9 @@

<script>
import api from '@/api'
import Sidebar from '@/components/Sidebar'
export default {
name: 'NodeDetail',
components: {
Sidebar
},
props: ['workspace', 'graph', 'type', 'node'],
data () {
return {
Expand Down
6 changes: 0 additions & 6 deletions client/src/views/TableDetail.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<v-container fluid>
<sidebar />

<v-content>
<div class="nav">
<div class="return-nav">
Expand Down Expand Up @@ -32,13 +30,9 @@
</template>
<script>
import api from '@/api'
import Sidebar from '@/components/Sidebar'
export default {
name: 'TableDetail',
components: {
Sidebar
},
props: ['workspace', 'table'],
data () {
return {
Expand Down
4 changes: 0 additions & 4 deletions client/src/views/WorkspaceDetail.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<v-container fluid>
<sidebar />

<v-content>
<v-toolbar app>
<v-hover>
Expand Down Expand Up @@ -177,14 +175,12 @@
<script>
import api from '@/api';
import FileInput from '@/components/FileInput'
import Sidebar from '@/components/Sidebar'
import ItemPanel from '@/components/ItemPanel'
export default {
name: 'WorkspaceDetail',
components: {
'file-input': FileInput,
Sidebar,
ItemPanel,
},
props: ['workspace','title'],
Expand Down

0 comments on commit 3d7ed66

Please sign in to comment.