Merge pull request #237 from codewizardshq/ballot-updates

Ballot updates

Author: jeffreywhitaker

src/views/Voting/CodeModal.vue

@@ -70,7 +70,7 @@
  </v-card>
  </v-dialog>
 
- <success-modal v-model="showSuccess" />
+ <SuccessModal v-model="showSuccess" />
 
  <v-dialog v-model="showError" max-width="600">
  <v-card color="white" light v-if="isOpen">
@@ -98,9 +98,22 @@ import { User } from "@/store";
 import "highlight.js/styles/darcula.css";
 
 export default {
+ name: "CodeModal",
  components: {
  SuccessModal
  },
+ // TODO: validate props
+ props: [
+ "display",
+ "firstName",
+ "id",
+ "lastName",
+ "numVotes",
+ "text",
+ "username",
+ "value",
+ "initials"
+ ],
  data() {
  return {
  showSuccess: false,
@@ -181,17 +194,6 @@ export default {
  );
  }
  },
- props: [
- "display",
- "firstName",
- "id",
- "lastName",
- "numVotes",
- "text",
- "username",
- "value",
- "initials"
- ],
  watch: {
  isOpen() {
  if (this.isOpen != this.value) {

src/views/Voting/SuccessModal.vue

@@ -5,18 +5,10 @@
  <v-spacer />
  <v-btn icon x-large @click="show = false">X</v-btn></v-card-title
  >
-
- <div v-if="User.isAuthorized">
- <h3>SUCCESS!</h3>
+ <div>
+ <h3>ALMOST DONE!</h3>
 
  <p style="text-align:center">
- Your vote has been cast!
- </p>
- </div>
- <div v-else>
- <h3>ALMOST DONE</h3>
-
- <p>
  Your vote has been cast! In order for your vote to count you must
  first confirm it. Please check your inbox for the confirmation email.
  </p>
@@ -27,15 +19,27 @@
  </h4>
 
  <v-card-text class="text-center">
- <v-btn icon class="mr-6" x-large color="cwhqBlue"
+ <v-btn
+ icon
+ class="mr-6"
+ x-large
+ color="cwhqBlue"
+ href="http://www.facebook.com"
+ target="_blank"
  ><v-icon>mdi-facebook</v-icon></v-btn
  >
- <v-btn icon class="mr-6" x-large color="cwhqBlue"
+ <v-btn
+ icon
+ class="mr-6"
+ x-large
+ color="cwhqBlue"
+ href="http://www.twitter.com"
+ target="_blank"
  ><v-icon>mdi-twitter</v-icon></v-btn
  >
- <v-btn icon class="mr-6" x-large color="cwhqBlue"
+ <!-- <v-btn icon class="mr-6" x-large color="cwhqBlue"
  ><v-icon>mdi-email</v-icon></v-btn
- >
+ > -->
  </v-card-text>
  <br />
  </v-card>
@@ -45,6 +49,7 @@
 <script>
 import { User } from "@/store";
 export default {
+ // TODO: all props should be validated
  props: ["value"],
  computed: {
  ...User.mapState()
@@ -55,6 +60,8 @@ export default {
  this.$emit("input", this.show);
  }
  },
+ // TODO: looks like this used to have a default and an ovveride but was removed
+ // should implement this
  value() {
  if (this.show != this.value) {
  this.show = this.value;