From a0d288057f5afe1ff6b6f48e488e9e26a13b9e39 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 28 Oct 2025 14:10:04 -0500 Subject: [PATCH 1/3] Add Docker Image build and Publish to workflow Adds docker:build and docker:publish npm scripts expects DOCKERID to contain the user/organization id for formatting the tag ( DOCKERID/hombrewery:version ) Add CircleCI test to ensure image still builds --- .circleci/config.yml | 3 +++ package.json | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb239ceb3..bcdf362ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,6 +88,9 @@ jobs: - run: name: Test - Content Negotiation command: npm run test:content-negotiation + - run: + name: Test - Build Docker image + command: DOCKERID=circliciTest npm run docker:build workflows: build_and_test: diff --git a/package.json b/package.json index 666832db8..37b362bc8 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,9 @@ "phb": "node --experimental-require-module scripts/phb.js", "prod": "set NODE_ENV=production && npm run build", "postinstall": "npm run build", - "start": "node --experimental-require-module server.js" + "start": "node --experimental-require-module server.js", + "docker:build": "docker build -t ${DOCKERID}/homebrewery:$npm_package_version .", + "docker:publish": "docker login && docker push ${DOCKERID}/homebrewery:$npm_package_version" }, "author": "stolksdorf", "license": "MIT", From bc41b9043d093dcb0968c37cd982228a95e60af8 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 28 Oct 2025 14:44:54 -0500 Subject: [PATCH 2/3] Remove circleci tests --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bcdf362ec..fb239ceb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,9 +88,6 @@ jobs: - run: name: Test - Content Negotiation command: npm run test:content-negotiation - - run: - name: Test - Build Docker image - command: DOCKERID=circliciTest npm run docker:build workflows: build_and_test: From c38cc77fd063ad12bdf58b40ae080c90293401cb Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Tue, 4 Nov 2025 12:52:12 -0600 Subject: [PATCH 3/3] Move SVG components to components folder Move the SVGs out of the `shared` directory, closer to where they are actually used. They are svg jsx files, setup as components, so i've moved them to the components directory. Deleted `combat.svg.jsx` because we don't use it anywhere. renamed the remaining two to be more descriptive of the image for additional clarity. --- .../homebrew.svg.jsx => client/components/svg/cauldron.svg.jsx | 0 .../components/svg/naturalcrit-d20.svg.jsx | 0 client/homebrew/pages/accountPage/accountPage.jsx | 2 +- shared/naturalcrit/nav/nav.jsx | 2 +- shared/naturalcrit/svg/combat.svg.jsx | 3 --- 5 files changed, 2 insertions(+), 5 deletions(-) rename shared/naturalcrit/svg/homebrew.svg.jsx => client/components/svg/cauldron.svg.jsx (100%) rename shared/naturalcrit/svg/naturalcrit.svg.jsx => client/components/svg/naturalcrit-d20.svg.jsx (100%) delete mode 100644 shared/naturalcrit/svg/combat.svg.jsx diff --git a/shared/naturalcrit/svg/homebrew.svg.jsx b/client/components/svg/cauldron.svg.jsx similarity index 100% rename from shared/naturalcrit/svg/homebrew.svg.jsx rename to client/components/svg/cauldron.svg.jsx diff --git a/shared/naturalcrit/svg/naturalcrit.svg.jsx b/client/components/svg/naturalcrit-d20.svg.jsx similarity index 100% rename from shared/naturalcrit/svg/naturalcrit.svg.jsx rename to client/components/svg/naturalcrit-d20.svg.jsx diff --git a/client/homebrew/pages/accountPage/accountPage.jsx b/client/homebrew/pages/accountPage/accountPage.jsx index b69eb6e3e..412cf7812 100644 --- a/client/homebrew/pages/accountPage/accountPage.jsx +++ b/client/homebrew/pages/accountPage/accountPage.jsx @@ -1,7 +1,7 @@ const React = require('react'); const moment = require('moment'); const UIPage = require('../basePages/uiPage/uiPage.jsx'); -const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx'); +const NaturalCritIcon = require('client/components/svg/naturalcrit-d20.svg.jsx'); let SAVEKEY = ''; diff --git a/shared/naturalcrit/nav/nav.jsx b/shared/naturalcrit/nav/nav.jsx index 50dff4c33..16f194716 100644 --- a/shared/naturalcrit/nav/nav.jsx +++ b/shared/naturalcrit/nav/nav.jsx @@ -5,7 +5,7 @@ const createClass = require('create-react-class'); const _ = require('lodash'); const cx = require('classnames'); -const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx'); +const NaturalCritIcon = require('client/components/svg/naturalcrit-d20.svg.jsx'); const Nav = { base : createClass({ diff --git a/shared/naturalcrit/svg/combat.svg.jsx b/shared/naturalcrit/svg/combat.svg.jsx deleted file mode 100644 index fc92b4df4..000000000 --- a/shared/naturalcrit/svg/combat.svg.jsx +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function(props){ - return ; -};