10 Commits

Author SHA1 Message Date
YouHaveTrouble d1cdceb620 update lockfile 2024-07-15 00:09:56 +02:00
YouHaveTrouble 281b164212 bump version 2024-07-15 00:09:11 +02:00
YouHaveTrouble 36775e45db add most unspoiled dawntrail nodes 2024-07-15 00:06:16 +02:00
YouHaveTrouble 0ef5d72275 fix up some things 2024-07-14 23:45:26 +02:00
YouHaveTrouble 0649004e51 read the readme 2023-10-12 18:03:00 +02:00
YouHaveTrouble 4f44eb58c7 newlines at the end of files 2023-10-12 17:45:47 +02:00
YouHaveTrouble 1308ef8d44 don't wanna eslint node_modules 2023-10-12 17:39:28 +02:00
YouHaveTrouble aa7b1bbdec test code on push 2023-10-12 17:30:51 +02:00
YouHaveTrouble 388e1d853a rename deploy workflow 2023-10-12 17:24:33 +02:00
YouHaveTrouble eb78ce7b6f install and configure eslint, bow before eslint 2023-10-12 17:20:28 +02:00
24 changed files with 2223 additions and 155 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
name: Build Vue
name: Build and deploy
on:
release:
types: [published]
@@ -13,4 +13,4 @@ jobs:
with:
username: 'YouHaveTrouble'
reponame: 'DiscipleOfLand'
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
+13
View File
@@ -0,0 +1,13 @@
name: Test
on: [push]
jobs:
build_vue:
runs-on: ubuntu-latest
name: Build and lint
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install
run: npm install
- name: Build and lint
run: npm run build
+1 -1
View File
@@ -1 +1 @@
dol.yht.one
dol.yht.one
+26
View File
@@ -0,0 +1,26 @@
# Disciple of Land
I deemed existing gathering timers to be inadequate, so I made my own.
This is currently still missing a lot of functionality and data.
## 1.0 checklist
- [x] Displaying gathering nodes
- [x] Displaying next time gathering node will be available
- [x] Displaying gathering node type
- [x] Displaying node's items and their level
- [x] Sorting based on time when node will be available
- [ ] Filter and sorting section/popup
- [ ] Filtering based on job
- [ ] Filtering based on scrip type
- [ ] Filtering based on items
- [ ] Filtering based on level
- [ ] Filtering based on node type (legendary, ephemeral, etc.)
- [ ] Fully input level 80-90 nodes data
## Nice to have checklist
- [ ] Fully input level 70-80 nodes data
- [ ] Fully input level 60-70 nodes data
- [ ] Fully input level 50-60 nodes data
- [ ] Better mobile support (pwa?)
BIN
View File
Binary file not shown.
+1657 -6
View File
File diff suppressed because it is too large Load Diff
+32 -4
View File
@@ -1,19 +1,47 @@
{
"name": "discipleofland",
"version": "0.0.1",
"version": "0.0.2",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build && cp -r CNAME dist/CNAME",
"preview": "vite preview"
},
"dependencies": {
"sass": "^1.67.0",
"typescript": "^5.2.2",
"vue": "^3.3.4"
},
"devDependencies": {
"sass": "^1.67.0",
"typescript": "^5.2.2",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"@vitejs/plugin-vue": "^4.2.3",
"vite": "^4.3.9"
"@vue/eslint-config-typescript": "^12.0.0",
"eslint": "^8.51.0",
"eslint-plugin-vue": "^9.17.0",
"vite": "^4.3.9",
"vue-eslint-parser": "^9.3.2",
"vite-plugin-eslint": "^1.8.1"
},
"eslintConfig": {
"root": true,
"parser": "vue-eslint-parser",
"extends": [
"plugin:vue/strongly-recommended",
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"@vue/typescript/recommended"
],
"plugins": ["@typescript-eslint"],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2020
},
"ignorePatterns": [
"dist/",
"node_modules/",
".github/"
]
}
}
+110
View File
@@ -58,6 +58,116 @@
"name": {
"en": "Yedlihmad"
}
},
{
"position": {
"zone": "shaaloani",
"x": 15.6,
"y": 19.2
},
"name": {
"en": "Sheshenewezi Springs"
}
},
{
"position": {
"zone": "shaaloani",
"x": 29.0,
"y": 30.8
},
"name": {
"en": "Hhusatahwi"
}
},
{
"position": {
"zone": "shaaloani",
"x": 27.1,
"y": 10.1
},
"name": {
"en": "Mehwahhetsoan"
}
},
{
"position": {
"zone": "heritage-found",
"x": 17.0,
"y": 9.8
},
"name": {
"en": "The Outskirts"
}
},
{
"position": {
"zone": "heritage-found",
"x": 31.7,
"y": 25.7
},
"name": {
"en": "Yyasulani Station"
}
},
{
"position": {
"zone": "heritage-found",
"x": 17.0,
"y": 23.9
},
"name": {
"en": "Electrope Strike"
}
},
{
"position": {
"zone": "living-memory",
"x": 21.5,
"y": 37.3
},
"name": {
"en": "Leynode Mnemo"
}
},
{
"position": {
"zone": "living-memory",
"x": 34.7,
"y": 15.7
},
"name": {
"en": "Leynode Pyro"
}
},
{
"position": {
"zone": "living-memory",
"x": 16.4,
"y": 13.5
},
"name": {
"en": "Leynode Aero"
}
},
{
"position": {
"zone": "urquopacha",
"x": 30.5,
"y": 34.2
},
"name": {
"en": "Worlar's Echo"
}
},
{
"position": {
"zone": "urquopacha",
"x": 28.1,
"y": 13.1
},
"name": {
"en": "Wachunpelo"
}
}
]
+44 -4
View File
@@ -1,22 +1,62 @@
{
"rarefied-iceberg-lettuce": {
"name": "Rarefied Iceberg Lettuce",
"scrip-color": "purple",
"level": 90
},
"rarefied-dark-rye": {
"name": "Rarefied Dark Rye",
"scrip-color": "white",
"level": 89
},
"rarefied-palm-log": {
"name": "Rarefied Palm Log",
"scrip-color": "white",
"level": 81
},
"rarefied-coconut": {
"name": "Rarefied Coconut",
"scrip-color": "white",
"level": 85
},
"rarefied-titanium-gold-ore": {
"name": "Rarefied Titanium Gold Ore",
"level": 96
},
"rarefied-magnesite-ore": {
"name": "Rarefied Magnesite Ore",
"level": 100
},
"rarefied-rakaznar-ore": {
"name": "Rarefied Ra'Kaznar Ore",
"level": 100
},
"rarefied-white-gold-ore": {
"name": "Rarefied White Gold Ore",
"level": 98
},
"rarefied-ash-soil": {
"name": "Rarefied Ash Soil",
"level": 100
},
"rarefied-acacia-log": {
"name": "Rarefied Acacia Log",
"level": 100
},
"rarefied-acacia-bark": {
"name": "Rarefied Acacia Bark",
"level": 98
},
"rarefied-dark-mahogany-log": {
"name": "Rarefied Dark Mahogany Log",
"level": 100
},
"rarefied-sweet-kukuru-bean": {
"name": "Rarefied Sweet Kukuru Bean",
"level": 96
},
"rarefied-windsbalm-bay-leaf": {
"name": "Rarefied Windsbalm Bay Leaf",
"level": 100
},
"rarefied-mountain-flax": {
"name": "Rarefied Mountain Flax",
"level": 93
}
}
+116
View File
@@ -32,6 +32,122 @@
"rarefied-palm-log",
"rarefied-coconut"
]
},
{
"job": "miner",
"type": "unspoiled",
"position": {
"zone": "shaaloani",
"x": 9.2,
"y": 24.2
},
"times": [
"08:00-10:00",
"20:00-22:00"
],
"items": [
"rarefied-magnesite-ore",
"rarefied-titanium-gold-ore"
]
},
{
"job": "miner",
"type": "unspoiled",
"position": {
"zone": "heritage-found",
"x": 34.6,
"y": 8.2
},
"times": [
"04:00-06:00",
"16:00-18:00"
],
"items": [
"rarefied-rakaznar-ore",
"rarefied-white-gold-ore"
]
},
{
"job": "miner",
"type": "unspoiled",
"position": {
"zone": "living-memory",
"x": 24.9,
"y": 17.3
},
"times": [
"00:00-02:00",
"12:00-14:00"
],
"items": [
"rarefied-ash-soil"
]
},
{
"job": "botanist",
"type": "unspoiled",
"position": {
"zone": "shaaloani",
"x": 31.6,
"y": 20.4
},
"times": [
"06:00-08:00",
"18:00-20:00"
],
"items": [
"rarefied-acacia-log",
"rarefied-acacia-bark"
]
},
{
"job": "botanist",
"type": "unspoiled",
"position": {
"zone": "yar-tel",
"x": 36.9,
"y": 34.8
},
"times": [
"02:00-04:00",
"14:00-16:00"
],
"items": [
"rarefied-acacia-log",
"rarefied-acacia-bark"
]
},
{
"job": "botanist",
"type": "unspoiled",
"position": {
"zone": "living-memory",
"x": 8.7,
"y": 7.6
},
"times": [
"10:00-12:00",
"22:00-00:00"
],
"items": [
"rarefied-windsbalm-bay-leaf"
]
},
{
"job": "botanist",
"type": "unspoiled",
"position": {
"zone": "urquopacha",
"x": 5.9,
"y": 23.8
},
"times": [
"00:00-02:00",
"12:00-14:00"
],
"items": [
"rarefied-mountain-flax"
]
}
]
+25
View File
@@ -8,5 +8,30 @@
"name": {
"en": "Thavnair"
}
},
"yak-tel": {
"name": {
"en": "Yak T'el"
}
},
"shaaloani": {
"name": {
"en": "Shaaloani"
}
},
"heritage-found": {
"name": {
"en": "Heritage Found"
}
},
"living-memory": {
"name": {
"en": "Living Memory"
}
},
"urquopacha": {
"name": {
"en": "Urquopacha"
}
}
}
+40 -38
View File
@@ -1,17 +1,18 @@
<template>
<nav>
<div class="current-eorzea-time">
{{ eorzeaTime.getPrettyTime() }}
</div>
</nav>
<main>
<SortedNodeList
:nodes="nodes"
<div>
<nav>
<div class="current-eorzea-time">
{{ eorzeaTime.getPrettyTime() }}
</div>
</nav>
<main>
<SortedNodeList
:nodes="nodes as Node[]"
:zones="zones"
:eorzeaTime="eorzeaTime"
/>
</main>
:eorzea-time="eorzeaTime"
/>
</main>
</div>
</template>
<script lang="ts">
@@ -55,14 +56,15 @@ export default defineComponent({
}
},
async mounted() {
this.eorzeaTime = new EorzeaTime();
setInterval(() => {
this.eorzeaTime = new EorzeaTime();
}, 500);
const aetheryteData = await fetch("/data/aetherytes.json")
.catch(() => {
return null;
});
const aetheryteData: Response | null = await fetch("/data/aetherytes.json")
.catch((): null => {
return null;
});
if (aetheryteData === null) {
console.error("Failed to fetch aetheryte data!")
return;
@@ -73,10 +75,10 @@ export default defineComponent({
this.aetherytes.push(new Aetheryte(aetheryteData));
}
const itemData = await fetch("/data/items.json")
.catch(() => {
return null;
});
const itemData: Response | null = await fetch("/data/items.json")
.catch((): null => {
return null;
});
if (itemData === null) {
console.error("Failed to fetch item data!")
return;
@@ -88,10 +90,10 @@ export default defineComponent({
this.items[itemId] = new Item(itemId, itemData);
}
const zoneData = await fetch("/data/zones.json")
.catch(() => {
return null;
});
const zoneData: Response | null = await fetch("/data/zones.json")
.catch((): null => {
return null;
});
if (zoneData === null) {
console.error("Failed to fetch zone data!")
return;
@@ -102,9 +104,9 @@ export default defineComponent({
}
const nodeData = await fetch("/data/nodes.json")
.catch(() => {
return null;
});
.catch(() => {
return null;
});
if (nodeData === null) {
console.error("Failed to fetch node data!")
return;
@@ -133,10 +135,10 @@ export default defineComponent({
const startTime = timeSplit[0].split(":");
const endTime = timeSplit[1].split(":");
times.push(new TimeRange(
parseInt(startTime[0]),
parseInt(startTime[1]),
parseInt(endTime[0]),
parseInt(endTime[1])
parseInt(startTime[0]),
parseInt(startTime[1]),
parseInt(endTime[0]),
parseInt(endTime[1])
));
}
@@ -144,13 +146,13 @@ export default defineComponent({
if (nearestAetheryte === null) continue;
this.nodes.push(new Node(
job,
nodeType,
nodeData.position,
times,
items,
nearestAetheryte
)
job,
nodeType,
nodeData.position,
times,
items,
nearestAetheryte
)
)
}
+55 -23
View File
@@ -1,31 +1,43 @@
<template>
<article class="node">
<div class="timer">{{ gatheringNode.isActive(eorzeaTime) ? 'Active' : prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime)) }}</div>
<div class="job">
<div class="icon">
<img
<article class="node" :class="{active: gatheringNode.isActive(eorzeaTime)}">
<div class="timer">
{{
gatheringNode.isActive(eorzeaTime) ? 'Active' : prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
}}
</div>
<div class="job">
<div class="icon">
<img
:alt="gatheringNode.job"
:src="`https://xivapi.com/cj/1/${gatheringNode.job}.png`"
:title="gatheringNode.job"
draggable="false"
>
</div>
</div>
<div class="aetheryte">
<span class="icon">
<img
src="https://xivapi.com/img-misc/mappy/aetheryte.png"
alt="Aetheryte icon"
draggable="false"
>
</span>
<div class="info">
<span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
<span>{{ gatheringNode.nearestAetheryte.name.en }}</span>
<span>{{ gatheringNode.nearestAetheryte.position.x }}, {{ gatheringNode.nearestAetheryte.position.y }}</span>
</div>
</div>
<div class="items">
<span
v-for="item in gatheringNode.items"
:key="item.name"
>
{{ item.name }} (lv. {{ item.level }})
</span>
</div>
</div>
<div class="aetheryte">
<span class="icon">
<img src="https://xivapi.com/img-misc/mappy/aetheryte.png" alt="Aetheryte icon" draggable="false">
</span>
<div class="info">
<span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
<span>{{ gatheringNode.nearestAetheryte.name }}</span>
<span>{{ gatheringNode.nearestAetheryte.position.x }}, {{ gatheringNode.nearestAetheryte.position.y }}</span>
</div>
</div>
<div class="items">
<span v-for="item in gatheringNode.items">{{ item.name }} (lv. {{ item.level }})</span>
</div>
</article>
</article>
</template>
<script lang="ts">
@@ -61,6 +73,13 @@ export default defineComponent({
</script>
<style scoped lang="scss">
@keyframes pulsing {
0% {background-color: rgba(255,255,255, 0.05);}
50% {background-color: rgba(255,255,255, 0.075);}
100% {background-color: rgba(255,255,255, 0.05);}
}
.node {
display: flex;
flex-direction: row;
@@ -71,6 +90,11 @@ export default defineComponent({
border: 1px solid #fff;
padding: 0.5rem;
border-radius: 0.25rem;
&.active {
animation: infinite pulsing 6s;
}
.timer {
min-width: 7rem;
font-size: 2rem;
@@ -78,19 +102,23 @@ export default defineComponent({
justify-content: center;
align-items: center;
}
.job {
display: flex;
justify-content: center;
align-items: center;
.icon {
width: 3rem;
height: 3rem;
img {
width: 100%;
height: 100%;
}
}
}
.aetheryte {
display: flex;
flex-direction: row;
@@ -100,15 +128,18 @@ export default defineComponent({
font-size: 1.5rem;
border-radius: 0.75rem;
padding: 0.35rem 1rem;
background-color: rgba(0,0,0, 0.2);
background-color: rgba(0, 0, 0, 0.2);
.icon {
width: 3rem;
img {
width: 100%;
height: 100%;
object-fit: fill;
}
}
.info {
display: flex;
flex-direction: column;
@@ -117,6 +148,7 @@ export default defineComponent({
gap: 0.1rem;
}
}
.items {
display: flex;
flex-direction: column;
@@ -125,4 +157,4 @@ export default defineComponent({
gap: 0.1rem;
}
}
</style>
</style>
+59 -52
View File
@@ -1,12 +1,13 @@
<template>
<div class="node-list">
<GatheringNode
<div class="node-list">
<GatheringNode
v-for="node in displayNodes"
:gathering-node="node"
:eorzeaTime="eorzeaTime"
:key="`${node.location.x}-${node.location.y}-${node.location.zone}`"
:gathering-node="node as Node"
:eorzea-time="eorzeaTime"
:zones="zones"
/>
</div>
/>
</div>
</template>
<script lang="ts">
@@ -17,56 +18,62 @@ import GatheringNode from "@/components/GatheringNode.vue";
import Zone from "@/entities/Zone";
export default defineComponent(
{
name: "SortedNodeList",
components: {GatheringNode},
props: {
nodes: {
type: Array as PropType<Node[]>,
required: true
},
eorzeaTime: {
type: Object as PropType<EorzeaTime>,
required: true
},
zones: {
type: Object as PropType<{ [key: string]: Zone }>,
required: true
},
{
name: "SortedNodeList",
components: {GatheringNode},
props: {
nodes: {
type: Array as PropType<Node[]>,
required: true
},
watch: {
nodes: {
immediate: true,
handler() {
this.displayNodes = this.nodes;
}
},
eorzeaTime: {
immediate: true,
handler(newValue, oldValue) {
if (oldValue === undefined) return;
if (newValue?.getMinutes() === oldValue?.getMinutes()) return;
this.sortListByTime();
}
eorzeaTime: {
type: Object as PropType<EorzeaTime>,
required: true
},
zones: {
type: Object as PropType<{ [key: string]: Zone }>,
required: true
},
},
watch: {
nodes: {
immediate: true,
handler() {
this.displayNodes = this.nodes;
}
},
data: () => ({
displayNodes: [] as Node[],
}),
methods: {
sortListByTime() {
this.displayNodes.sort((a, b) => {
const aSeconds = a.getSecondsToNextActiveTime(this.eorzeaTime);
const bSeconds = b.getSecondsToNextActiveTime(this.eorzeaTime);
if (aSeconds === bSeconds) return a;
return aSeconds - bSeconds;
});
},
displayNodes: {
handler() {
this.sortListByTime();
}
},
mounted() {
this.displayNodes = this.nodes;
eorzeaTime: {
immediate: true,
handler(newValue, oldValue) {
if (oldValue === undefined) return;
if (newValue?.getMinutes() === oldValue?.getMinutes()) return;
this.sortListByTime();
}
}
},
data: () => ({
displayNodes: [] as Node[],
}),
methods: {
sortListByTime() {
this.displayNodes.sort((a, b): number => {
const aSeconds = a.getSecondsToNextActiveTime(this.eorzeaTime);
const bSeconds = b.getSecondsToNextActiveTime(this.eorzeaTime);
if (aSeconds === bSeconds) return 1;
return aSeconds - bSeconds;
});
},
}
},
async mounted() {
this.displayNodes = this.nodes;
this.sortListByTime();
},
}
);
</script>
@@ -77,4 +84,4 @@ export default defineComponent(
gap: 0.33rem;
}
</style>
</style>
+3 -3
View File
@@ -6,11 +6,11 @@ export default class Aetheryte {
}
constructor(
data: any,
data: {position: {x: number, y: number, zone: string}, name: {en: string}}
) {
this.position = data.position;
this.name = data.name.en;
this.name = data.name;
}
}
}
+3 -9
View File
@@ -3,18 +3,12 @@ export default class Item {
readonly id: string;
readonly name: string;
readonly level: number;
readonly scripType: ScripType;
constructor(id: string, data: any) {
constructor(id: string, data: {[key: string]: number | string | undefined}) {
this.id = id;
this.name = data?.name;
this.level = data?.level;
this.scripType = data?.scripType ? ScripType[data.scripType.toUpperCase()] : null;
this.name = data?.name as string;
this.level = data?.level as number;
}
}
enum ScripType {
WHITE = 'white',
PURPLE = 'purple',
}
+4 -3
View File
@@ -1,5 +1,5 @@
import {Job} from "../enums/Job";
import {NodeType} from "../enums/NodeType";
import {Job} from "@/enums/Job";
import {NodeType} from "@/enums/NodeType";
import Item from "./Item";
import Aetheryte from "./Aetheryte";
import TimeRange from "./TimeRange";
@@ -28,6 +28,7 @@ export default class Node {
this.times = times;
this.items = items;
this.nearestAetheryte = nearestAetheryte;
items.sort((a, b) => b.level - a.level);
}
isActive(eorzeaTime: EorzeaTime): boolean {
@@ -59,4 +60,4 @@ export default class Node {
return Math.floor((this.getNextActiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
}
}
}
+1 -3
View File
@@ -29,6 +29,4 @@ export default class TimeRange {
return targetDate.getTime();
}
}
}
+5 -3
View File
@@ -4,8 +4,10 @@ export default class Zone {
en: string,
}
constructor(data: any) {
this.name = data.name;
constructor(data: {name: {en: string}}) {
this.name = {
en: data.name.en
};
}
}
}
+1 -1
View File
@@ -12,4 +12,4 @@ export function jobFromString(str: string): Job | null {
default:
return null;
}
}
}
+1 -1
View File
@@ -12,4 +12,4 @@ export function nodeTypeFromString(str: string): NodeType | null {
default:
return null;
}
}
}
+2 -2
View File
@@ -11,7 +11,7 @@ export default class EorzeaTime {
*/
readonly eorzeaDate: Date;
private constructor(realDate: Date = new Date()) {
public constructor(realDate: Date = new Date()) {
this.realDate = realDate;
this.eorzeaDate = new Date(realDate.getTime() * (3600 / 175));
}
@@ -59,4 +59,4 @@ export default class EorzeaTime {
return new EorzeaTime(new Date(eorzeaDate.getTime() / (3600 / 175)));
}
}
}
+21
View File
@@ -0,0 +1,21 @@
{
"compilerOptions": {
"target": "ESNext",
"useDefineForClassFields": true,
"module": "ESNext",
"moduleResolution": "Node",
"strict": true,
"jsx": "preserve",
"resolveJsonModule": true,
"isolatedModules": true,
"esModuleInterop": true,
"lib": ["ESNext", "DOM"],
"skipLibCheck": true,
"noEmit": true,
"allowJs": true,
"paths": {
"@/*": ["./src/*"]
}
},
"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
}
+2
View File
@@ -2,11 +2,13 @@ import { fileURLToPath, URL } from 'node:url'
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import eslintPlugin from 'vite-plugin-eslint'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [
vue(),
eslintPlugin(),
],
resolve: {
alias: {