diff --git a/src/api/voting.js b/src/api/voting.js index b2b0cfd..b789de1 100644 --- a/src/api/voting.js +++ b/src/api/voting.js @@ -1,10 +1,41 @@ import routes from "./routes"; import request from "./request"; +function lastInitial(item) { + if (item.lastName) { + return item.lastName[0]; + } + + const split = item.username.split(" "); + return split.length >= 2 ? split[1] : ""; +} + +function firstInitial(item) { + if (item.firstName) { + return item.firstName[0]; + } + if (item.display) { + return item.display[0]; + } + + return item.username.split(" ")[0]; +} + +function initials(item) { + return `${firstInitial(item)}${lastInitial(item)}`; +} + async function getBallot(page, per) { - return request(routes.voting_ballot, { + const result = await request(routes.voting_ballot, { params: { page, per } }); + + if (result.items) { + result.items = result.items.map(item => { + return { ...item, ...{ initials: initials(item) } }; + }); + } + return result; } async function cast(answerId, email) { diff --git a/src/components/QuizNeedHelp.vue b/src/components/QuizNeedHelp.vue index 711aa2b..e83d53f 100644 --- a/src/components/QuizNeedHelp.vue +++ b/src/components/QuizNeedHelp.vue @@ -37,11 +37,13 @@ export default { icons: [ { icon: "twitter", - to: "https://twitter.com/intent/tweet?text=The%20Dragon%20Quest%20%E2%80%93%20Code%20Challenge&url=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&original_referer=" + to: + "https://twitter.com/intent/tweet?text=The%20Dragon%20Quest%20%E2%80%93%20Code%20Challenge&url=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&original_referer=" }, { icon: "facebook", - to: "https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&src=sdkpreparse" + to: + "https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&src=sdkpreparse" }, { icon: "linkedin", diff --git a/src/components/Toolbars/QuizBar.vue b/src/components/Toolbars/QuizBar.vue index 03bc941..b48a550 100644 --- a/src/components/Toolbars/QuizBar.vue +++ b/src/components/Toolbars/QuizBar.vue @@ -66,9 +66,9 @@ diff --git a/src/views/Voting/CodeModal.vue b/src/views/Voting/CodeModal.vue index c074c0b..1b30c42 100644 --- a/src/views/Voting/CodeModal.vue +++ b/src/views/Voting/CodeModal.vue @@ -11,7 +11,7 @@
- KA + {{ initials }}

@@ -22,6 +22,7 @@ v-bind="fields.email" v-model="fields.email.value" :disabled="isSubmitting" + v-if="!User.isAuthorized" /> ConfirmConfirm Vote @@ -76,6 +77,7 @@