- {{ getProgressDisplay() }}
-
-
- {{ incentivesProgress }}% {{ $t('complete') }}
-
+
+ {{ user.loginIncentives }}
+
+
+
+
+ {{ $t('latestCheckin') }}:
+
+
+ {{ userLastLoggedIn }}
+
+
+
+
+ {{ $t('nextReward') }}:
+
+
+ {{ nextIncentive() }}
+
+
+
+ {{ getProgressDisplay() }}
+
+
+ {{ incentivesProgress }}% {{ $t('complete') }}
@@ -278,7 +280,7 @@
@@ -365,7 +367,6 @@
.character-name {
color: $gray-50;
- font-size: 0.875em;
font-weight: bold;
height: 24px;
line-height: 1.71;
@@ -382,7 +383,6 @@
.profile-name-character {
margin-left: 4px !important;
}
-
}
.message-icon svg {
@@ -409,10 +409,24 @@
.standard-page {
background-color: $gray-700;
- padding-left: 12px;
+ // padding-left: 12px;
padding-top: 0px;
}
+ .flex-container {
+ display: flex;
+ flex-direction: row;
+ padding-top: 18px;
+ }
+
+ .flex-left {
+ width: 424px;
+ }
+
+ .flex-right {
+ width: 188px;
+ }
+
.admin-profile-actions {
margin-bottom: 3em;
@@ -457,7 +471,6 @@
}
.photo {
- margin-left: 24px;
img {
max-width: 100%;
@@ -508,17 +521,6 @@
font-size: 16px;
}
- .achievement {
- margin: 0 auto;
- }
-
- .box {
- border: dotted 1px #c3c0c7;
- border-radius: 2px;
- height: 92px;
- width: 94px;
- }
-
.white {
background: #FFFFFF;
border: 1px solid transparent;
@@ -536,6 +538,7 @@
h2 {
color: $gray-50;
+ margin-bottom: 20px !important;
overflow: hidden;
size: 1.125em;
}
@@ -546,30 +549,22 @@
}
.about {
- display: flex;
line-height: 1.71;
- margin-left: 24px;
- width: 424px;
-
- .about > * {
- flex-basis: auto;
- flex-grow: 0;
- flex-shrink: 0;
- }
}
button {
- width: 148px;
+ margin-left: 24px;
}
.info {
- margin-top: 40px;
+ margin-top: 16px;
+ line-height: 1.71;
size: 0.875em;
width: 212px;
.info-item {
color: $gray-50;
- margin-bottom: 8px;
+ margin-bottom: 4px;
margin-left: 24px;
.info-item-label {
@@ -593,9 +588,21 @@
}
}
}
- #achievements {
+
+ .achievement {
+ margin: 0 auto;
+ }
+
+ .box {
+ border: dotted 1px #c3c0c7;
+ border-radius: 2px;
+ height: 92px;
+ width: 94px;
+ }
+ #achievements {
.category-row {
margin-bottom: 34px;
+ justify-content: center;
&:last-child {
margin-bottom: 0px;
@@ -915,6 +922,13 @@ export default {
return ((this.user.loginIncentives - previousRewardDay)
/ (nextRewardAt - previousRewardDay)) * 100;
},
+ nextIncentive () {
+ const currentLoginDay = Content.loginIncentives[this.user.loginIncentives];
+ if (!currentLoginDay) return 0;
+ const previousRewardDay = currentLoginDay.prevRewardKey;
+ const { nextRewardAt } = currentLoginDay;
+ return ((nextRewardAt - previousRewardDay));
+ },
save () {
const values = {};
diff --git a/website/common/locales/en/character.json b/website/common/locales/en/character.json
index 0b6620cd1c..4b6bdd7ecd 100644
--- a/website/common/locales/en/character.json
+++ b/website/common/locales/en/character.json
@@ -175,8 +175,9 @@
"photo": "Photo",
"info": "Info",
"joined": "Joined",
- "totalLogins": "Total Check Ins",
- "latestCheckin": "Latest Check In",
+ "totalLogins": "Total Log Ins",
+ "latestCheckin": "Latest Log In",
+ "nextReward": "Next Log In Reward",
"editProfile": "Edit Profile",
"challengesWon": "Challenges Won",
"questsCompleted": "Quests Completed",