From 3e27a504d7a7590feaf1acb358a88fa553a226d8 Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Tue, 19 Sep 2023 09:27:14 -0700 Subject: [PATCH 1/6] fix asset resizing issue --- src/styles/components/_information-interface.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/components/_information-interface.scss b/src/styles/components/_information-interface.scss index b6cac2367..17391f22d 100644 --- a/src/styles/components/_information-interface.scss +++ b/src/styles/components/_information-interface.scss @@ -12,6 +12,7 @@ $asset-size-default: 17vh; align-items: center; &__frame { + width: 80%; max-width: 55rem; } From b2bbcfd6d649ff53e48720f6aa950945961a810b Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Tue, 19 Sep 2023 09:34:06 -0700 Subject: [PATCH 2/6] width 100% --- src/styles/components/_information-interface.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/components/_information-interface.scss b/src/styles/components/_information-interface.scss index 17391f22d..c8f4098fe 100644 --- a/src/styles/components/_information-interface.scss +++ b/src/styles/components/_information-interface.scss @@ -12,7 +12,7 @@ $asset-size-default: 17vh; align-items: center; &__frame { - width: 80%; + width: 100%; max-width: 55rem; } From 119609a2e4c53945e45f49193da2d3e839f86fa1 Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Tue, 19 Sep 2023 10:03:27 -0700 Subject: [PATCH 3/6] bump version --- config.xml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- public/package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.xml b/config.xml index 88a9a07db..18100a284 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Network Canvas Interviewer A tool for conducting Network Canvas Interviews. diff --git a/package-lock.json b/package-lock.json index fc5a1dc4f..52eec6d1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "network-canvas-interviewer", - "version": "6.5.0", + "version": "6.5.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "network-canvas-interviewer", - "version": "6.5.0", + "version": "6.5.1", "dependencies": { "@babel/runtime": "7.10.1", "archiver": "^4.0.1", diff --git a/package.json b/package.json index d7152b044..7233d4bc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "network-canvas-interviewer", - "version": "6.5.0", + "version": "6.5.1", "productName": "Network Canvas Interviewer", "description": "A tool for conducting Network Canvas Interviews.", "author": "Complex Data Collective", diff --git a/public/package.json b/public/package.json index 05b29c35e..7ab23555b 100644 --- a/public/package.json +++ b/public/package.json @@ -1,6 +1,6 @@ { "name": "network-canvas-interviewer", - "version": "6.5.0", + "version": "6.5.1", "productName": "Network Canvas Interviewer", "description": "A tool for conducting Network Canvas Interviews.", "author": "Complex Data Collective", From b3e5fcf927e6b794998828b7092b78f85d76ee64 Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Thu, 28 Sep 2023 14:58:00 -0700 Subject: [PATCH 4/6] fix action button still clickable after max reached --- src/containers/NodeForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/NodeForm.js b/src/containers/NodeForm.js index 9e0e3168f..b76682ae6 100644 --- a/src/containers/NodeForm.js +++ b/src/containers/NodeForm.js @@ -97,7 +97,7 @@ const NodeForm = (props) => { > setShow(true)} + onClick={() => !disabled && setShow(true)} icon={icon} title={`Add ${nodeType}...`} /> From 3b353ccb03f2178d7475d8dfe3d28e2b0fb43c89 Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Fri, 29 Sep 2023 12:47:28 -0700 Subject: [PATCH 5/6] bump codaco/ui to 5.8.5 --- package-lock.json | 14 +++++++------- package.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc5a1dc4f..3a1a68cbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "@babel/preset-react": "7.10.1", "@codaco/eslint-plugin-spellcheck": "0.0.14", "@codaco/shared-consts": "~0.0.1-alpha.3", - "@codaco/ui": "~5.8.3", + "@codaco/ui": "~5.8.5", "@electron/notarize": "~1.2.3", "@faker-js/faker": "~6.0.0-alpha.5", "@zippytech/sorty": "^2.0.0", @@ -1918,9 +1918,9 @@ "dev": true }, "node_modules/@codaco/ui": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/@codaco/ui/-/ui-5.8.3.tgz", - "integrity": "sha512-rRb9cwpO5STD8gcdyPyNzloHpKOU1zOcS7o/wnx5jpBlpVaX9bWuNQ2k2/p5gNFj+EnuXslnNcVFI8k4Om35dQ==", + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@codaco/ui/-/ui-5.8.5.tgz", + "integrity": "sha512-RyUjHE7Rscfk0RbYDbSUY0GUmWMz0aKbB3AITPBNKLqpJzLekpNkDZmQNn5w/X+pwbgJClWaZrDCQRLWbBeOSg==", "dev": true, "dependencies": { "@material-ui/core": "^4.11.3", @@ -37749,9 +37749,9 @@ "dev": true }, "@codaco/ui": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/@codaco/ui/-/ui-5.8.3.tgz", - "integrity": "sha512-rRb9cwpO5STD8gcdyPyNzloHpKOU1zOcS7o/wnx5jpBlpVaX9bWuNQ2k2/p5gNFj+EnuXslnNcVFI8k4Om35dQ==", + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@codaco/ui/-/ui-5.8.5.tgz", + "integrity": "sha512-RyUjHE7Rscfk0RbYDbSUY0GUmWMz0aKbB3AITPBNKLqpJzLekpNkDZmQNn5w/X+pwbgJClWaZrDCQRLWbBeOSg==", "dev": true, "requires": { "@material-ui/core": "^4.11.3", diff --git a/package.json b/package.json index d7152b044..a0a0c15ae 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@babel/preset-react": "7.10.1", "@codaco/eslint-plugin-spellcheck": "0.0.14", "@codaco/shared-consts": "~0.0.1-alpha.3", - "@codaco/ui": "~5.8.3", + "@codaco/ui": "~5.8.5", "@electron/notarize": "~1.2.3", "@faker-js/faker": "~6.0.0-alpha.5", "@zippytech/sorty": "^2.0.0", @@ -315,4 +315,4 @@ "cordova-plugin-ionic-keyboard": {} } } -} \ No newline at end of file +} From 05dd205a8bfe2dec5a58a3a1f6c6d1b6258895b5 Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Fri, 29 Sep 2023 12:55:12 -0700 Subject: [PATCH 6/6] remove checking for disabled in onclick bug is fixed in action button component in ui --- src/containers/NodeForm.js | 2 +- src/containers/QuickNodeForm.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/NodeForm.js b/src/containers/NodeForm.js index b76682ae6..9e0e3168f 100644 --- a/src/containers/NodeForm.js +++ b/src/containers/NodeForm.js @@ -97,7 +97,7 @@ const NodeForm = (props) => { > !disabled && setShow(true)} + onClick={() => setShow(true)} icon={icon} title={`Add ${nodeType}...`} /> diff --git a/src/containers/QuickNodeForm.js b/src/containers/QuickNodeForm.js index 9034d1f82..8ad7a72d6 100644 --- a/src/containers/QuickNodeForm.js +++ b/src/containers/QuickNodeForm.js @@ -185,7 +185,7 @@ const QuickAddForm = ({ > !disabled && setShowForm(true)} + onClick={() => setShowForm(true)} icon={icon} title={`Add ${nodeType}...`} />