Skip to content

Commit

Permalink
waiver decline emails and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ronan18 committed May 16, 2019
1 parent 7186379 commit c643a69
Show file tree
Hide file tree
Showing 6 changed files with 261 additions and 50 deletions.
67 changes: 34 additions & 33 deletions .firebase/hosting.ZGlzdA.cache
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
browserconfig.xml,1557727032420,9fc901f4bb068af5a210ac3c870359cd1d4a49f76d0c813ea2b7bb63c0dd757c
favicon-16x16.png,1557727032420,0897b73091887181db0b89df4d3ca857fda2959dd09eab9229b53da04322a3a6
android-chrome-192x192.png,1557727032421,3b2da7123fdd20c6cccb4540b08c4d94e404cd1066c9da64f63c6fe03d11c089
favicon-32x32.png,1557727032421,f37468224525c5ae80533954b2ea658b5f0bb279c5b21eba01d33deda8e6d6bd
apple-touch-icon.png,1557727032420,5cea7007fe2a085e8128742d4c9fb5a8740b8afbd051ad871d7fbd93495bcdbb
index.html,1557727032420,8d9947d4e3573c59e1367d8edcf8b78998a2970ae7012021e76bc915aea62fe4
manifest.json,1557727032420,33723749b3ae96632dd0c75a85e0d4002bf46761c093279c0ea9b21a458faa0f
precache-manifest.72c15f7ce6cdbccc1b25cc087c0fc90a.js,1557727032421,6c86adf73a1312a86b8979536af4b60a7a66af7ece41b5e94c099aa0a6388789
robots.txt,1557727032421,c17e70846d7031bb27102edfb33b59d1e3e40a8e8e8097af75b7766e7fffc250
mstile-150x150.png,1557727032421,45fcb6d5b2769b9400e2fc27b3a47db05f2f732605091289f5eea01f5970fd7e
service-worker.js,1557727032421,5a5899637ea9135883dfe7c5836368b183ba4977aed6ffdf975e74c4760ef029
css/chunk-vendors.de600c15.css,1557727032449,10741e9c2637c2412e6c8f4275f8b2b9b4c3acd38dbdf6cae10bf0590d83352c
img/icons/android-chrome-192x192.png,1557727032450,97e1127ad8db90e0349c838ecf9351fc0c370f9606f6ab309fe17444d26a9d59
safari-pinned-tab.svg,1557727032421,0356f96855217cf3f99d65d0028a8af1610152381893f9db2dcbe4fd4cc84b93
img/icons/apple-touch-icon-120x120.png,1557727032450,13e4908bb32e2ca95e375ca720887ef85057fb3872d6f028c63ba22df9b12ed9
img/icons/apple-touch-icon-152x152.png,1557727032450,879d14ef1bd94f81c11ca6fa51ebca226bf6c88c86447aaf560752528e144067
css/app.7f469982.css,1557727032421,c26afdcf7d13daeebbc1e73b192e7f5bc8d555831f7075cfd46ab07441de9904
img/icons/apple-touch-icon-60x60.png,1557727032449,a27014cb4410df491f64e3b5411987418ff6d729b351056a3de84e744c681a52
img/icons/apple-touch-icon-180x180.png,1557727032450,ca5a8e637d730848e77716ed970da1a4a5fe9d3b4be21e43f33cf5ebcaf03e7d
img/icons/apple-touch-icon-76x76.png,1557727032450,65d6c498ad60f94b338df3f1f4551303ec84306ecb1c7e615ed64489fffc8b28
img/icons/favicon-16x16.png,1557727032450,563096b119e9b3f8060292a6fc3e091e2a98ee0d1c94ca99de941f78c7fa077c
img/icons/apple-touch-icon.png,1557727032450,08b37da608cf827a037d8f600a01a32b2f74728291e679b03679fd3619da3a43
img/icons/favicon-32x32.png,1557727032450,f5a182df55d21b93c27ec89bd600abe40f3fac23df563e4cfc9efd5edd248886
img/icons/msapplication-icon-144x144.png,1557727032450,27b3b62de2e36ac452e86079762d3cfd37c33dc8cbde0a7c5657e5a7c32d971a
img/icons/mstile-150x150.png,1557727032450,ea1dc2c1c63ffe2668cacc9d170cee33b50a2d58e1591b8399004629e3c1ae67
favicon.ico,1557727032420,3fbfded31bb8316b434c4fc555c3facdf5cfb5f97b18b2d3b845a443df83be12
img/icons/safari-pinned-tab.svg,1557727032450,0858aec0c8ea5d0b50b2bfca81dbef78aa3039b295a7c11386b8d3c378f35326
js/app.b9aa0412.js,1557727032447,40bd5fa0254b5d9e6b2c4b5c9772ece9296f945adaff7c37efd834f13d00f0ee
img/icons/android-chrome-512x512.png,1557727032450,07426bba3be5f2ea36f5a6f543b71bfb02277982e28e22509fd85f4f998aefff
android-chrome-512x512.png,1557727032421,a3e518d4f473019dc7f412f2807388e16698e79b334cc107d14b74e85704f005
js/app.b9aa0412.js.map,1557727032449,b848f15ba394f87509b1f5beb4fa77b3b8e6f495d815314293045dcc61e6ddf4
js/chunk-vendors.6b4aea43.js,1557727032449,34a12364c9da25470eae6fee573b4a34cc6028b60ea51364f0b10904697eeb32
js/chunk-vendors.6b4aea43.js.map,1557727032448,eb1c86fa747ad923a3976456aad5a5e06d8aeb146cc1332cda15877ee8c9c5a7
browserconfig.xml,1557983290152,9fc901f4bb068af5a210ac3c870359cd1d4a49f76d0c813ea2b7bb63c0dd757c
android-chrome-192x192.png,1557983290152,3b2da7123fdd20c6cccb4540b08c4d94e404cd1066c9da64f63c6fe03d11c089
favicon-16x16.png,1557983290153,0897b73091887181db0b89df4d3ca857fda2959dd09eab9229b53da04322a3a6
favicon-32x32.png,1557983290152,f37468224525c5ae80533954b2ea658b5f0bb279c5b21eba01d33deda8e6d6bd
apple-touch-icon.png,1557983290152,5cea7007fe2a085e8128742d4c9fb5a8740b8afbd051ad871d7fbd93495bcdbb
index.html,1557983290152,2e4d493eba77971a2d4e14d319f5204702b930c908b080bee24ace19aa7793b0
manifest.json,1557983290152,33723749b3ae96632dd0c75a85e0d4002bf46761c093279c0ea9b21a458faa0f
precache-manifest.d0e2663a8b2b38bd06337be0a761c498.js,1557983290152,52f1ec0634dd917a5b68bb8f3832d4926bd59f4fd0eba15678cce8218886a44c
robots.txt,1557983290152,c17e70846d7031bb27102edfb33b59d1e3e40a8e8e8097af75b7766e7fffc250
mstile-150x150.png,1557983290152,45fcb6d5b2769b9400e2fc27b3a47db05f2f732605091289f5eea01f5970fd7e
service-worker.js,1557983290152,a5638b52157f0ee4341ee6261c6f263164fdb3a1f3b9930228bb6b4e4f18e039
css/chunk-vendors.de600c15.css,1557983290182,10741e9c2637c2412e6c8f4275f8b2b9b4c3acd38dbdf6cae10bf0590d83352c
safari-pinned-tab.svg,1557983290152,0356f96855217cf3f99d65d0028a8af1610152381893f9db2dcbe4fd4cc84b93
img/done.c8f27e61.svg,1557983290152,8868899fb5d6f6082f0af2535ffa1524e0787fae9ed1e6a9dd91c1a0cd40bb3e
css/app.44e93d87.css,1557983290184,d30851218757ec6ce6b30e843283b0da431d96c40f913e8d0d7909dd68624acd
img/icons/apple-touch-icon-120x120.png,1557983290183,13e4908bb32e2ca95e375ca720887ef85057fb3872d6f028c63ba22df9b12ed9
img/icons/android-chrome-192x192.png,1557983290185,97e1127ad8db90e0349c838ecf9351fc0c370f9606f6ab309fe17444d26a9d59
img/icons/apple-touch-icon-60x60.png,1557983290184,a27014cb4410df491f64e3b5411987418ff6d729b351056a3de84e744c681a52
img/icons/apple-touch-icon-152x152.png,1557983290184,879d14ef1bd94f81c11ca6fa51ebca226bf6c88c86447aaf560752528e144067
img/icons/apple-touch-icon-180x180.png,1557983290187,ca5a8e637d730848e77716ed970da1a4a5fe9d3b4be21e43f33cf5ebcaf03e7d
img/icons/apple-touch-icon-76x76.png,1557983290184,65d6c498ad60f94b338df3f1f4551303ec84306ecb1c7e615ed64489fffc8b28
img/icons/favicon-16x16.png,1557983290184,563096b119e9b3f8060292a6fc3e091e2a98ee0d1c94ca99de941f78c7fa077c
img/icons/favicon-32x32.png,1557983290185,f5a182df55d21b93c27ec89bd600abe40f3fac23df563e4cfc9efd5edd248886
img/icons/apple-touch-icon.png,1557983290185,08b37da608cf827a037d8f600a01a32b2f74728291e679b03679fd3619da3a43
img/icons/msapplication-icon-144x144.png,1557983290187,27b3b62de2e36ac452e86079762d3cfd37c33dc8cbde0a7c5657e5a7c32d971a
img/icons/mstile-150x150.png,1557983290185,ea1dc2c1c63ffe2668cacc9d170cee33b50a2d58e1591b8399004629e3c1ae67
img/icons/safari-pinned-tab.svg,1557983290185,0858aec0c8ea5d0b50b2bfca81dbef78aa3039b295a7c11386b8d3c378f35326
favicon.ico,1557983290152,3fbfded31bb8316b434c4fc555c3facdf5cfb5f97b18b2d3b845a443df83be12
js/app.6ef9a921.js,1557983290172,c71d126647b39be641e95edf87fc5ebc49b4ca4ab05de1e53aae7facb1aa3e8b
img/icons/android-chrome-512x512.png,1557983290185,07426bba3be5f2ea36f5a6f543b71bfb02277982e28e22509fd85f4f998aefff
android-chrome-512x512.png,1557983290152,a3e518d4f473019dc7f412f2807388e16698e79b334cc107d14b74e85704f005
js/app.6ef9a921.js.map,1557983290184,6e3400959fb4d82aa16feb5a389c28393f586c7536dabd3166176736dbd38ddc
js/chunk-vendors.6b4aea43.js,1557983290185,34a12364c9da25470eae6fee573b4a34cc6028b60ea51364f0b10904697eeb32
js/chunk-vendors.6b4aea43.js.map,1557983290187,eb1c86fa747ad923a3976456aad5a5e06d8aeb146cc1332cda15877ee8c9c5a7
20 changes: 14 additions & 6 deletions src/assets/css/vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ $dark--background: #27293D;
$orange: #FDA085;
$orange--hover: #db7d6e;
$yellow: #F6D365;
$yellow--brand: #DC8F2A;
$grey: #4F5160;
$grey--light: #646779;
$rounding: 10px;
$blue: #4281A4;
$red: #ff4d4d;
Expand All @@ -25,6 +27,14 @@ $red--hover: #e24444;

}

@mixin transition {
-webkit-transition-duration: 0.25s;
-moz-transition-duration: 0.25s;
-ms-transition-duration: 0.25s;
-o-transition-duration: 0.25s;
transition-duration: 0.25s;
}

@mixin button {
-webkit-transition-duration: 0.25s;
-moz-transition-duration: 0.25s;
Expand All @@ -47,6 +57,7 @@ $red--hover: #e24444;
outline: none;
}
}

@mixin button--hollow {
@include button;
background: none;
Expand All @@ -57,11 +68,7 @@ $red--hover: #e24444;
}

@mixin textInput {
-webkit-transition-duration: 0.25s;
-moz-transition-duration: 0.25s;
-ms-transition-duration: 0.25s;
-o-transition-duration: 0.25s;
transition-duration: 0.25s;
@include transition;
background: rgba($dark, 1);
//border: $yellow solid 2px;
border: none;
Expand All @@ -86,4 +93,5 @@ $red--hover: #e24444;
background: $yellow;
color: white;
}
}
}

97 changes: 97 additions & 0 deletions src/assets/css/waiver.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
@import "vars";

.waiverReview__allDone {
grid-column: 1/3;
grid-row: 1/3;

margin-bottom: 2vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;

div {
width: 35vw;
background: $dark--background;
height: 40vw;
@include rounding;
padding: 2%;
display: flex;
flex-direction: column;
justify-content: center;

img {
margin: auto;
justify-self: center;
width: 80%;
}

h1 {
text-align: center;
color: $yellow--brand;
font-weight: bold;
font-size: 2rem;
margin-top: auto;
margin-bottom: 5%;
}
}
}

.waiverReview {

display: grid;
Expand Down Expand Up @@ -177,4 +214,64 @@
@include rounding;
background: white;
}

.waiver__declineModal {
display: flex;
flex-direction: column;
width: 40vw;
height: 70vh;
background: linear-gradient(180deg, $dark--background 0%, $dark 100%);
z-index: 15;
box-shadow: 0 19px 38px rgba(0, 0, 0, 0.30), 0 15px 12px rgba(0, 0, 0, 0.22);
border: $grey solid 1px;
padding: 2%;
@include rounding;

h1 {
font-size: 3rem;
color: $yellow;
font-weight: bold;
}

form {
display: flex;
flex-direction: column;
width: 95%;
margin: auto;
height: 80%;

textarea {
padding: 2% 1%;
font-size: 1rem;
color: white;
@include transition;
min-height: 15rem;
background: $dark;
border: 1px solid $grey;
@include rounding;
&:focus {
outline: none;
border: 2px solid $yellow;
}
&:hover {
border: 2px solid $yellow;
}
}

.submit {

}

button {
margin-top: auto;
@include button;

}
}

}

::-webkit-input-placeholder {
color: $grey--light;
}
}
1 change: 1 addition & 0 deletions src/assets/done.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/views/roster.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<p class="person__info--name ">{{person.profile.name}}</p>
<p class="person__info--role">{{roleCheck(person.ticket_class_id)}}</p>
<p class="person__info--gender">{{person.profile.gender}}</p>
<p class="person__info--school">{{person.answers[0].answer}}</p>
<p v-if="person.answers[1].answer" class="person__info--school">{{person.answers[1].answer}}</p>
<p class="person__info--waiverStatus"
:class="{yellow: person.waiverStatus === 2, blue: person.waiverStatus === 1, orange: person.waiverStatus === 0, red: person.waiverStatus === 3 }">
{{waiverStatus(person.waiverStatus)}}</p>
Expand Down
Loading

0 comments on commit c643a69

Please sign in to comment.