Skip to content

Commit

Permalink
Preliminary update for patch 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bourgeoisor committed Jun 28, 2024
1 parent 99d5871 commit a208ef2
Show file tree
Hide file tree
Showing 16 changed files with 119 additions and 85 deletions.
Binary file modified frontend/public/fonts/icomoon.eot
Binary file not shown.
104 changes: 53 additions & 51 deletions frontend/public/fonts/icomoon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/fonts/icomoon.ttf
Binary file not shown.
Binary file modified frontend/public/fonts/icomoon.woff
Binary file not shown.
20 changes: 13 additions & 7 deletions frontend/public/icons.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?9bc0ps');
src: url('fonts/icomoon.eot?9bc0ps#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?9bc0ps') format('truetype'),
url('fonts/icomoon.woff?9bc0ps') format('woff'),
url('fonts/icomoon.svg?9bc0ps#icomoon') format('svg');
src: url('fonts/icomoon.eot?dom3l7');
src: url('fonts/icomoon.eot?dom3l7#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?dom3l7') format('truetype'),
url('fonts/icomoon.woff?dom3l7') format('woff'),
url('fonts/icomoon.svg?dom3l7#icomoon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
Expand All @@ -25,6 +25,9 @@
-moz-osx-font-smoothing: grayscale;
}

.icon-marker-msq:before {
content: "\e901";
}
.icon-exp-8x:before {
content: "\e92e";
}
Expand Down Expand Up @@ -169,6 +172,9 @@
.icon-job-drk:before {
content: "\e900";
}
.icon-marker-msq:before {
content: "\e901";
.icon-job-vpr:before {
content: "\e931";
}
.icon-job-pct:before {
content: "\e932";
}
2 changes: 1 addition & 1 deletion frontend/src/assets/db.json

Large diffs are not rendered by default.

22 changes: 7 additions & 15 deletions frontend/src/assets/news.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
{
"latestCountdownID": 42,
"countdowns": [
{
"title": "Yo-kai Watch Collab.",
"type": "event",
"url": "https://na.finalfantasyxiv.com/lodestone/special/2024/youkai-watch/j9rq1fpxxd",
"start": 1713945600,
"end": 1719392400
},
{
"title": "Moogle Treasure Trove",
"type": "event",
"url": "https://na.finalfantasyxiv.com/lodestone/special/mogmog-collection/202405/nprq4eanp3",
"start": 1715673600,
"end": 1719241200
},
{
"title": "Patch 7.0 (Dawntrail) - EA",
"type": "patch",
Expand All @@ -28,8 +14,14 @@
"start": 1719910800
}
],
"latestID": 240421,
"latestID": 240627,
"news": [
{
"ID": 240627,
"title": "Release of Dawntrail",
"published": "June 27, 2024",
"content": "After a two and a half years wait, Dawntrail is finally at our doorstep! I've updated XIV ToDo with placeholders for the new content, which will be updated in the coming days. Any content name considered spoilers will be blurred by default, as always. If you encounter any issues, please let me know! In the meantime, happy new expansion!"
},
{
"ID": 240421,
"title": "Theme & styling updates",
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/DutyList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export default {
if (item.Expansion == "4x" && !achievements.has(1794)) blur = true;
if (item.Expansion == "5x" && !achievements.has(2298)) blur = true;
if (item.Expansion == "6x" && !achievements.has(2958)) blur = true;
if (item.Expansion == "7x" && !achievements.has(3496)) blur = true;
if (spoilersOption == "2") blur = false;
item.blur = blur;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/JobLevel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
export default {
data() {
return {
maxLevel: 90,
maxLevel: 100,
maxLevelBlue: 80,
iconClass: "icon-job-" + this.initial,
};
Expand Down
10 changes: 8 additions & 2 deletions frontend/src/i18n/lang-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,14 @@
"nin": "Ninja",
"sam": "Samurai",
"rpr": "Reaper",
"vpr": "Viper",
"brd": "Bard",
"mch": "Machinist",
"dnc": "Dancer",
"blm": "Black Mage",
"smn": "Summoner",
"rdm": "Red Mage",
"pct": "Pictomancer",
"blu": "Blue Mage",
"crp": "Carpenter",
"bsm": "Blacksmith",
Expand Down Expand Up @@ -231,8 +233,10 @@
"crafterJobQuests": "Crafter Job Quests",
"roleQuestsShB": "Role Quests (ShB)",
"roleQuestsEW": "Role Quests (EW)",
"roleQuestsDT": "Role Quests (DT)",
"crystallineMeanQuests": "Crystalline Mean Quests",
"studiumDeliveryQuests": "Studium Delivery Quests"
"studiumDeliveryQuests": "Studium Delivery Quests",
"wachumeqimeqiDeliveryQuests": "Wachumeqimeqi Delivery Quests"
},
"challenges": {
"deepDungeons": "Deep Dungeons",
Expand All @@ -248,6 +252,7 @@
"miscellaneous": "Miscellaneous",
"sharedFateShB": "Shared Fate (ShB)",
"sharedFateEW": "Shared Fate (EW)",
"sharedFateDT": "Shared Fate (DT)",
"bozjanSouthernFront": "Bozjan Southern Front",
"zadnor": "Zadnor",
"variantDungeons": "Variant Dungeons",
Expand Down Expand Up @@ -348,7 +353,8 @@
"hw": "Heavensward",
"sb": "Stormblood",
"shb": "Shadowbringers",
"ew": "Endwalker"
"ew": "Endwalker",
"dt": "Dawntrail"
},
"time": {
"daysShort": "{days}d",
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/utilities/backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ const jobInitials = {
38: "dnc",
39: "rpr",
40: "sge",
41: "vpr",
42: "pct",
};

function injectData(characterData) {
Expand Down
18 changes: 10 additions & 8 deletions frontend/src/utilities/checklist.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@ function injectWeeklyChecklist(payload) {

// Add missing items in payload from DB
for (let dbItem of db.weeklyChecklist) {
let name = dbItem.NameEN;
let found = false;
for (let i = 0; i < payload.length; i++) {
let item = payload[i];
if (item.name == dbItem.Name && found) {
if (item.name == name && found) {
weeklyChecklist.splice(i, 1);
break;
}
if (item.name == dbItem.Name && !item.custom) {
if (item.name == name && !item.custom) {
found = true;
}
}
if (!found) {
let newItem = {
name: dbItem.Name,
name: name,
custom: false,
checked: false,
hidden: false,
Expand All @@ -33,7 +34,7 @@ function injectWeeklyChecklist(payload) {
let item = payload[i];
let found = false;
for (let dbItem of db.weeklyChecklist) {
if (dbItem.Name == item.name) {
if (dbItem.NameEN == item.name) {
found = true;
}
}
Expand All @@ -50,20 +51,21 @@ function injectDailyChecklist(payload) {

// Add missing items in payload from DB
for (let dbItem of db.dailyChecklist) {
let name = dbItem.NameEN;
let found = false;
for (let i = 0; i < payload.length; i++) {
let item = payload[i];
if (item.name == dbItem.Name && found) {
if (item.name == name && found) {
dailyChecklist.splice(i, 1);
break;
}
if (item.name == dbItem.Name && !item.custom) {
if (item.name == name && !item.custom) {
found = true;
}
}
if (!found) {
let newItem = {
name: dbItem.Name,
name: name,
custom: false,
checked: false,
hidden: false,
Expand All @@ -77,7 +79,7 @@ function injectDailyChecklist(payload) {
let item = payload[i];
let found = false;
for (let dbItem of db.dailyChecklist) {
if (dbItem.Name == item.name) {
if (dbItem.NameEN == item.name) {
found = true;
}
}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/views/Challenges.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<DutyList :title="$t('shared.expansion.ew')" :duties="db.ewExploration" />
</div>
<div class="col-12 col-lg-4">
<DutyList :title="$t('shared.expansion.dt')" :duties="db.dtExploration" />
<DutyList :title="$t('challenges.exploratoryMissions')" :duties="db.explExploration" />
<DutyList :title="$t('challenges.sightseeingLogs')" :duties="db.sightseeingLogs" />
</div>
Expand Down Expand Up @@ -42,6 +43,7 @@
<div class="col-12 col-lg-4">
<DutyList :title="$t('challenges.sharedFateShB')" :duties="db.shbSharedFATE" />
<DutyList :title="$t('challenges.sharedFateEW')" :duties="db.ewSharedFATE" />
<DutyList :title="$t('challenges.sharedFateDT')" :duties="db.dtSharedFATE" />
</div>
<div class="col-12 col-lg-4">
<DutyList :title="$t('challenges.bozjanSouthernFront')" :duties="db.bozjanChallenges" />
Expand All @@ -68,6 +70,7 @@
<div class="col-12 col-lg-4">
<DutyList :title="$t('shared.expansion.shb')" :duties="db.shbFATEs" />
<DutyList :title="$t('shared.expansion.ew')" :duties="db.ewFATEs" />
<DutyList :title="$t('shared.expansion.dt')" :duties="db.dtFATEs" />
</div>
</div>
<hr />
Expand Down
16 changes: 16 additions & 0 deletions frontend/src/views/Encounters.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,22 @@
<DutyList :title="$t('encounters.heRaids')" :duties="db.ewRaidsSavUlt" type="high" :showTotal="true" />
</div>
</div>
<hr />
<div class="row">
<h2>{{ $t("shared.expansion.dt") }}</h2>

<div class="col-12 col-lg-4">
<DutyList :title="$t('encounters.dungeons')" :duties="db.dtDungeons" type="dngs" :showTotal="true" />
</div>
<div class="col-12 col-lg-4">
<DutyList :title="$t('encounters.trials')" :duties="db.dtTrials" type="trials" :showTotal="true" />
<DutyList :title="$t('encounters.heTrials')" :duties="db.dtTrialsEx" type="high" :showTotal="true" />
</div>
<!-- <div class="col-12 col-lg-4">
<DutyList :title="$t('encounters.raids')" :duties="db.dtRaids" type="raids" :showTotal="true" />
<DutyList :title="$t('encounters.heRaids')" :duties="db.dtRaidsSavUlt" type="high" :showTotal="true" />
</div> -->
</div>
</template>

<script>
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/views/Profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
<JobLevel initial="nin" :title="$t('profile.job.nin')" type="dps" />
<JobLevel initial="sam" :title="$t('profile.job.sam')" type="dps" />
<JobLevel initial="rpr" :title="$t('profile.job.rpr')" type="dps" />
<JobLevel initial="vpr" :title="$t('profile.job.vpr')" type="dps" />
<JobLevel initial="arc" :title="$t('profile.job.arc')" type="dps" />
<JobLevel initial="brd" :title="$t('profile.job.brd')" type="dps" />
</div>
Expand All @@ -156,6 +157,7 @@
<JobLevel initial="acn" :title="$t('profile.job.acn')" type="dps" />
<JobLevel initial="smn" :title="$t('profile.job.smn')" type="dps" />
<JobLevel initial="rdm" :title="$t('profile.job.rdm')" type="dps" />
<JobLevel initial="pct" :title="$t('profile.job.pct')" type="dps" />
<JobLevel initial="blu" :title="$t('profile.job.blu')" type="dps" />
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/views/Questlines.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
<div class="col-12 col-lg-4">
<DutyList :title="$t('questlines.roleQuestsShB')" :duties="db.shbRoleQuests" />
<DutyList :title="$t('questlines.roleQuestsEW')" :duties="db.ewRoleQuests" />
<DutyList :title="$t('questlines.roleQuestsDT')" :duties="db.dtRoleQuests" />
<DutyList :title="$t('questlines.relicQuests')" :duties="db.relicQuests" />
</div>
<div class="col-12 col-lg-4">
<DutyList :title="$t('questlines.crystallineMeanQuests')" :duties="db.crystallineMeanQuests" />
<DutyList :title="$t('questlines.studiumDeliveryQuests')" :duties="db.studiumDeliveryQuests" />
<DutyList :title="$t('questlines.wachumeqimeqiDeliveryQuests')" :duties="db.wachumeqimeqiDeliveryQuests" />
</div>
</div>
</template>
Expand Down

0 comments on commit a208ef2

Please sign in to comment.