From bb456a9afaafc0f6f596898b3772c86f2562fcde Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sun, 30 Oct 2022 21:24:41 +1300 Subject: [PATCH] Thumbnail doubles up as secondary loader; Webpack dev server as primary dev stack, dynamic base_href to accommodate --- .github/workflows/ci.yml | 2 +- build_tools/build.js | 1 - package.json | 10 +- src/index.html | 227 ++++++++++++++++--------------- src/js/components/Thumbnail.js | 2 +- src/scss/components/_images.scss | 4 +- webpack.config.js | 2 +- 7 files changed, 124 insertions(+), 124 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78ff3a7c..850b35b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: run: npm install - name: Build JS - run: npm run build:prod + run: npm run prod - name: Setup Python uses: actions/setup-python@v2 diff --git a/build_tools/build.js b/build_tools/build.js index e5a71f27..f8820582 100755 --- a/build_tools/build.js +++ b/build_tools/build.js @@ -13,7 +13,6 @@ var path = require('path'); var rimraf = require('rimraf'); var copydir = require('copy-dir'); var copyfile = require('fs-copy-file'); - var version = fs.readFileSync("IRIS_VERSION", "utf8"); version = version.replace(/\r?\n?/g, '').trim(); var build = Math.floor(Date.now() / 1000); diff --git a/package.json b/package.json index d49ad4fc..1d21a04a 100644 --- a/package.json +++ b/package.json @@ -95,14 +95,12 @@ "scripts": { "test": "jest", "tox": "sudo docker exec -it -u root iris_mopidy_1 bash -c \"cd /iris && tox\"", - "start": "node build_tools/build.js && NODE_ENV=development webpack-dev-server", + "start": "NODE_ENV=development webpack-dev-server", "lint": "eslint src", "lint:fix": "eslint src --fix", - "watch:dev": "node build_tools/build.js && NODE_ENV=development webpack --watch", - "watch:prod": "node build_tools/build.js && NODE_ENV=production webpack --watch", - "build:tools": "node build_tools/build.js", - "build:dev": "node build_tools/build.js && NODE_ENV=development webpack", - "build:prod": "node build_tools/build.js && NODE_ENV=development webpack && NODE_ENV=production webpack", + "build": "node build_tools/build.js", + "dev": "node build_tools/build.js && NODE_ENV=development webpack", + "prod": "node build_tools/build.js && NODE_ENV=development webpack && NODE_ENV=production webpack", "release": "node build_tools/build.js && NODE_ENV=development webpack && NODE_ENV=production webpack && python setup.py sdist upload -r pypi && build_tools/release.sh" } } diff --git a/src/index.html b/src/index.html index 77c25947..695c30ce 100755 --- a/src/index.html +++ b/src/index.html @@ -1,118 +1,123 @@ - - - Iris - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+ +
+ +
+
+
+
+
+
- - - - - diff --git a/src/js/components/Thumbnail.js b/src/js/components/Thumbnail.js index 2d9f7eb6..376f3bc7 100755 --- a/src/js/components/Thumbnail.js +++ b/src/js/components/Thumbnail.js @@ -84,7 +84,7 @@ export default memo((props) => { style={{ backgroundImage: `url("${image}")` }} /> )} - + {loading && }
{props.canZoom && image && (