Update bot project name to be a little less generic

(cherry picked from commit 24d424bd90)
Link to the new TokenBot project
2024-12-09 19:27:17 -08:00 · 2024-12-08 20:22:38 -08:00 · 2024-12-02 04:24:24 -08:00 · 2024-12-01 18:27:42 -08:00 · 2024-12-01 18:27:40 -08:00 · 2024-12-01 18:27:38 -08:00
16 changed files with 1446 additions and 921 deletions
--- a/README.md
+++ b/README.md
@ -2,6 +2,8 @@

 These are the public assets for the [wowtoken.app](https://wowtoken.app) website, served off Amazon S3 behind CloudFront.

-This project gets picked up by CodePipline, built via CodeBuild, and deployed.
+This project gets picked up by CodePipeline, built via CodeBuild, and to S3.

-![Build Status](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiblpRUnlNUzVmNU9sK1VBRVl1bVI1U1ZrWHJFSDVPYjFpTC9WVzZuSk1hd0lsUU5NekdDZTl4M2t4Uy9EWFdaY3JSNU1mYTFtaVI0VXN6ZGQvNE9BUWpvPSIsIml2UGFyYW1ldGVyU3BlYyI6InZNcHhHanNTODQ0b2lwbkkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
+Backend lambdas can be found at my private git repository [wowtoken.app-backend](https://git.emily.sh/wowtoken-app/wowtoken.app-backend)
+
+![Build Status](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiblpRUnlNUzVmNU9sK1VBRVl1bVI1U1ZrWHJFSDVPYjFpTC9WVzZuSk1hd0lsUU5NekdDZTl4M2t4Uy9EWFdaY3JSNU1mYTFtaVI0VXN6ZGQvNE9BUWpvPSIsIml2UGFyYW1ldGVyU3BlYyI6InZNcHhHanNTODQ0b2lwbkkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
--- a/buildspec.yml
+++ b/buildspec.yml
@ -3,7 +3,7 @@ version: 0.2
 phases:
  install:
    runtime-versions:
-      nodejs: 16
+      nodejs: 18
    commands:
      - echo Installing dependencies...
      - npm install
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -15,10 +15,9 @@
    "webpack-cli": "^4.7.2"
  },
  "dependencies": {
-    "cash-dom": "^8.1.5",
-    "chart.js": "^4.3.0",
-    "chartjs-adapter-dayjs-3": "^1.2.3",
-    "css-minimizer-webpack-plugin": "^5.0.0",
-    "dayjs": "^1.11.7"
+    "chart.js": "^4.4.5",
+    "chartjs-adapter-dayjs-4": "^1.0.4",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "dayjs": "^1.11.13"
  }
 }
--- a/src/datum.js
+++ b/src/datum.js
@ -0,0 +1,22 @@
+export default class Datum {
+    constructor(time, price) {
+        this._time = time;
+        this._price = price;
+    }
+
+    getTime() {
+        return this._time;
+    }
+
+    getPrice() {
+        return this._price;
+    }
+
+    getX() {
+        return this.getTime();
+    }
+
+    getY() {
+        return this.getPrice();
+    }
+}
--- a/src/fetchCurrent.js
+++ b/src/fetchCurrent.js
@ -0,0 +1,4 @@
+export default async function fetchCurrent() {
+    const resp = await fetch("https://data.wowtoken.app/v2/current/classic.json");
+    return await resp.json();
+}
--- a/src/fetchData.js
+++ b/src/fetchData.js
@ -0,0 +1,13 @@
+import Datum from "./datum";
+import urlBuilder from "./urlBuilder";
+
+export default async function fetchData(currentRegionSelection, currentTimeSelection, currentAggregateSelection) {
+    const data = [];
+    const resp = await fetch(urlBuilder(currentRegionSelection, currentTimeSelection, currentAggregateSelection));
+    const respData = await resp.json();
+    for (let i = 0, l = respData.length; i < l; i++) {
+        const datum = new Datum(new Date(respData[i][0]), respData[i][1]);
+        data.push(datum);
+    }
+    return data;
+}
--- a/src/highTime.js
+++ b/src/highTime.js
@ -0,0 +1,18 @@
+import Datum from "./datum";
+
+
+function updateHighTime() {
+    const highTime= document.getElementById("high-time");
+
+    const currentTime = document.getElementById("time").selectedOptions[0].innerText;
+    if (currentTime.toLowerCase() !== highTime.innerText) {
+        highTime.innerText = currentTime.toLowerCase();
+    }
+}
+
+function updateHighVal(datum) {
+    const highVal = document.getElementById("high-val");
+    highVal.innerHTML = datum.getPrice().toLocaleString();
+}
+
+export {updateHighTime, updateHighVal};
--- a/src/index.html
+++ b/src/index.html
@ -1,71 +1,94 @@
 <!doctype html>
 <html lang="en">
    <head>
-        <title>WoW Historical Token Prices Tracker</title>
+        <title>WoW Classic Historical Token Prices Tracker</title>
        <meta charset="UTF-8">
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="description" content="Track current and historical gold price trends for the World of Warcraft (WoW) in game token, including the US, EU, TW, and KR regions. Prices updated every minute. Simple, quick, and easy info, no ads or tracking, ever.">
+        <meta name="description" content="Track current and historical gold price trends for the World of Warcraft (WoW) Classic in game token, including the US, EU, TW, and KR regions. Prices updated every minute. Simple, quick, and easy info, no ads or tracking, ever.">
        <link rel="preconnect" href="https://data.wowtoken.app">
 	    <link rel="dns-prefetch" href="https://data.wowtoken.app">
-        <link rel="preload" href="https://data.wowtoken.app/token/current.json" as="fetch" type="application/json" crossorigin="anonymous">
-        <link rel="preload" href="https://data.wowtoken.app/token/history/us/72h.json" as="fetch" type="application/json" crossorigin="anonymous">
+        <link rel="preload" href="https://data.wowtoken.app/v2/current/classic.json" as="fetch" type="application/json" crossorigin="anonymous">
+        <link rel="preload" href="https://data.wowtoken.app/v2/relative/classic/us/72h.json" as="fetch" type="application/json" crossorigin="anonymous">
    </head>
    <body>
        <div class="flex-container">
-            <div><h1>1 Token = <u id="token">0</u> Gold</h1></div>
+            <div class="data-header">
+                <h1>1 Classic Token = <u id="token">0</u> Gold</h1>
+                <div class="high-low">
+                    <p>Lowest in last <em id="low-time">3 days</em>: <u id="low-val">0</u></p>
+                    <p>Highest in last <em id="high-time">3 days</em>: <u id="high-val">0</u></p>
+                </div>
+            </div>
            <div id="chart-frame">
                <div class="lds-ripple" id="loader"><div></div><div></div></div>
                <canvas id="token-chart"></canvas>
                <div id="option_select">
-                    <p>
-                        <label for="region">Region:</label>
-                        <select name="region" id="region">
-                            <option value="us">US</option>
-                            <option value="eu">EU</option>
-                            <option value="kr">KR</option>
-                            <option value="tw">TW</option>
-                        </select>
-                    </p>
-                    <p>
-                        <label for="time">Time Selection:</label>
-                        <select name="time" id="time">
-                            <option value="72h">3 Days</option>
-                            <option value="168h">7 Days</option>
-                            <option value="336h">14 Days</option>
-                            <option value="720h">1 Month</option>
-                            <option value="90d">3 Months</option>
-                            <option value="6m">6 Months</option>
-                            <option value="1y">1 Year</option>
-                            <option value="2y">2 Years</option>
-                            <option value="all">All Available</option>
-                        </select>
-                    </p>
+                    <fieldset id="basic-options">
+                        <legend>Basic chart options</legend>
+                        <div>
+                            <label for="region">Region:</label>
+                            <select name="region" id="region">
+                                <option value="us">US</option>
+                                <option value="eu">EU</option>
+                                <option value="kr">KR</option>
+                                <option value="tw">TW</option>
+                            </select>
+                        </div>
+                        <div>
+                            <label for="time">Time Selection:</label>
+                            <select name="time" id="time">
+                                <option value="72h">3 Days</option>
+                                <option value="168h">7 Days</option>
+                                <option value="336h">14 Days</option>
+                                <option value="720h">1 Month</option>
+                                <option value="90d">3 Months</option>
+                                <option value="6m">6 Months</option>
+                                <option value="all">All Available</option>
+                            </select>
+                        </div>
+                        <div>
+                            <label for="enable-advanced">Enable advanced charting options:</label>
+                            <input type="checkbox" id="enable-advanced" name="enable-advanced" />
+                        </div>
+                    </fieldset>
+                    <fieldset id="advanced-options">
+                        <legend>Advanced chart options</legend>
+                        <fieldset id="basic-smoothing">
+                            <label for="aggregate">Smoothing Function:</label>
+                            <select name="aggregate" id="aggregate">
+                                <option id='agg_none' value="none">None</option>
+                                <option id='agg_davg' value="avg">Daily Average</option>
+                            </select>
+                        </fieldset>
+                        <fieldset id="period-overlay-options">
+                            <label for="period-overlay" id="period-overlay-label">
+                                Overlay previous <em id="period-time">0 hours</em> on current period:
+                            </label>
+                            <input type="checkbox" id="period-overlay" name="period-overlay">
+                        </fieldset>
+                        <fieldset id="y-start-options">
+                            <label for="y-start">Start y-axis at 0:</label>
+                            <input type="checkbox" id="y-start" name="y-start"/>
+                        </fieldset>
+
+                    </fieldset>
                    <div class="tooltip">
                        <button id="copyURLButton">
                            <span class="tooltiptext" id="urlTooltip">Copy to clipboard</span>
                            Copy URL to this Chart
                        </button>
                    </div>
+                    <div class="other-projects">
+                        <p><em>
+                            Get alerted when the Token hits certain thresholds using GoblinBot, find out more <a href="https://blog.emily.sh/token-bot/">here!</a>
+                        </em></p>
+                        <hr />
+                        <p><em>Looking for the retail WoW Token price? Find it <a href="https://wowtoken.app">here!</a></em></p>
+                    </div>
                </div>
-                <details id="advanced">
-                    <summary>Advanced Options</summary>
-                    <p>
-                        <label for="aggregate">Aggregate Function:</label>
-                        <select name="aggregate" id="aggregate">
-                            <option id='agg_none' value="none">None</option>
-                            <option id='agg_dmax' value="daily_max">Daily Maximum</option>
-                            <option id='agg_dmin' value="daily_min">Daily Minimum</option>
-                            <option id='agg_davg' value="daily_mean">Daily Average</option>
-                            <option id='agg_wmax' value="weekly_max" disabled>Weekly Maximum</option>
-                            <option id='agg_wmin' value="weekly_min" disabled>Weekly Minimum</option>
-                            <option id='agg_wavg' value="weekly_mean" disabled>Weekly Average</option>
-                        </select>
-                    </p>
-                    <em>More coming soon™</em>
-                </details>
                <details id="about">
                    <summary>About this Site</summary>
-                    This is a site developed to track the value of the World of Warcraft Token from various
+                    This is a site developed to track the value of the World of Warcraft Classic Token from various
                    regions over time. I developed it because I wanted a quick and simple way to track the
                    cost without being advertised to or tracked, and to play around with various "serverless"
                    technologies. As such, my promise to you is never to use any tracking Javascript, and the
@ -73,10 +96,10 @@
                </details>
                <details id="what-is">
                    <summary>What is the WoW Token</summary>
-                    The World of Warcraft Token is a first-party system developed by Blizzard to allow you
+                    The World of Warcraft Classic Token is a first-party system developed by Blizzard to allow you
                    to either spend currency (local denomination or Blizzard Balance) and convert it to gold
-                    in retail World of Warcraft, or use gold to buy game time or Blizzard Balance. To find out
-                    more, visit the support article on Blizzard's website
+                    in classic World of Warcraft, or use gold to buy game time.
+                    To find out more, visit the support article on Blizzard's website
                    <a href="https://us.battle.net/support/en/article/31218">here</a>.
                </details>
                <div id="source">
--- a/src/index.js
+++ b/src/index.js
@ -1,201 +1,146 @@
-import {
-    Chart,
-    Legend,
-    LinearScale,
-    LineController,
-    LineElement,
-    PointElement,
-    TimeSeriesScale,
-    Title,
-    Tooltip
-} from 'chart.js';
-import $ from 'cash-dom';
-import 'chartjs-adapter-dayjs-3';
+import 'chartjs-adapter-dayjs-4';
 import "./style.css"

-Chart.register(
-    LineElement,
-    PointElement,
-    LineController,
-    LinearScale,
-    TimeSeriesScale,
-    Legend,
-    Title,
-    Tooltip
-)
+import fetchCurrent from "./fetchCurrent";
+import fetchData from "./fetchData";
+import {updateHighTime} from "./highTime";
+import {updateLowTime} from "./lowTime";
+import {addLoader, removeLoader} from "./loader";
+import {allowOverlay, forceOverlayOff, forceOverlayOn, isOverlayAllowed, isOverlaySelected} from "./overlay";
+import TokenChart from "./tokenChart";
+import Datum from "./datum";
+
+// TODO: This file should be seperated into multiple with better ownership

 let currentRegionSelection = '';
 let currentTimeSelection = '';
 let currentAggregateSelection = '';
+let startYAtZero = false;
+let datum;
+let chart;
 const currentPriceHash = {
    us: 0,
    eu: 0,
    kr: 0,
    tw: 0
 };
-let chartJsData;
-let ctx;
-let tokenChart;
-
-
-function populateChart() {
-    ctx = document.getElementById("token-chart").getContext('2d');
-    tokenChart = new Chart(ctx, {
-        type: 'line',
-        data: { 
-            datasets: [{
-                borderColor: 'gold',
-                label: currentRegionSelection.toUpperCase() + " WoW Token Price",
-                data: chartJsData,
-                cubicInterpolationMode: 'monotone',
-                pointRadius: 0
-            }]
-        },
-        options: {
-            interaction: {
-                intersect: false,
-                mode: "index"
-            },
-            scales: {
-                x: {
-                    type: 'time'
-                }
-            },
-        }
-    });
+const chartData = {
+    us: [],
+    eu: [],
+    kr: [],
+    tw: []
 }

-
 async function callUpdateURL() {
-    let resp = await fetch("https://data.wowtoken.app/token/current.json");
-    let data = await resp.json();
-    updateTokens(data);
+    await updateTokens(await fetchCurrent());
 }

-function updateTokens(data) {
-    updateRegionalToken('us', data);
-    updateRegionalToken('eu', data);
-    updateRegionalToken('kr', data);
-    updateRegionalToken('tw', data);
+async function updateTokens(data) {
+    await Promise.all([
+        updateRegionalToken('us', data),
+        updateRegionalToken('eu', data),
+        updateRegionalToken('kr', data),
+        updateRegionalToken('tw', data)
+    ]);
 }

-function updateRegionalToken(region, data) {
-    if (currentPriceHash[region] !== data['price_data'][region]) {
-        currentPriceHash[region] = data['price_data'][region];
+async function updateRegionalToken(region, data) {
+    if (currentPriceHash[region] !== data[region][1]) {
+        currentPriceHash[region] = data[region][1];
        if (region === currentRegionSelection) {
            formatToken();
-            if (currentAggregateSelection === 'none') {
-                addDataToChart(region, data);
+            datum = new Datum(Date.parse(data[region][0]), data[region][1]);
+            if (currentAggregateSelection === 'none' && chart.active()) {
+                await chart.addDataToChart(datum);
+            }
+            else if (currentAggregateSelection === 'none' && !chart.active()) {
+                await chart.lateUpdate(datum);
            }
        }
    }
 }

-function addDataToChart(region, data) {
-    if (tokenChart) {
-        const datum = {x: data['current_time'], y: data['price_data'][region]}
-        tokenChart.data.datasets.forEach((dataset) => {
-            dataset.data.push(datum);
-        })
-        tokenChart.update();
-    }
-}
-
-async function aggregateFunctionToggle() {
-    // TODO: We should probably make these global or something
-    //  so if the need to be updated in the future we can do so easily
-    const smallTimes = ['72h', '168h', '336h'];
-    const longTimes = ['720h', '30d', '2190h', '90d', '1y', '2y', '6m', 'all'];
-    const idsToModify = ['agg_wmax', 'agg_wmin', 'agg_wavg']
-    if (smallTimes.includes(currentTimeSelection)) {
-        for (const id of idsToModify) {
-            let ele = document.getElementById(id);
-            ele.disabled = true;
-        }
-    } else if (longTimes.includes(currentTimeSelection)) {
-        for (const id of idsToModify) {
-            let ele = document.getElementById(id);
-            ele.disabled = false;
-        }
-    }
-}
-
-function addLoader() {
-    let loader = document.getElementById('loader');
-    if (!loader) {
-        const blank_div = document.createElement('div');
-        let loaderNode = blank_div.cloneNode();
-        loaderNode.id = 'loader';
-        loaderNode.className = 'lds-ripple';
-        loaderNode.appendChild(blank_div.cloneNode());
-        loaderNode.appendChild(blank_div.cloneNode());
-        let chartNode = document.getElementById('token-chart');
-        chartNode.before(loaderNode);
-    }
-}
-
-function removeLoader () {
-    let loader = document.getElementById('loader');
-    if (loader) {
-        loader.remove();
-    }
-}
-
-function updateRegionPreference(newRegion) {
+async function updateRegionPreference(newRegion) {
    if (newRegion !== currentRegionSelection) {
-        tokenChart.destroy();
+        await chart.destroyChart();
        addLoader();
        currentRegionSelection = newRegion;
    }
    formatToken();
-    pullChartData().then(populateChart);
+    await pullChartData();
 }

-function updateTimePreference(newTime) {
+async function updateTimePreference(newTime) {
    if (newTime !== currentTimeSelection) {
-        tokenChart.destroy();
+        await chart.destroyChart();
        addLoader();
        currentTimeSelection = newTime;
-        aggregateFunctionToggle();
    }
-    pullChartData().then(populateChart);
+    if (newTime === "all") {
+        forceOverlayOff();
+    }
+    else {
+        allowOverlay();
+    }
+    await pullChartData();
+    updateHighTime();
+    updateLowTime();
 }

-function updateAggregatePreference(newAggregate) {
+async function updateAggregatePreference(newAggregate) {
    if (newAggregate !== currentAggregateSelection) {
-        tokenChart.destroy();
+        await chart.destroyChart();
        addLoader();
        currentAggregateSelection = newAggregate;
    }
-    pullChartData().then(populateChart);
+    await pullChartData();
 }

-function urlBuilder() {
-    let url = "https://data.wowtoken.app/token/history/";
-    if (currentAggregateSelection !== 'none') {
-        url += `${currentAggregateSelection}/`
+function toggleAdvancedSetting() {
+    let element = document.getElementById('advanced-options')
+    if (document.getElementById('enable-advanced').checked)
+    {
+        element.style.display = 'flex';
    }
-    url += `${currentRegionSelection}/${currentTimeSelection}.json`
-    return url;
+    else
+    {
+        element.style.display = 'none';
+    }
+}
+
+function toggleStartYAtZero(){
+    startYAtZero = document.getElementById('y-start').checked;
+    chart.toggleYStart(startYAtZero);
+}
+
+async function toggleOverlay() {
+    await chart.destroyChart();
+    addLoader();
+    await pullChartData();
 }

 async function pullChartData() {
-    let resp = await fetch(urlBuilder());
-    let chartData = await resp.json();
-    let newChartJSData = [];
-    for (let i = 0; i < chartData.length; i++) {
-        let datum = {
-            x: chartData[i]['time'],
-            y: chartData[i]['value']
-        };
-        newChartJSData.push(datum);
+    let timeSelection = currentTimeSelection;
+    if (isOverlaySelected()) {
+        let timeDigits = parseInt(timeSelection.slice(0, timeSelection.length - 1)) * 2;
+        let timeUnit = timeSelection.slice(timeSelection.length - 1);
+        timeSelection = `${timeDigits}${timeUnit}`;
+    }
+    chartData[currentRegionSelection] = await fetchData(currentRegionSelection, timeSelection, currentAggregateSelection);
+    if (!chart.active()) {
+        await chart.createChart(currentRegionSelection, currentTimeSelection, startYAtZero, chartData[currentRegionSelection]);
+    }
+    else {
+        for (let i = 0; i < chartData[currentRegionSelection].length; i++) {
+            await chart.addDataToChart(chartData[currentRegionSelection][i]);
+        }
+        console.warn("This should never hit, and should be okay to remove");
    }
-    chartJsData = newChartJSData;
    removeLoader();
 }

 function formatToken() {
-    $("#token").html(currentPriceHash[currentRegionSelection].toLocaleString());
+    document.getElementById("token").innerText = currentPriceHash[currentRegionSelection].toLocaleString();
 }

 // TODO: These maybe able to be collapsed into a single function with params or a lambda
@ -211,7 +156,7 @@ function detectRegionQuery(urlSearchParams) {
            }
        }
    } else {
-        console.log("An incorrect or malformed region selection was made in the query string");
+        console.warn("An incorrect or malformed region selection was made in the query string");
    }
 }

@ -222,30 +167,57 @@ function detectTimeQuery(urlSearchParams) {
    const validTimes = ['72h', '168h', '336h', '720h', '30d', '2190h', '90d', '1y', '2y', '6m', 'all'];
    if (validTimes.includes(urlSearchParams.get('time').toLowerCase())) {
        currentTimeSelection = urlSearchParams.get('time').toLowerCase();
+        if (currentTimeSelection === 'all') {
+            forceOverlayOff();
+        }
        let timeDDL = document.getElementById('time');
        for (let i = 0; i < timeDDL.options.length; i++) {
            if (timeDDL.options[i].value === currentTimeSelection) {
                timeDDL.options[i].selected = true;
            }
        }
+        updateHighTime();
+        updateLowTime();
    } else {
-        console.log("An incorrect or malformed time selection was made in the query string");
+        console.warn("An incorrect or malformed time selection was made in the query string");
    }
 }

 function detectAggregateQuery(urlSearchParams) {
-    const validOperations = ['none', 'daily_max', 'daily_min', 'daily_mean', 'weekly_max', 'weekly_min', 'weekly_mean'];
+    const validOperations = ['none', 'daily_mean', 'avg'];
    if (validOperations.includes(urlSearchParams.get('aggregate').toLowerCase())) {
        currentAggregateSelection = urlSearchParams.get('aggregate').toLowerCase();
+        // For backwards compatibility
+        if (currentAggregateSelection === 'daily_mean') {
+            currentAggregateSelection = 'avg';
+        }
        let aggregateDDL = document.getElementById('aggregate');
        for (let i = 0; i < aggregateDDL.options.length; i++) {
            if (aggregateDDL.options[i].value === currentAggregateSelection) {
                aggregateDDL.options[i].selected = true;
            }
        }
-        aggregateFunctionToggle();
    } else {
-        console.log("An incorrect or malformed aggregate selection was made in the query string");
+        console.warn("An incorrect or malformed aggregate selection was made in the query string");
+    }
+}
+
+function detectZeroQuery(urlSearchParams) {
+    startYAtZero = urlSearchParams.get('startAtZero') === 'true';
+    let advOptions = document.getElementById('enable-advanced');
+    let startAtZeroOption = document.getElementById('y-start');
+    advOptions.checked = startYAtZero;
+    startAtZeroOption.checked = startYAtZero;
+    toggleAdvancedSetting();
+    toggleStartYAtZero();
+}
+
+function detectOverlayQuery(urlSearchParams) {
+    const enableOverlay = urlSearchParams.get('overlay') === 'previous_time';
+    if (enableOverlay) {
+        forceOverlayOn();
+    } else {
+        forceOverlayOff();
    }
 }

@ -260,10 +232,16 @@ function detectURLQuery() {
    if (urlSearchParams.has('aggregate')) {
        detectAggregateQuery(urlSearchParams);
    }
+    if (urlSearchParams.has('startAtZero')) {
+        detectZeroQuery(urlSearchParams)
+    }
+    if (urlSearchParams.has('overlay')) {
+        detectOverlayQuery(urlSearchParams);
+    }
 }

 function buildDeepLinksURL() {
-    let url = "https://wowtoken.app/?"
+    let url = "https://classic.wowtoken.app/?"
    if (currentTimeSelection !== '72h'){
        url += `time=${currentTimeSelection}&`
    }
@ -271,7 +249,13 @@ function buildDeepLinksURL() {
        url += `region=${currentRegionSelection}&`
    }
    if (currentAggregateSelection !== '' && currentAggregateSelection !== 'none'){
-        url += `aggregate=${currentAggregateSelection}`
+        url += `aggregate=${currentAggregateSelection}&`
+    }
+    if (startYAtZero !== false){
+        url += `startAtZero=${startYAtZero}&`
+    }
+    if (isOverlaySelected()){
+        url += `overlay=previous_time&`
    }
    return url
 }
@ -293,7 +277,36 @@ function toolTipMouseOut() {
    tooltip.innerHTML = "Copy to clipboard";
 }

-$(document).ready(function() {
+function registerEventHandles() {
+    registerCopyHandlers();
+    registerOptionHandlers();
+    registerAdvancedHandlers();
+}
+
+// TODO: These need to be moved out into probably tokenChart if not other files
+
+function registerAdvancedHandlers() {
+    document.getElementById('enable-advanced').addEventListener('change', () => {
+        toggleAdvancedSetting();
+    })
+    document.getElementById('y-start').addEventListener('change', () => {
+        toggleStartYAtZero();
+    })
+    document.getElementById('period-overlay').addEventListener('change', () => {
+        toggleOverlay();
+    })
+}
+
+function registerCopyHandlers() {
+    document.getElementById('copyURLButton').addEventListener('click', function () {
+        copyURL();
+    })
+    document.getElementById('copyURLButton').addEventListener('mouseout', function () {
+        toolTipMouseOut();
+    })
+}
+
+function registerOptionHandlers() {
    document.getElementById('region').addEventListener('change', function() {
        updateRegionPreference(this.value);
    });
@ -305,15 +318,17 @@ $(document).ready(function() {
    document.getElementById('aggregate').addEventListener('change', function () {
        updateAggregatePreference(this.value);
    })
-    document.getElementById('copyURLButton').addEventListener('click', function (event) {
-        copyURL();
-    })
-    document.getElementById('copyURLButton').addEventListener('mouseout', function (event) {
-        toolTipMouseOut();
-    })
    currentAggregateSelection = document.getElementById('aggregate').value;
-    detectURLQuery();
-    Promise.all([callUpdateURL(), pullChartData()]).then(populateChart)
-    setInterval(callUpdateURL, 60*1000);
-});
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+    registerEventHandles();
+    detectURLQuery();
+    chart = new TokenChart();
+    Promise.all([
+        callUpdateURL(),
+    ]).then(pullChartData);
+
+    setInterval(callUpdateURL, 60*1000);
+}, false);

--- a/src/loader.js
+++ b/src/loader.js
@ -0,0 +1,22 @@
+function addLoader() {
+    let loader = document.getElementById('loader');
+    if (!loader) {
+        const blank_div = document.createElement('div');
+        let loaderNode = blank_div.cloneNode();
+        loaderNode.id = 'loader';
+        loaderNode.className = 'lds-ripple';
+        loaderNode.appendChild(blank_div.cloneNode());
+        loaderNode.appendChild(blank_div.cloneNode());
+        let chartNode = document.getElementById('token-chart');
+        chartNode.before(loaderNode);
+    }
+}
+
+function removeLoader () {
+    let loader = document.getElementById('loader');
+    if (loader) {
+        loader.remove();
+    }
+}
+
+export {addLoader, removeLoader};
--- a/src/lowTime.js
+++ b/src/lowTime.js
@ -0,0 +1,17 @@
+import Datum from "./datum";
+
+function updateLowTime() {
+    const lowTime= document.getElementById("low-time");
+
+    const currentTime = document.getElementById("time").selectedOptions[0].innerText;
+    if (currentTime.toLowerCase() !== lowTime.innerText) {
+        lowTime.innerText = currentTime.toLowerCase();
+    }
+}
+
+function updateLowVal(datum) {
+    const lowVal = document.getElementById("low-val");
+    lowVal.innerHTML = datum.getPrice().toLocaleString();
+}
+
+export {updateLowTime, updateLowVal};
--- a/src/overlay.js
+++ b/src/overlay.js
@ -0,0 +1,40 @@
+function isOverlaySelected() {
+    return document.getElementById('period-overlay').checked;
+}
+
+function getOverlayTime() {
+    return document.getElementById("time").selectedOptions[0].innerText;
+}
+
+function setOverlayLabelTime() {
+    const currentTime = document.getElementById("time").selectedOptions[0].innerText;
+    let overlayTimeLabel = document.getElementById("period-time");
+    overlayTimeLabel.innerText = currentTime.toLocaleString();
+}
+
+function forceOverlayOff(){
+    const overlaySetting = document.getElementById("period-overlay");
+    const periodOverlayField = document.getElementById("period-overlay-options");
+    overlaySetting.checked = false;
+    periodOverlayField.style.display = 'none';
+}
+
+function forceOverlayOn(){
+    const overlaySetting = document.getElementById("period-overlay");
+    const periodOverlayField = document.getElementById("period-overlay-options");
+    const advancedOptionsField = document.getElementById("advanced-options");
+    overlaySetting.checked = true;
+    advancedOptionsField.style.display = 'flex';
+    periodOverlayField.style.display = 'flex';
+}
+
+function isOverlayAllowed(timeSelection) {
+    return !(timeSelection === "all")
+}
+
+function allowOverlay(){
+    const periodOverlayField = document.getElementById("period-overlay-options");
+    periodOverlayField.style.display = 'flex';
+}
+
+export {isOverlaySelected, getOverlayTime, setOverlayLabelTime, forceOverlayOff, forceOverlayOn, isOverlayAllowed, allowOverlay};
--- a/src/style.css
+++ b/src/style.css
@ -137,9 +137,6 @@ input[type="radio"] {
    padding: 0;
 }
 input[type="search"] {
-    -webkit-appearance: textfield;
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box;
    box-sizing: content-box;
 }
 input[type="search"]::-webkit-search-cancel-button,
@ -176,8 +173,8 @@ h6 {
    font-weight: 700;
 }
 html {
-    background-color: #073642;
-    color: #839496;
+    background-color: #6b4233;
+    color: #b7b7b7;
    margin: 1em;
 }
 /*body {
@ -197,7 +194,7 @@ a:hover {
    color: #cb4b16;
 }
 h1 {
-    color: #d33682;
+    color: #ffd5e9;
 }
 h2,
 h3,
@ -209,7 +206,7 @@ h6 {
 pre {
    background-color: #002b36;
    color: #839496;
-    border: 1pt solid #586e75;
+    border: 1pt solid #000000;
    padding: 1em;
    box-shadow: 5pt 5pt 8pt #073642;
 }
@ -304,10 +301,10 @@ h6 {
    display: flex;
    flex-direction: column;
    justify-content: center;
-    background-color: #002b36;
+    background-color: #2f201e;
    margin: 0 auto;
    max-width: 85%;
-    border: 1pt solid #586e75;
+    border: 1pt solid #000000;
    padding: 1em;
 }

@ -318,15 +315,34 @@ h6 {
    line-height: 75px;
    font-size: 30px;
 }
+.adv-options-container {
+    display: flex;
+    padding: 20px;
+    flex-flow: row wrap;
+    align-items: center;
+    justify-content: space-around;
+}
+.box > div {
+    border: solid #bfbdbf;
+    border-radius: 40px;
+    padding: 20px;
+    margin: 20px;
+    width: 200px;
+    height: 200px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+}
 p {
-    margin: 0px;
-    padding: 0px;
+    margin: 0;
+    padding: 0;
    line-height: 3em;
 }

 details {
-    background-color: #073642;
-    border: 1px solid #aaa;
+    background-color: #6b4233;
+    border: 1px solid #000000;
    border-radius: 4px;
    padding: 0.5em 0.5em 0;
    font-size: 17px;
@ -347,12 +363,27 @@ details[open] {
 }

 details[open] summary {
-    border-bottom: 1px solid #aaa;
+    border-bottom: 1px solid #000000;
    margin-bottom: 0.5em;
 }

+
 #option_select {
    font-size: 20px;
+    line-height: 40px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    align-content: center;
+}
+
+#option_select > div {
+    padding: 10px;
+}
+
+#option_select > fieldset {
+    padding-bottom: 20px;
+    max-width: fit-content;
 }

 #token {
@ -378,6 +409,42 @@ details[open] summary {
    flex-direction: column;
 }

+#advanced-options {
+    display: none;
+    flex-direction: column;
+    align-items: center;
+    align-content: center;
+}
+
+#advanced-options > fieldset {
+    margin: 10px;
+}
+
+.other-projects {
+    border: 1px solid silver;
+    margin-bottom: 10px;
+    font-size: 15px;
+}
+
+.other-projects > p {
+    line-height: 1em;
+}
+
+.data-header h1 {
+    margin-top: 24px;
+    margin-bottom: 24px;
+}
+
+.high-low {
+    display: flex;
+    justify-content: space-evenly;
+}
+
+.high-low p {
+    line-height: 1em;
+    font-size: 24px;
+}
+
 .lds-ripple {
    position: relative;
    align-self: center;
@ -456,8 +523,8 @@ details[open] summary {
        opacity: 1;
    }
    100% {
-        top: 0px;
-        left: 0px;
+        top: 0;
+        left: 0;
        width: 72px;
        height: 72px;
        opacity: 0;
--- a/src/tokenChart.js
+++ b/src/tokenChart.js
@ -0,0 +1,311 @@
+import {
+    Chart,
+    Legend,
+    LinearScale,
+    LineController,
+    LineElement,
+    PointElement,
+    TimeSeriesScale,
+    Title,
+    Tooltip
+} from 'chart.js';
+import 'chartjs-adapter-dayjs-4';
+
+Chart.register(
+    LineElement,
+    PointElement,
+    LineController,
+    LinearScale,
+    TimeSeriesScale,
+    Legend,
+    Title,
+    Tooltip
+)
+
+import {updateHighVal} from "./highTime";
+import {updateLowVal} from "./lowTime";
+import {isOverlaySelected, getOverlayTime, setOverlayLabelTime} from "./overlay";
+import Datum from "./datum";
+
+function lookupTimeUnit(query){
+    const lookup = {
+        'h': 'day',
+        'd': 'week',
+        'm': 'month',
+        'y': 'month',
+        'l': 'year'
+    }
+    return lookup[query.charAt(query.length - 1)]
+}
+
+function timeDeltaInMilliseconds(time) {
+    let timeDigits = (parseInt(time.slice(0, time.length - 1))).toFixed(0);
+    let timeUnit = time.slice(time.length - 1);
+
+    switch (timeUnit) {
+        case 'h':
+            return timeDigits * (60 * 60) * 1000;
+        case 'd':
+            return timeDigits * (24 * 60 * 60) * 1000;
+        case 'm':
+            return (timeDigits * (30.437 * 24 * 60 * 60)).toFixed(0) * 1000;
+        case 'y':
+            return (timeDigits * (365.25 * 24 * 60 * 60)).toFixed(0) * 1000;
+        case 'l':
+            console.warn("This path should not happen, this warning is an error in logic")
+    }
+}
+
+export default class TokenChart {
+    constructor() {
+        this._context = document.getElementById("token-chart").getContext('2d');
+        this._chartActive = false;
+        this._lastDatum = null;
+        this._highDatum = null;
+        this._lowDatum = null;
+        this._lateUpdate = false;
+    }
+
+    get highDatum() {
+        return this._highDatum;
+    }
+
+    get lowDatum() {
+        return this._lowDatum;
+    }
+
+    async #newChart(chartConfig) {
+        this._chart = new Chart(this._context, chartConfig);
+    }
+
+    async #updateHighLow(datum) {
+        if (this._highDatum === null) {
+            this._highDatum = new Datum(datum.getTime(), 0);
+            this._lowDatum = datum;
+            return;
+        }
+        if (datum.getPrice() > this._highDatum.getPrice()) {
+            this._highDatum = datum;
+            updateHighVal(this.highDatum);
+        }
+        else if (datum.getPrice() < this._lowDatum.getPrice()) {
+            this._lowDatum = datum;
+            updateLowVal(this.lowDatum);
+        }
+    }
+
+    async #createOverlayChart(region, time, yLevel, data){
+        const chartData = [];
+        const overlayData = [];
+        const overlayDelta = timeDeltaInMilliseconds(time);
+
+        for (let i = 0; i < data.length; i++) {
+            const originalDate = data[i].getX();
+            if (i < (data.length / 2)) {
+                overlayData.push({
+                    x: new Date(originalDate.getTime() + overlayDelta),
+                    y: data[i].getY(),
+                });
+            }
+            else {
+                await this.#updateHighLow(data[i]);
+
+                chartData.push({
+                    x: data[i].getX(),
+                    y: data[i].getY(),
+                })
+            }
+        }
+
+        const chartConfig = {
+            type: 'line',
+            data: {
+                datasets: [
+                    {
+                        borderColor: 'gold',
+                        label: region.toUpperCase() + " WoW Token Price",
+                        data: chartData,
+                        cubicInterpolationMode: 'monotone',
+                        pointRadius: 0
+                    },
+                    {
+                        borderColor: 'red',
+                        label: `Previous ${getOverlayTime()} ${region.toUpperCase()} WoW Token Price`,
+                        data: overlayData,
+                        cubicInterpolationMode: 'monotone',
+                        pointRadius: 0
+                    }
+                ]
+            },
+            options: {
+                interaction: {
+                    intersect: false,
+                    mode: "index"
+                },
+                scales: {
+                    x: {
+                        type: 'time',
+                        grid: {
+                            color: '#625f62',
+                        },
+                        ticks: {
+                            color: '#a7a4ab',
+                            font: {
+                                size: 18,
+                            }
+                        },
+                        time: {
+                            unit: lookupTimeUnit(time)
+                        }
+                    },
+                    y: {
+                        beginAtZero: yLevel,
+                        grid: {
+                            color: '#2f2c2f',
+                        },
+                        ticks: {
+                            color: '#a7a4ab',
+                            font: {
+                                size: 18,
+                            }
+                        }
+                    }
+                },
+            }
+        }
+
+        await this.#newChart(chartConfig)
+    }
+
+    async #createNormalChart(region, time, yLevel, data) {
+        const chartData = [];
+
+
+        for (let i = 0; i < data.length; i++) {
+            this._lastDatum = data[i];
+            await this.#updateHighLow(data[i]);
+
+            chartData.push({
+                x: data[i].getX(),
+                y: data[i].getY(),
+            })
+        }
+
+        const chartConfig = {
+            type: 'line',
+            data: {
+                datasets: [{
+                    borderColor: 'gold',
+                    label: region.toUpperCase() + " WoW Token Price",
+                    data: chartData,
+                    cubicInterpolationMode: 'monotone',
+                    pointRadius: 0
+                }]
+            },
+            options: {
+                interaction: {
+                    intersect: false,
+                    mode: "index"
+                },
+                scales: {
+                    x: {
+                        type: 'time',
+                        grid: {
+                            color: '#625f62',
+                        },
+                        ticks: {
+                            color: '#a7a4ab',
+                            font: {
+                                size: 18,
+                            }
+                        },
+                        time: {
+                            unit: lookupTimeUnit(time)
+                        }
+                    },
+                    y: {
+                        beginAtZero: yLevel,
+                        grid: {
+                            color: '#2f2c2f',
+                        },
+                        ticks: {
+                            color: '#a7a4ab',
+                            font: {
+                                size: 18,
+                            }
+                        }
+                    }
+                },
+            }
+        }
+
+        await this.#newChart(chartConfig)
+    }
+
+    async createChart(region, time, yLevel, data) {
+        let lateUpdateData = this._lastDatum;
+
+        if (isOverlaySelected()) {
+            await this.#createOverlayChart(region, time, yLevel, data)
+        }
+        else {
+            await this.#createNormalChart(region, time, yLevel, data)
+        }
+
+        setOverlayLabelTime();
+
+        updateHighVal(this.highDatum);
+        updateLowVal(this.lowDatum);
+
+        if (this._lateUpdate) {
+            if (this._lastDatum.getPrice() !== lateUpdateData.getPrice() &&
+                this._lastDatum.getTime() < lateUpdateData.getTime()) {
+                await this.addDataToChart(lateUpdateData);
+            }
+            this._lateUpdate = false
+        }
+
+        this._chartActive = true;
+    }
+
+    async destroyChart() {
+        await this._chart.destroy();
+        this._chartActive = false;
+        this._lastDatum = null;
+        this._highDatum = null;
+        this._lowDatum = null;
+        this._lateUpdate = false;
+    }
+
+    async lateUpdate(datum){
+        this._lastDatum = datum;
+        this._lateUpdate = true;
+    }
+
+    async addDataToChart(datum) {
+        this._lastDatum = datum;
+        if (datum.getPrice() > this._highDatum.getPrice()) {
+            this._highDatum = datum;
+            updateHighVal(this.highDatum);
+        }
+        else if (datum.getPrice() < this._lowDatum.getPrice()) {
+            this._lowDatum = datum;
+            updateLowVal(this.lowDatum);
+        }
+        this._chart.data.datasets[0].data.push({
+            x: datum.getX(),
+            y: datum.getY(),
+        });
+        this._chart.update();
+    }
+
+    active() {
+        return this._chartActive;
+    }
+
+    toggleYStart(startYAtZero) {
+        this._chart.options.scales.y.beginAtZero = startYAtZero;
+        this._chart.update();
+    }
+
+}
--- a/src/urlBuilder.js
+++ b/src/urlBuilder.js
@ -0,0 +1,12 @@
+export default function urlBuilder(currentRegionSelection, currentTimeSelection, currentAggregateSelection) {
+    let url = "https://data.wowtoken.app/v2/";
+    if (currentAggregateSelection !== '' && currentAggregateSelection !== 'none'){
+        url += `math/${currentAggregateSelection}/classic/`
+    }
+    else {
+        url += `relative/classic/`
+    }
+
+    url += `${currentRegionSelection}/${currentTimeSelection}.json`;
+    return url;
+}
Author	SHA1	Message	Date
Emily Doherty	ac61fe47ca	Update bot project name to be a little less generic (cherry picked from commit `24d424bd90`)	2024-12-09 19:27:17 -08:00
Emily Doherty	be4b84ee75	Link to the new TokenBot project (cherry picked from commit `1345b984d4`)	2024-12-08 20:22:38 -08:00
Emily Doherty	bc44d4fe35	Some cherry pick damage fixes I didnt notice in merge conflicts	2024-12-02 04:24:24 -08:00
Emily Doherty	b6b30df542	Add option to generate overlay URL This is going to be expanded upon in future releases, for now it's hardcoded to use just the previous time overlay (cherry picked from commit `14b80dfea6`)	2024-12-01 18:27:42 -08:00
Emily Doherty	69b6409699	Fix live token price updates (cherry picked from commit `24928c10fa`)	2024-12-01 18:27:40 -08:00
Emily Doherty	1b026d0757	Update README to link to backend lambda src (cherry picked from commit `df7e5c0e97`)	2024-12-01 18:27:38 -08:00
Emily Doherty	a38a118473	Initial implementation of overlay functionality (cherry picked from commit `d25334d35f`)	2024-12-01 18:27:31 -08:00
Emily Doherty	9f7ab723a9	Add backwards compatibility for average changes (cherry picked from commit `8c8499fb1c`)	2024-12-01 18:27:20 -08:00
Emily Doherty	fa009b48b5	Swap to v2 of the historical api (cherry picked from commit `0180e8a3b5`)	2024-12-01 18:27:15 -08:00
Emily Doherty	7eaedf0f9a	Swap to v2 of current API (cherry picked from commit `fa058cc64e`)	2024-12-01 18:23:30 -08:00
Emily Doherty	5f9e3462ae	Fix live prices being added to the chart with incorrect price (cherry picked from commit `ef95388185`)	2024-12-01 18:19:04 -08:00
Emily Doherty	13ed6dfdce	Dependency updates (cherry picked from commit `ad069cb7bf`)	2024-10-21 19:59:39 -07:00
Emily Doherty	b8d11b3815	Remove unused aggregate function toggle (cherry picked from commit `367b767f52`)	2024-10-21 19:59:34 -07:00
Emily Doherty	2e020633b5	Flip high and low sections This is more in line with how English reads, left to right, low to high (cherry picked from commit `c9e14e265f`)	2024-10-21 19:59:29 -07:00
Emily Doherty	d07eec1cf0	Adds a high and low price data callout (cherry picked from commit `5abf6fe132`)	2024-10-21 19:59:14 -07:00
Emily Doherty	de6621e81c	Fix late updates to chart (cherry picked from commit `487bb86a29`)	2024-10-21 19:56:51 -07:00
Emily Doherty	7a17bb8821	Start the process of splitting JS files I am a JS noob so this is probably poorly thought out. But it is a wip and I dont really care about the quality, just more the learning experience. (cherry picked from commit `a51d3f8d7b`)	2024-10-21 19:53:52 -07:00
Emily Doherty	f207e36ccd	Remove advanced region options for now. It may come back later, but it's kinda confusing just being disabled (cherry picked from commit `27eb2ccb45`)	2024-10-21 19:48:19 -07:00
Emily Doherty	9ac97425c7	Make time and cost delineation more apparent (cherry picked from commit `1e0b4a0a1f`)	2024-04-25 00:18:47 -07:00
Emily Doherty	f7a27f9350	Enabled the option to start Y at zero (cherry picked from commit `17ffbc3db1`)	2024-04-24 23:54:53 -07:00
Emily Doherty	4c77828d5a	Adjust all legend for classic since there is less data	2024-04-12 05:29:54 -07:00
Emily Doherty	50787c1d83	Change the timescale legend to be more readable instead of dense (cherry picked from commit `0c9e7ed183`)	2024-04-12 05:28:30 -07:00
Emily Doherty	09ec5f0d4d	Change logs to warnings, since that's what they really are (cherry picked from commit `4a7c03307d`)	2024-04-12 05:08:39 -07:00
Emily Doherty	36ba83d9be	Increase font size and brightness for better contrast (cherry picked from commit `0e40f403e4`)	2024-04-12 05:08:34 -07:00
Emily Doherty	8f6cbbc75d	Fix bad merge from cherry-pick of main	2023-10-15 01:35:26 -07:00
Emily Doherty	354381936d	Changes to advanced options and styling in prep for future work	2023-10-15 01:27:40 -07:00
Emily Doherty	214910aa25	Remove Cash dependency, refactor event registration (cherry picked from commit `8cd9a2ddeb`)	2023-10-15 01:19:47 -07:00
Emily Doherty	ac12a9c55d	Update dependencies (cherry picked from commit `702ca8c4d3`)	2023-10-15 01:18:30 -07:00
Emily Doherty	fa21b50b28	Remove weekly aggregation options for now	2023-06-05 19:46:47 -07:00
Emily Doherty	ae789181f4	Enable 1 month	2023-06-05 19:17:10 -07:00
Emily Doherty	a1b1dc63ff	Remove extraneous time selections, enable 14d	2023-05-30 03:49:54 -07:00
Emily Doherty	249f9e281f	Textual updates	2023-05-23 19:14:30 -07:00
Emily Doherty	bda9edf3df	Bump node version	2023-05-23 18:27:53 -07:00
Emily Doherty	e090a93605	Initial branch and changes for Classic token	2023-05-23 18:19:06 -07:00