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

Add nav bar and button to return to main table view #27

Merged
merged 2 commits into from
May 7, 2019
Merged

Add nav bar and button to return to main table view #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ee052b
added return to nav
May 6, 2019
5f90451
merge conflicts
May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<title>client</title>
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export default {
}
</script>

<style scoped>
<style>


.Button {
color:#648189;
color:#648189;
text-decoration:none;
-webkit-transition:0.3s all ease;
transition:0.3s all ease;
Expand Down
69 changes: 52 additions & 17 deletions client/src/views/TableDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,40 @@
<template>
<div>
<h1>Table: {{`${this.workspace}/${this.table}`}}</h1>
<table>
<thead>
<tr >
<th v-for="head in this.headers" :key="head" class="head">
{{head}}
</th>
</tr>
</thead>
<tbody v-for="(row, index) in rowKeys" :key="row[0].value" class="row-wrap">
<tr :class="rowClassName(index)">
<td v-for="col in row" :key="col.key" class="col">
{{col.value}}
</td>
</tr>
</tbody>
</table>
<div class="nav">
<div class="return-nav">
<router-link :to="`/${workspace}/`" class="Button"><i class="fas fa-home"></i> to main table view</router-link>
</div>
</div>
<div class="wrapper">
<h1>Table: {{`${this.workspace}/${this.table}`}}</h1>
<table>
<thead>
<tr >
<th v-for="head in this.headers" :key="head" class="head">
{{head}}
</th>
</tr>
</thead>
<tbody class="row-wrap">
<tr v-for="(row, index) in rowKeys" :key="row.value" :class="rowClassName(index)">
<td v-for="col in row" :key="col.key" class="col">
{{col.value}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</template>
<script>
import api from '@/api'
import Button from '@/components/Button'

export default {
name: 'TableDetail',
components: {
'v-button':Button,
},
props: ['workspace', 'table'],
data () {
return {
Expand Down Expand Up @@ -71,6 +82,30 @@ export default {
</script>

<style scoped>
.nav{
position: fixed;
top:0px;
left:0px;
right:0px;
height:60px;
background-color: #F3F6F6;
}

.return-nav{
height:100px;
margin: 5px 10px;
float:left;
}
.return-nav button{
background-color: #F3F6F6;
box-shadow: 0 0 0 0;
}
.fa-home{
font-size: 20px;
}
.wrapper{
padding:25px 0 0 0;
}
table{
margin:auto;
}
Expand Down
1 change: 0 additions & 1 deletion client/src/views/WorkspaceDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export default {
}
},
methods: {

async update () {
const response = await api().post('multinet/graphql', {query: `query {
workspaces (name: "${this.workspace}") {
Expand Down