Improve data loading behaviour

iaincollins · Sep 12, 2024 · a62727a · a62727a
1 parent b50d922
commit a62727a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/components/loader.js b/components/loader.js
@@ -36,7 +36,7 @@ export default function Loader ({ visible, text}) {
           <div className='loader__arrow loader__arrow--down loader__arrow--outer-9' />
         </div>
       </div>
-      {text && <div className='loader__text' style={{ opacity: visible ? 1 : 0 }}>{text}</div>}
+      {text && <div className='loader__text' style={{ opacity: visible ? 1 : 0 }}>{text}…</div>}
     </>
   )
 }

diff --git a/css/components/loading-bar.css b/css/components/loading-bar.css
@@ -19,10 +19,7 @@
 
 .loading-bar--tab {
   position: relative;
-  margin-left: .2rem;
-  height: 1.8rem;
-  top: -.3rem;
-  width: calc(100% - .4rem);
+  margin: 0;
 }
 
 @keyframes loadingBarAnimation {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ardent-www",
-  "version": "0.45.6",
+  "version": "0.45.7",
   "description": "Ardent Industry",
   "main": "index.js",
   "scripts": {

diff --git a/pages/commodities.js b/pages/commodities.js
@@ -27,7 +27,7 @@ export default () => {
   }, [])
 
   return (
-    <Layout loading={commodities === undefined} loadingText='Loading commodities…'>
+    <Layout loading={commodities === undefined} loadingText='Loading commodities'>
       <Head>
         <link rel='canonical' href='https://ardent-industry.com/commodities' />
       </Head>

diff --git a/pages/commodity/[commodity-name]/index.js b/pages/commodity/[commodity-name]/index.js
@@ -54,8 +54,7 @@ export default () => {
       c.rare = ((getAllCommodities().find(el => el.symbol.toLowerCase() === c.symbol))?.market_id)
       delete c.commodityId
       delete c.commodityName
-    })
-
+    })  
     setImports(imports)
 
     const exports = await getExports(commodityName)
@@ -109,7 +108,7 @@ export default () => {
   }, [])
 
   return (
-    <Layout loading={!commodity} loadingText={'Loading trade data…'}>
+    <Layout loading={!commodity} loadingText={'Loading trade data'}>
       <Head>
         <link rel='canonical' href={`https://ardent-industry.com/system/${commodity?.symbol}/${tabs[tabIndex]}`} />
       </Head>

diff --git a/pages/system/[system-name]/index.js b/pages/system/[system-name]/index.js
@@ -154,7 +154,7 @@ export default () => {
   }, [router.query['system-name']])
 
   return (
-    <Layout loading={system === undefined} loadingText='Loading system data…'>
+    <Layout loading={system === undefined} loadingText='Loading system data'>
       <Head>
         <link rel='canonical' href={`https://ardent-industry.com/system/${system?.systemName}/${tabs[tabIndex]}`} />
       </Head>