Skip to content

Commit

Permalink
waiver type chooser
Browse files Browse the repository at this point in the history
  • Loading branch information
ronan18 committed May 13, 2019
1 parent 3030b05 commit 2a66f27
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 40 deletions.
66 changes: 33 additions & 33 deletions .firebase/hosting.ZGlzdA.cache
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
browserconfig.xml,1557716046310,9fc901f4bb068af5a210ac3c870359cd1d4a49f76d0c813ea2b7bb63c0dd757c
android-chrome-192x192.png,1557716046310,3b2da7123fdd20c6cccb4540b08c4d94e404cd1066c9da64f63c6fe03d11c089
apple-touch-icon.png,1557716046310,5cea7007fe2a085e8128742d4c9fb5a8740b8afbd051ad871d7fbd93495bcdbb
favicon-16x16.png,1557716046310,0897b73091887181db0b89df4d3ca857fda2959dd09eab9229b53da04322a3a6
favicon-32x32.png,1557716046310,f37468224525c5ae80533954b2ea658b5f0bb279c5b21eba01d33deda8e6d6bd
index.html,1557716046309,b6e0fe111891c9bde604c952bf06b1d3eabfa70563e38990243094dfa89c6136
manifest.json,1557716046310,33723749b3ae96632dd0c75a85e0d4002bf46761c093279c0ea9b21a458faa0f
precache-manifest.d5736ae834d02cd4ab02c6259939c4f3.js,1557716046310,29bf49681a83af1c438b10689ddb8ffca61814bef6d426d8c41bc5762cf808e6
robots.txt,1557716046310,c17e70846d7031bb27102edfb33b59d1e3e40a8e8e8097af75b7766e7fffc250
service-worker.js,1557716046310,0bf3f80d381682c912326009223d6dacdfd5e4af4f016c0e327faa04e06e5486
css/chunk-vendors.de600c15.css,1557716046337,10741e9c2637c2412e6c8f4275f8b2b9b4c3acd38dbdf6cae10bf0590d83352c
mstile-150x150.png,1557716046310,45fcb6d5b2769b9400e2fc27b3a47db05f2f732605091289f5eea01f5970fd7e
safari-pinned-tab.svg,1557716046310,0356f96855217cf3f99d65d0028a8af1610152381893f9db2dcbe4fd4cc84b93
img/icons/android-chrome-192x192.png,1557716046341,97e1127ad8db90e0349c838ecf9351fc0c370f9606f6ab309fe17444d26a9d59
img/icons/apple-touch-icon-120x120.png,1557716046339,13e4908bb32e2ca95e375ca720887ef85057fb3872d6f028c63ba22df9b12ed9
img/icons/apple-touch-icon-152x152.png,1557716046339,879d14ef1bd94f81c11ca6fa51ebca226bf6c88c86447aaf560752528e144067
css/app.007ce6ed.css,1557716046310,3c3b28796c3238d876c7596f3655f0f7f927a12da3ef19df6b681ed687ff6530
img/icons/apple-touch-icon-60x60.png,1557716046339,a27014cb4410df491f64e3b5411987418ff6d729b351056a3de84e744c681a52
img/icons/apple-touch-icon-76x76.png,1557716046341,65d6c498ad60f94b338df3f1f4551303ec84306ecb1c7e615ed64489fffc8b28
img/icons/favicon-16x16.png,1557716046341,563096b119e9b3f8060292a6fc3e091e2a98ee0d1c94ca99de941f78c7fa077c
img/icons/apple-touch-icon-180x180.png,1557716046340,ca5a8e637d730848e77716ed970da1a4a5fe9d3b4be21e43f33cf5ebcaf03e7d
img/icons/favicon-32x32.png,1557716046340,f5a182df55d21b93c27ec89bd600abe40f3fac23df563e4cfc9efd5edd248886
img/icons/msapplication-icon-144x144.png,1557716046340,27b3b62de2e36ac452e86079762d3cfd37c33dc8cbde0a7c5657e5a7c32d971a
img/icons/apple-touch-icon.png,1557716046341,08b37da608cf827a037d8f600a01a32b2f74728291e679b03679fd3619da3a43
img/icons/mstile-150x150.png,1557716046341,ea1dc2c1c63ffe2668cacc9d170cee33b50a2d58e1591b8399004629e3c1ae67
img/icons/safari-pinned-tab.svg,1557716046341,0858aec0c8ea5d0b50b2bfca81dbef78aa3039b295a7c11386b8d3c378f35326
favicon.ico,1557716046310,3fbfded31bb8316b434c4fc555c3facdf5cfb5f97b18b2d3b845a443df83be12
js/app.516fb396.js,1557716046336,e29c48e4e5995832b0ec17efa47b30ed47fc057dc6a2611fac98f22e65573d32
img/icons/android-chrome-512x512.png,1557716046341,07426bba3be5f2ea36f5a6f543b71bfb02277982e28e22509fd85f4f998aefff
android-chrome-512x512.png,1557716046310,a3e518d4f473019dc7f412f2807388e16698e79b334cc107d14b74e85704f005
js/app.516fb396.js.map,1557716046339,f61f61885323c00d1ba0a53d23e6d5b905f01e8d4e09f057b0d0a779a99c0605
js/chunk-vendors.6b4aea43.js,1557716046339,34a12364c9da25470eae6fee573b4a34cc6028b60ea51364f0b10904697eeb32
js/chunk-vendors.6b4aea43.js.map,1557716046338,eb1c86fa747ad923a3976456aad5a5e06d8aeb146cc1332cda15877ee8c9c5a7
browserconfig.xml,1557725537035,9fc901f4bb068af5a210ac3c870359cd1d4a49f76d0c813ea2b7bb63c0dd757c
android-chrome-192x192.png,1557725537034,3b2da7123fdd20c6cccb4540b08c4d94e404cd1066c9da64f63c6fe03d11c089
favicon-16x16.png,1557725537034,0897b73091887181db0b89df4d3ca857fda2959dd09eab9229b53da04322a3a6
favicon-32x32.png,1557725537035,f37468224525c5ae80533954b2ea658b5f0bb279c5b21eba01d33deda8e6d6bd
apple-touch-icon.png,1557725537034,5cea7007fe2a085e8128742d4c9fb5a8740b8afbd051ad871d7fbd93495bcdbb
index.html,1557725537034,eed481038673a32213bb4cfc91f83472c21b22fa489e49b99347a90081f7c887
manifest.json,1557725537034,33723749b3ae96632dd0c75a85e0d4002bf46761c093279c0ea9b21a458faa0f
precache-manifest.0fa204b4bbc7c40134a0e685a61bd84f.js,1557725537034,550335676f65d5f9cfcb408ca342dfef1ccaa218afa4d24a0f5e87a585fdbd2c
robots.txt,1557725537035,c17e70846d7031bb27102edfb33b59d1e3e40a8e8e8097af75b7766e7fffc250
service-worker.js,1557725537034,5abc3f92c8d4da21d1eaf42e2d52fbf69b18c92ce78852ab68c255186419cefd
mstile-150x150.png,1557725537034,45fcb6d5b2769b9400e2fc27b3a47db05f2f732605091289f5eea01f5970fd7e
css/chunk-vendors.de600c15.css,1557725537067,10741e9c2637c2412e6c8f4275f8b2b9b4c3acd38dbdf6cae10bf0590d83352c
img/icons/apple-touch-icon-120x120.png,1557725537068,13e4908bb32e2ca95e375ca720887ef85057fb3872d6f028c63ba22df9b12ed9
img/icons/android-chrome-192x192.png,1557725537068,97e1127ad8db90e0349c838ecf9351fc0c370f9606f6ab309fe17444d26a9d59
safari-pinned-tab.svg,1557725537034,0356f96855217cf3f99d65d0028a8af1610152381893f9db2dcbe4fd4cc84b93
img/icons/apple-touch-icon-152x152.png,1557725537067,879d14ef1bd94f81c11ca6fa51ebca226bf6c88c86447aaf560752528e144067
img/icons/apple-touch-icon-180x180.png,1557725537068,ca5a8e637d730848e77716ed970da1a4a5fe9d3b4be21e43f33cf5ebcaf03e7d
img/icons/apple-touch-icon-60x60.png,1557725537068,a27014cb4410df491f64e3b5411987418ff6d729b351056a3de84e744c681a52
img/icons/apple-touch-icon-76x76.png,1557725537068,65d6c498ad60f94b338df3f1f4551303ec84306ecb1c7e615ed64489fffc8b28
css/app.7f469982.css,1557725537034,c26afdcf7d13daeebbc1e73b192e7f5bc8d555831f7075cfd46ab07441de9904
img/icons/favicon-16x16.png,1557725537068,563096b119e9b3f8060292a6fc3e091e2a98ee0d1c94ca99de941f78c7fa077c
img/icons/favicon-32x32.png,1557725537068,f5a182df55d21b93c27ec89bd600abe40f3fac23df563e4cfc9efd5edd248886
img/icons/msapplication-icon-144x144.png,1557725537068,27b3b62de2e36ac452e86079762d3cfd37c33dc8cbde0a7c5657e5a7c32d971a
img/icons/apple-touch-icon.png,1557725537068,08b37da608cf827a037d8f600a01a32b2f74728291e679b03679fd3619da3a43
img/icons/mstile-150x150.png,1557725537068,ea1dc2c1c63ffe2668cacc9d170cee33b50a2d58e1591b8399004629e3c1ae67
img/icons/safari-pinned-tab.svg,1557725537068,0858aec0c8ea5d0b50b2bfca81dbef78aa3039b295a7c11386b8d3c378f35326
favicon.ico,1557725537034,3fbfded31bb8316b434c4fc555c3facdf5cfb5f97b18b2d3b845a443df83be12
js/app.cfa1ac79.js,1557725537062,7fee8b086f3943858b02f4d4ea3027c9a9107268ee23964e775268f969c217bb
img/icons/android-chrome-512x512.png,1557725537068,07426bba3be5f2ea36f5a6f543b71bfb02277982e28e22509fd85f4f998aefff
android-chrome-512x512.png,1557725537034,a3e518d4f473019dc7f412f2807388e16698e79b334cc107d14b74e85704f005
js/app.cfa1ac79.js.map,1557725537065,eb0ab4c43512b37df58850e521855486fd2ac9c2e0b54a4f16625d269a3df9f5
js/chunk-vendors.6b4aea43.js,1557725537065,34a12364c9da25470eae6fee573b4a34cc6028b60ea51364f0b10904697eeb32
js/chunk-vendors.6b4aea43.js.map,1557725537064,eb1c86fa747ad923a3976456aad5a5e06d8aeb146cc1332cda15877ee8c9c5a7
12 changes: 10 additions & 2 deletions src/assets/css/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,18 @@ $grey--dark: #cdcdcd;
display: flex;
flex-direction: column;
width: 90%;
margin: 5vh auto;
height: 70%;
margin: 3vh auto;
height: 80%;

input {
margin: 1vh 0;
@include textInput;
}

select {
margin-top: 2%;
}

.delete {
margin-top: auto;
margin-bottom: 4%;
Expand Down Expand Up @@ -387,6 +391,10 @@ $grey--dark: #cdcdcd;

}

.ticket__waiverRef {
margin-left: 5%;
}

.ticket__edit {
margin-left: auto;
justify-self: flex-end;
Expand Down
27 changes: 22 additions & 5 deletions src/views/admin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<div class="ticket" :key="ticket.id" v-for="ticket in ticketTypes">
<p class="ticket__name">{{ticket.name}}</p>
<p class="ticket__id">{{ticket.id}}</p>
<p class="ticket__waiverRef">{{ticket.waiverRef}}</p>
<edit-button :ticket="ticket"/>
</div>
</div>
Expand Down Expand Up @@ -52,8 +53,15 @@
<form @submit.prevent="updateTicket">
<input type="text" placeholder="Name" v-model="editTicketData.name" required>
<input type="text" placeholder="Eventbrite ID" v-model="editTicketData.id" required>
<select @change.prevent="selectSubmit" v-model="editTicketData.waiverRef" name="waiverType"
@input.prevent="selectSubmit">
<option value="attendeeWavier">Attendee Waiver</option>
<option value="mentorWaiver">Mentor/Judge Waiver</option>
<option value="volunteerWaiver"> Volunteer Waiver</option>
</select>

<button @click="deleteTicket" class="delete">DELETE</button>
<button class=" submit" type="submit">UPDATE</button>
<button class="submit" type="submit">UPDATE</button>
</form>
</div>
</div>
Expand Down Expand Up @@ -124,7 +132,8 @@
errorUploading: false,
uploading: false,
waiverFBref: false,
loadingCount: 4
loadingCount: 4,
preventTicketUpdate: false
}
},
computed: {
Expand Down Expand Up @@ -157,6 +166,11 @@
})
},
methods: {
selectSubmit() {
//console.log('select submit', 'preventing')
this.preventTicketUpdate = true
this.modal = true
},
openUploadWaiver(type) {
this.waiverType = type
this.uploader = true
Expand Down Expand Up @@ -209,8 +223,8 @@
},
closeModal: function () {
console.log(this.modal)
if (this.modal) {
// console.log(this.modal, this.preventTicketUpdate)
if (this.modal && !this.preventTicketUpdate) {
this.modal = false
}
},
Expand All @@ -233,9 +247,12 @@
this.modal = true;
},
updateTicket() {
// console.log(this.editTicketData, 'data to update')
// console.log(this.editTicketData, this.preventTicketUpdate, 'data to update')
this.preventTicketUpdate = false
this.$store.dispatch('updateTicket', this.editTicketData)
this.modal = false;
},
updateApiKey() {
this.$firebase.firestore().collection('secrets').doc('apiKeyDashboard').get().then(doc => {
Expand Down

0 comments on commit 2a66f27

Please sign in to comment.