Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
72 changes: 61 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"deploy-staging": "sh ./scripts/staging-deploy.sh"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.24",
"@fortawesome/free-solid-svg-icons": "^5.11.1",
"@fortawesome/vue-fontawesome": "^0.1.7",
"c3": "^0.7.1",
"core-js": "^2.6.5",
"crypto-js": "^3.1.9-1",
Expand All @@ -22,6 +25,7 @@
"serve-static": "^1.14.1",
"stylus": "^0.54.5",
"vue": "^2.6.10",
"vue-js-modal": "^1.3.31",
"vue-resource": "^1.5.1",
"vue-router": "^3.0.3",
"vuejs-datepicker": "^1.5.4",
Expand Down
16 changes: 15 additions & 1 deletion src/components/data-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,18 @@
<table>
<tr>
<th v-for="header in headers">{{ header }}</th>
<th v-if="editAction || deleteAction">Actions</th>
</tr>
<tr v-for="d in data">
<td v-for="f in fields">{{ f(d) }}</td>
<td class="actions" v-if="editAction || deleteAction">
<a v-if="editAction" v-on:click="editAction(d)"
><font-awesome-icon :icon="['fas', 'edit']"
/></a>
<a v-if="deleteAction" v-on:click="deleteAction(d)"
><font-awesome-icon :icon="['fas', 'trash']"
/></a>
</td>
</tr>
</table>
</div>
Expand All @@ -17,7 +26,7 @@ import Vue from 'vue';

export default Vue.extend({
name: 'data-table',
props: ['title', 'data', 'headers', 'fields']
props: ['title', 'data', 'headers', 'fields', 'editAction', 'deleteAction']
});
</script>

Expand All @@ -35,6 +44,11 @@ table {
padding: 10px;
border-left: 1px solid black;
}
td, .actions {
a {
margin: 5px;
}
}
}
}
</style>
124 changes: 124 additions & 0 deletions src/components/edit-version.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<template lang="html">
<modal
name="edit-version-modal"
v-bind:resizable="true"
v-bind:adaptive="true"
v-bind:draggable="true"
@before-close="this.closedEarly"
>
<div v-if="version" id="content">
<h3>Edit Version</h3>
<div class="formFields grid">
<div class="col-3 inputGroup">
<input v-model="pH" type="number" step="0.01" required />
<label>pH</label>
</div>
<div class="col-3 inputGroup">
<input v-model="ABV" type="number" step="0.01" required />
<label>ABV</label>
</div>
<div class="col-3 inputGroup">
<input v-model="pressure" type="number" step="0.01" required />
<label>Pressure</label>
</div>
<div class="col-3 inputGroup">
<input v-model="SG" type="number" step="0.000001" required />
<label>Specific Gravity</label>
</div>
<div class="col-3 inputGroup">
<input v-model="temp" type="number" step="0.01" required />
<label>Temperature</label>
</div>
<div class="col-3 time inputGroup">
<datepicker placeholder="Select Date" v-model="time"></datepicker>
</div>
</div>
<button v-on:click="this.closed">Submit</button>
</div>
</modal>
</template>

<script lang="ts">
import Vue from 'vue';
import Datepicker from 'vuejs-datepicker';
import moment, { Moment } from 'moment';
import { Version } from '@/types/index';

interface IEditVersion {
SG: number;
pH: number;
ABV: number;
temp: number;
pressure: number;
time?: string | Moment;
}

export default Vue.extend({
name: 'edit-version',
components: { Datepicker },
props: ['version'],
data() {
return <IEditVersion>{};
},
watch: {
version(version: Version, oldVersion) {
if (version === undefined) {
this.$modal.hide('edit-version-modal');
} else {
this.$modal.show('edit-version-modal');

this.pH = version.ph;
this.SG = version.sg;
this.ABV = version.abv;
this.temp = version.temperature;
this.pressure = version.pressure;
this.time = moment(version.measured_on).format('YYYY-MM-DDTHH:mm');
}
}
},
methods: {
closedEarly() {
this.$emit('editted-version', undefined);
},
closed() {
this.version.ph = this.pH;
this.version.sg = this.SG;
this.version.abv = this.ABV;
this.version.temperature = this.temp;
this.version.pressure = this.pressure;
this.version.measured_on = moment(this.time).toISOString();

this.$emit('editted-version', this.version);
}
}
});
</script>

<style lang="stylus" scoped>
@import '../styles/breakpoints'

#content
display: grid;
justify-items: center;
text-align: center;
padding: 5px 25px 20px 20px;

modal
display: grid;
justify-items: center;
text-align: center;
padding 15px
flex-direction column
align-items center
max-width 500px
button
margin-top 40px
margin-bottom 30px

.formFields
.time
display block
datepicker
overflow visible
text-align center
</style>
Loading