Skip to content

Commit

Permalink
feat(usernames): change create party modal to copy username
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreCat committed Dec 4, 2018
1 parent 31fa810 commit fbc4a21
Show file tree
Hide file tree
Showing 8 changed files with 124 additions and 138 deletions.
Binary file removed website/client/assets/images/basilist.png
Binary file not shown.
Binary file removed website/client/assets/images/basilist@2x.png
Binary file not shown.
Binary file removed website/client/assets/images/basilist@3x.png
Binary file not shown.
Binary file added website/client/assets/images/group@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed website/client/assets/images/party@2x.png
Binary file not shown.
Binary file removed website/client/assets/images/party@3x.png
Binary file not shown.
258 changes: 122 additions & 136 deletions website/client/components/groups/createPartyModal.vue
Expand Up @@ -3,56 +3,66 @@ b-modal#create-party-modal(title="Empty", size='lg', hide-footer=true)
.header-wrap(slot="modal-header")
.quest_screen
.row.heading
.col-12.text-center
h2(v-once) {{$t('playInPartyTitle')}}
p(v-once) {{$t('playInPartyDescription')}}
.col-12.text-center.pr-5.pl-5
h2(v-once) {{ $t('playInPartyTitle') }}
p(v-once) {{ $t('playInPartyDescription') }}
button.btn.btn-primary(v-once, @click='createParty()') {{ $t('createParty') }}
.row.grey-row
.col-6.text-center
.start-party
h3(v-once) {{$t('startYourOwnPartyTitle')}}
p(v-once) {{$t('startYourOwnPartyDescription')}}
button.btn.btn-primary(v-once, @click='createParty()') {{$t('createParty')}}
.col-6
div.text-center
.join-party
h3(v-once) {{$t('wantToJoinPartyTitle')}}
p(v-once) {{$t('wantToJoinPartyDescription')}}
button.btn.btn-primary(v-once, @click='shareUserId()') {{$t('shartUserId')}}
.share-userid-options(v-if="shareUserIdShown")
.option-item(@click='copyUserId()')
.svg-icon(v-html="icons.copy")
input(type="text", v-model="user._id", id="userIdInput")
| Copy User ID
//.option-item(v-once)
.svg-icon(v-html="icons.greyBadge")
| {{$t('lookingForGroup')}}
//.option-item(v-once)
.svg-icon(v-html="icons.qrCode")
| {{$t('qrCode')}}
//.option-item(v-once)
.svg-icon.facebook(v-html="icons.facebook")
| Facebook
//.option-item(v-once)
.svg-icon(v-html="icons.twitter")
| Twitter
.col-12.text-center
.join-party
h3(v-once) {{ $t('wantToJoinPartyTitle') }}
p(v-html='$t("wantToJoinPartyDescription")')
.form-group
.d-flex.align-items-center
label.mr-3(for='username') {{ $t('username') }}
.flex-grow-1
.input-group-prepend.input-group-text @
input.form-control#username-text(
type='text',
v-model='user.auth.local.username',
readonly='true',
)
.svg-icon.copy-icon(v-html='icons.copy', @click='copyUsername')
.small(@click='copyUsername') {{ $t('copy') }}
</template>

<style>
#create-party-modal .modal-dialog {
width: 684px;
width: 35.75rem;
}
#create-party-modal .modal-header {
padding: 0;
border-bottom: 0px;
}
</style>

<style lang="scss">
@import '~client/assets/scss/colors.scss';
.copy-icon {
width: 1.25rem;
cursor: pointer;
}
.heading {
margin-top: 1em;
margin-bottom: 1em;
margin-top: 1rem;
margin-bottom: 1rem;
}
.form-group {
background-color: $gray-700;
border-radius: 2px;
border: solid 1px $gray-500;
width: 90%;
margin: auto;
}
.grey-row {
background-color: $gray-700;
color: #4e4a57;
padding: 2em;
border-radius: 0px 0px 2px 2px;
}
.header-wrap {
Expand All @@ -61,140 +71,116 @@ b-modal#create-party-modal(title="Empty", size='lg', hide-footer=true)
width: 100%;
.quest_screen {
background-image: url('~client/assets/images/quest_screen.png');
background-image: url('~client/assets/images/group@3x.png');
background-size: cover;
width: 100%;
height: 246px;
margin-bottom: .5em;
border-radius: 2px 2px 0 0;
image-rendering: optimizequality;
}
h2 {
color: #4f2a93;
}
}
.start-party {
background-image: url('~client/assets/images/basilist@3x.png');
background-size: cover;
width: 122px;
height: 69px;
margin: 0 auto;
margin-bottom: 1em;
input.form-control {
border: 0px;
padding-left: 0.25rem;
}
.form-control[readonly] {
background-color: $white;
color: $gray-50;
}
.input-group-prepend {
margin-right: 0px;
}
.input-group-text {
background-color: $white;
border: 0px;
border-radius: 0px;
color: $gray-300;
padding: 0rem 0.1rem 0rem 0.75rem;
}
.join-party {
background-image: url('~client/assets/images/party@3x.png');
background-image: url('~client/assets/images/party.png');
background-size: cover;
width: 203px;
height: 66px;
margin: 0 auto;
margin-bottom: 1em;
}
label {
color: $gray-100;
font-weight: bold;
margin-bottom: 0rem;
margin-left: 1rem;
}
.modal-body {
padding-bottom: 0;
padding-top: 0;
}
.grey-row {
background-color: $gray-700;
color: #4e4a57;
padding: 2em;
border-radius: 0px 0px 2px 2px;
}
.share-userid-options {
background-color: $white;
border-radius: 2px;
width: 220px;
position: absolute;
top: 9em;
left: 4.8em;
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
#userIdInput {
position: absolute;
left: 1000rem;
}
.option-item {
padding: 1em;
.svg-icon {
margin-right: .5em;
width: 20px;
display: inline-block;
vertical-align: bottom;
}
.facebook svg {
width: 15px;
height: 15px;
}
}
.option-item:hover {
background-color: $header-color;
color: $purple-200;
cursor: pointer;
}
.small {
color: $gray-200;
margin: auto 0.5rem auto 0.25rem;
cursor: pointer;
}
</style>

<script>
import { mapState } from 'client/libs/store';
import * as Analytics from 'client/libs/analytics';
import copyIcon from 'assets/svg/copy.svg';
import greyBadgeIcon from 'assets/svg/grey-badge.svg';
import qrCodeIcon from 'assets/svg/qrCode.svg';
import facebookIcon from 'assets/svg/facebook.svg';
import twitterIcon from 'assets/svg/twitter.svg';
export default {
data () {
return {
icons: Object.freeze({
copy: copyIcon,
greyBadge: greyBadgeIcon,
qrCode: qrCodeIcon,
facebook: facebookIcon,
twitter: twitterIcon,
}),
shareUserIdShown: false,
};
},
computed: {
...mapState({user: 'user.data'}),
},
methods: {
shareUserId () {
this.shareUserIdShown = !this.shareUserIdShown;
},
async createParty () {
let group = {
type: 'party',
import { mapState } from 'client/libs/store';
import * as Analytics from 'client/libs/analytics';
import notifications from 'client/mixins/notifications';
import copyIcon from 'assets/svg/copy.svg';
export default {
data () {
return {
icons: Object.freeze({
copy: copyIcon,
}),
};
group.name = this.$t('possessiveParty', {name: this.user.profile.name});
let party = await this.$store.dispatch('guilds:create', {group});
this.$store.state.party.data = party;
this.user.party._id = party._id;
Analytics.updateUser({
partyID: party._id,
partySize: 1,
});
this.$root.$emit('bv::hide::modal', 'create-party-modal');
this.$router.push('/party');
},
copyUserId () {
const copyText = document.getElementById('userIdInput');
copyText.select();
document.execCommand('copy');
alert('User ID has been copied');
computed: {
...mapState({user: 'user.data'}),
},
methods: {
async createParty () {
let group = {
type: 'party',
};
group.name = this.$t('possessiveParty', {name: this.user.profile.name});
let party = await this.$store.dispatch('guilds:create', {group});
this.$store.state.party.data = party;
this.user.party._id = party._id;
Analytics.updateUser({
partyID: party._id,
partySize: 1,
});
this.$root.$emit('bv::hide::modal', 'create-party-modal');
this.$router.push('/party');
},
copyUsername () {
let copyText = document.createElement('textarea');
copyText.value = this.user.auth.local.username;
document.body.appendChild(copyText);
copyText.select();
document.execCommand('copy');
this.text(this.$t('usernameCopied'));
document.body.removeChild(copyText);
},
},
},
};
mixins: [notifications],
};
</script>
4 changes: 2 additions & 2 deletions website/common/locales/en/groups.json
Expand Up @@ -45,6 +45,7 @@
"LFG": "To advertise your new Party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
"wantExistingParty": "Want to join an existing Party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
"joinExistingParty": "Join Someone Else's Party",
"usernameCopied": "Username copied to clipboard.",
"needPartyToStartQuest": "Whoops! You need to <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>create or join a Party</a> before you can start a quest!",
"createGroupPlan": "Create",
"create": "Create",
Expand Down Expand Up @@ -417,9 +418,8 @@
"playInPartyDescription": "Take on amazing quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.",
"startYourOwnPartyTitle": "Start your own Party",
"startYourOwnPartyDescription": "Battle monsters solo or invite as many of your friends as you'd like!",
"shartUserId": "Share User ID",
"wantToJoinPartyTitle": "Want to join a Party?",
"wantToJoinPartyDescription": "Give your User ID to a friend who already has a Party, or head to the Party Wanted Guild to meet potential comrades!",
"wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
"copy": "Copy",
"inviteToPartyOrQuest": "Invite Party to Quest",
"inviteInformation": "Clicking \"Invite\" will send an invitation to your Party members. When all members have accepted or denied, the Quest begins.",
Expand Down

0 comments on commit fbc4a21

Please sign in to comment.