From eb05bbb74eab1c7ba7d0fa1b636ddd06ba34143f Mon Sep 17 00:00:00 2001 From: Iain Collins Date: Sun, 11 Feb 2024 15:55:28 +0000 Subject: [PATCH] Improve about dialog and download pages --- .github/workflows/deploy-production.yml | 7 ++++ components/dialog/about-dialog.js | 21 +++++------ package.json | 2 +- pages/downloads.js | 47 ++++++++++++++----------- 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 70e7478..ae072b1 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -1,6 +1,7 @@ name: Deploy Ardent Website to Production # ABOUT +# # This deployment script assumes the following are configured in GitHub actions: # # SSH_PRIVATE_KEY [secret] @@ -12,6 +13,12 @@ name: Deploy Ardent Website to Production # * DEPLOY_DIR should be an absolute path. # * SERVICE_NAME should match the name of the repository in GitHub. # +# This deployment script differs slightly from the other ardent deployment +# scripts. Updating the service in place would cause Next.js runtime errors +# during the build step. To avoid that, instead of simply updating the project +# and restarting it, it creates a copy of the current deployment, updates that +# copy and then swaps directories and restarts the service. +# # SETUP # # This script assumes that Node.js is installed, that "pm2" is installed diff --git a/components/dialog/about-dialog.js b/components/dialog/about-dialog.js index cbab427..acb606f 100644 --- a/components/dialog/about-dialog.js +++ b/components/dialog/about-dialog.js @@ -40,33 +40,30 @@ export default ({ toggle }) => {

}

- Uses data submitted to EDDN, which is run by EDCD. + Data from EDDN, which is run by EDCD.

Downloads

@@ -79,7 +76,7 @@ export default ({ toggle }) => { | Ardent Collector | - Downloads + Data Downloads

diff --git a/package.json b/package.json index 2cc2c6f..0cc4368 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ardent-www", - "version": "0.38.8", + "version": "0.38.9", "description": "Ardent Industry", "main": "index.js", "scripts": { diff --git a/pages/downloads.js b/pages/downloads.js index 4f39d25..8b88b4c 100644 --- a/pages/downloads.js +++ b/pages/downloads.js @@ -17,69 +17,76 @@ export default () => {

- Downloads + Data Downloads

- Bulk exports of data from Ardent Industry in SQLite databases. + Bulk exports of data from Ardent Industry as SQLite databases.

- Sources include EDDB, ESDM, Spansh and EDDN. + Sources used to seed the data include EDDB, ESDM, Spansh and EDDN.

- Last updated on {backupData?.completed?.replace(/\.(.*)/, '')?.replace('T', ' at ')?.replace(/$/, ' UTC') ?? '...'} + Last updated {backupData?.completed?.replace(/\.(.*)/, '')?.replace('T', ' @ ')?.replace(/$/, ' UTC') ?? '...'}

systems.db

+

+ Name and location of all solar systems in the galaxy known to Ardent. +

Download systems.db {backupData &&
{backupData?.databases?.filter(db => db.name === 'systems.db')?.[0]?.tables?.systems?.toLocaleString()} systems -
{(backupData?.databases?.filter(db => db.name === 'systems.db')?.[0]?.size / 1000000000).toLocaleString(undefined, { maximumFractionDigits: 0 })} GB + {' | '} + Size: {(backupData?.databases?.filter(db => db.name === 'systems.db')?.[0]?.size / 1000000000).toLocaleString(undefined, { maximumFractionDigits: 0 })} GB }

-

- Name and location of all solar systems in the galaxy known to Ardent. -

+

trade.db

+

+ A list of all buy and sell commodity orders being tracked by Ardent. +

Download trade.db {backupData &&
{backupData?.databases?.filter(db => db.name === 'trade.db')?.[0]?.tables?.commodities?.toLocaleString()} commodities -
{(backupData?.databases?.filter(db => db.name === 'trade.db')?.[0]?.size / 1000000000).toLocaleString(undefined, { maximumFractionDigits: 0 })} GB + {' | '} + Size: {(backupData?.databases?.filter(db => db.name === 'trade.db')?.[0]?.size / 1000000000).toLocaleString(undefined, { maximumFractionDigits: 0 })} GB }

-

- A list of all buy/sell commodity orders being tracked by Ardent. -

+

stations.db

+

+ All stations, ports, outposts, settlements, megaships and fleet carriers known to Ardent. +

Download stations.db {backupData &&
{backupData?.databases?.filter(db => db.name === 'stations.db')?.[0]?.tables?.stations?.toLocaleString()} stations -
{(backupData?.databases?.filter(db => db.name === 'stations.db')?.[0]?.size / 1000000).toLocaleString(undefined, { maximumFractionDigits: 0 })} MB + {' | '} + Size: {(backupData?.databases?.filter(db => db.name === 'stations.db')?.[0]?.size / 1000000).toLocaleString(undefined, { maximumFractionDigits: 0 })} MB }

-

- All stations, ports, outposts, settlements, megaships and fleet carriers known to Ardent. -

+

locations.db

+

+ Points of interest Ardent has received telemetry for. +

Download locations.db {backupData &&
{backupData?.databases?.filter(db => db.name === 'locations.db')?.[0]?.tables?.locations?.toLocaleString()} locations -
{(backupData?.databases?.filter(db => db.name === 'locations.db')?.[0]?.size / 1000).toLocaleString(undefined, { maximumFractionDigits: 0 })} KB + {' | '} + Size: {(backupData?.databases?.filter(db => db.name === 'locations.db')?.[0]?.size / 1000).toLocaleString(undefined, { maximumFractionDigits: 0 })} KB }

-

- Points of interest which Ardent has received telemetry for. -

)