From ee67204ae336e5b602d53b133303d46989d2133f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 01:45:35 +0000 Subject: [PATCH 01/10] Bump safer-eval from 1.3.3 to 1.3.6 Bumps [safer-eval](https://github.com/commenthol/safer-eval) from 1.3.3 to 1.3.6. - [Release notes](https://github.com/commenthol/safer-eval/releases) - [Commits](https://github.com/commenthol/safer-eval/compare/v1.3.3...v1.3.6) Signed-off-by: dependabot[bot] --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3ae7f0f..8e38984 100644 --- a/yarn.lock +++ b/yarn.lock @@ -866,11 +866,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/socket.io-client@^1.4.32": - version "1.4.32" - resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14" - integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg== - "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -1092,6 +1087,11 @@ acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== +acorn@^6.0.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== + acorn@^6.0.1, acorn@^6.0.5: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" @@ -4616,6 +4616,11 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-loader@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" + integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w== + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -7149,9 +7154,9 @@ safe-regex@^1.1.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== safer-eval@^1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.3.tgz#0309e9fcc0609e66c1b599fd0d4772132b260ca8" - integrity sha512-j/qb0rtnwTp5V1D7nR0Ns/14HU8OiHPaoZNJhM+Lfmv1nbXZCXG9LHaVW157agEocdSVAeeRNddK/yuWfalzGQ== + version "1.3.6" + resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.6.tgz#ee51e3348c39fdc4117a47dfb4b69df56a2e40cf" + integrity sha512-DN9tBsZgtUOHODzSfO1nGCLhZtxc7Qq/d8/2SNxQZ9muYXZspSh1fO7HOsrf4lcelBNviAJLCxB/ggmG+jV1aw== dependencies: clones "^1.2.0" @@ -7266,11 +7271,6 @@ serialize-to-js@^1.1.1: js-beautify "^1.8.9" safer-eval "^1.3.0" -serialize-to-js@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/serialize-to-js/-/serialize-to-js-3.0.0.tgz#1fd8736744819a4df29dc85e9d04a44a4984edc3" - integrity sha512-WdGgi0jGnWCQXph2p3vkxceDnTfvfyXfYxherQMRcZjSaJzMQdMBAW6i0nojsBKIZ3fFOztZKKVbbm05VbIdRA== - serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" From 7fe596306c785b1fceb6e6b47b2855ffc5b56fca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 01:45:36 +0000 Subject: [PATCH 02/10] Bump lodash from 4.17.11 to 4.17.15 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15) Signed-off-by: dependabot[bot] --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3ae7f0f..5a06a2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -866,11 +866,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/socket.io-client@^1.4.32": - version "1.4.32" - resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14" - integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg== - "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -1092,6 +1087,11 @@ acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== +acorn@^6.0.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== + acorn@^6.0.1, acorn@^6.0.5: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" @@ -4616,6 +4616,11 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-loader@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" + integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w== + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -4808,9 +4813,9 @@ lodash.uniq@^4.5.0: integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@~4.17.10: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== log-symbols@^2.2.0: version "2.2.0" @@ -7266,11 +7271,6 @@ serialize-to-js@^1.1.1: js-beautify "^1.8.9" safer-eval "^1.3.0" -serialize-to-js@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/serialize-to-js/-/serialize-to-js-3.0.0.tgz#1fd8736744819a4df29dc85e9d04a44a4984edc3" - integrity sha512-WdGgi0jGnWCQXph2p3vkxceDnTfvfyXfYxherQMRcZjSaJzMQdMBAW6i0nojsBKIZ3fFOztZKKVbbm05VbIdRA== - serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" From ab86e93a901f75418f0b95dde6bbdfc56dd3c00d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 01:45:39 +0000 Subject: [PATCH 03/10] Bump mixin-deep from 1.3.1 to 1.3.2 Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot[bot] --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3ae7f0f..69f338f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -866,11 +866,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/socket.io-client@^1.4.32": - version "1.4.32" - resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14" - integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg== - "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -1092,6 +1087,11 @@ acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== +acorn@^6.0.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== + acorn@^6.0.1, acorn@^6.0.5: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" @@ -4616,6 +4616,11 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-loader@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" + integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w== + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -5118,9 +5123,9 @@ mississippi@^3.0.0: through2 "^2.0.0" mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ== + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== dependencies: for-in "^1.0.2" is-extendable "^1.0.1" @@ -7266,11 +7271,6 @@ serialize-to-js@^1.1.1: js-beautify "^1.8.9" safer-eval "^1.3.0" -serialize-to-js@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/serialize-to-js/-/serialize-to-js-3.0.0.tgz#1fd8736744819a4df29dc85e9d04a44a4984edc3" - integrity sha512-WdGgi0jGnWCQXph2p3vkxceDnTfvfyXfYxherQMRcZjSaJzMQdMBAW6i0nojsBKIZ3fFOztZKKVbbm05VbIdRA== - serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" From 5ae1100517959ec1114d6000793f3e624b5abbbe Mon Sep 17 00:00:00 2001 From: pichotm <8015411+PichotM@users.noreply.github.com> Date: Sun, 12 Jan 2020 21:02:14 -0500 Subject: [PATCH 04/10] Create README.md --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..ee6efbb --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# RPG-Inventory-UI +Drag & Drop Inventory RPG Style using React.
+This is a pretty old resource! + +### Todo +``` +Switch to Redux +Support user keybinds +``` + +### Preview +![](https://i.imgur.com/4Y2YYT0.jpg) From db217a2f73d2cfaec1c4e084937c90e43702b2b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 00:03:21 +0000 Subject: [PATCH 05/10] Bump acorn from 6.4.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot[bot] --- yarn.lock | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index efe01f4..805c735 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1087,15 +1087,10 @@ acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== - -acorn@^6.0.1, acorn@^6.0.5: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" - integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== +acorn@^6.0.0, acorn@^6.0.1, acorn@^6.0.5: + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== add-px-to-style@1.0.0: version "1.0.0" From c9f116125ca5cbb922f33fde153ba91c88d4d8f6 Mon Sep 17 00:00:00 2001 From: Mathis Cucci Date: Thu, 16 Apr 2020 02:19:02 +0200 Subject: [PATCH 06/10] Add Seachbox to quickly find what you want --- app/Inventory.tsx | 12 +++++++++--- app/ItemList.tsx | 9 ++++++++- sass/_inventory.scss | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/app/Inventory.tsx b/app/Inventory.tsx index 43b2bba..e25e7b9 100644 --- a/app/Inventory.tsx +++ b/app/Inventory.tsx @@ -28,7 +28,9 @@ export class Inventory extends Component { super(props) this.state = { clothes : false, - targetClothes : false + targetClothes : false, + searchPocketsValue: '', + searchOtherValue: '' } } @@ -66,11 +68,13 @@ export class Inventory extends Component {
this.setState({ clothes : false })}>Inventaire
  |  
this.setState({ clothes : true })} >Vêtements
+
  |  
+
this.setState({ searchPocketsValue: event.target.value })} placeholder="Rechercher"/>
{inventoryStore.pocketsWeight} / 45
- + @@ -92,6 +96,8 @@ export class Inventory extends Component {
this.setState({ targetClothes : false })}>Coffre
  |  
this.setState({ targetClothes : true })} >Vêtements
+
  |  
+
this.setState({ searchOtherValue: event.target.value })} placeholder="Rechercher"/>
{inventoryStore.targetWeight} / {inventoryStore.targetMaxWeight}
)} @@ -99,7 +105,7 @@ export class Inventory extends Component { {inventoryStore.targetMaxWeight > 0 && ( - + )} diff --git a/app/ItemList.tsx b/app/ItemList.tsx index af135e6..d9d2970 100644 --- a/app/ItemList.tsx +++ b/app/ItemList.tsx @@ -37,6 +37,13 @@ export class ItemList extends Component { this.setState({ dragOver: false }) } + filteredItems(searchValue) { + return this.props.items.map((item, id) => { + if (item.name.indexOf(searchValue) != -1) + return + }) + } + scroll({ style, ...props }) { return (
{ tabIndex={-1} > - {this.items} + {this.props.searchValue.length == 0 ? this.items : this.filteredItems(this.props.searchValue) }
) diff --git a/sass/_inventory.scss b/sass/_inventory.scss index 8c7ee66..800327e 100644 --- a/sass/_inventory.scss +++ b/sass/_inventory.scss @@ -46,6 +46,22 @@ &.selected, &:hover { color: rgba(255, 255, 255, 1.0); } + + &:last-child { + float: right; + } + + .searchBox { + border: .2px solid grey; + border-radius: 5px; + font-size: 9px; + padding: 5px; + text-align: center; + + &:focus { + outline: none; + } + } } .infos { float: right; From 36426d17a9bb2d6855a11f15a1ce40183dd7902f Mon Sep 17 00:00:00 2001 From: Mathis Cucci Date: Thu, 16 Apr 2020 03:15:47 +0200 Subject: [PATCH 07/10] toLowerCase for search & order alphabetically --- app/ItemList.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/ItemList.tsx b/app/ItemList.tsx index d9d2970..74d3017 100644 --- a/app/ItemList.tsx +++ b/app/ItemList.tsx @@ -17,7 +17,7 @@ export class ItemList extends Component { get items() { if (this.props.items) { - return this.props.items.map((item, id) => { + return this.props.items.sort((a, b) => a.name.localeCompare(b.name)).map((item, id) => { return }) } @@ -38,8 +38,9 @@ export class ItemList extends Component { } filteredItems(searchValue) { - return this.props.items.map((item, id) => { - if (item.name.indexOf(searchValue) != -1) + const low = searchValue.toLowerCase() + return this.props.items.sort((a, b) => a.name.localeCompare(b.name)).map((item, id) => { + if (item.name.toLowerCase().indexOf(low) != -1) return }) } From 942a026bde5ac7cb0fdd734793f7c44614d03daf Mon Sep 17 00:00:00 2001 From: Mathis Cucci Date: Thu, 16 Apr 2020 05:59:22 +0200 Subject: [PATCH 08/10] make npm run webpack work with windows --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47f07a5..1ead1df 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "parcel index.pug --no-cache -d ../dist", "build": "parcel build index.pug --no-cache -d ../dist --public-url '.'", - "webpack": "NODE_ENV=production webpack --mode production", + "webpack": "SET NODE_ENV=production webpack --mode production", "devWebpack": "webpack-dev-server --mode development" }, "keywords": [], From 2b6728b8e64b50c32c0aa4a8fe65c06c40244fcb Mon Sep 17 00:00:00 2001 From: Mathis Cucci Date: Thu, 16 Apr 2020 05:59:49 +0200 Subject: [PATCH 09/10] Disable context menu on item for dev mode --- app/item.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/item.tsx b/app/item.tsx index 2aa0f54..0c34834 100644 --- a/app/item.tsx +++ b/app/item.tsx @@ -77,6 +77,7 @@ export class Item extends Component { onMouseEnter={this.onMouseEnter.bind(this)} onMouseLeave={this.onMouseLeave.bind(this)} + onContextMenu={(e) => e.preventDefault()} > {(this.props.keyNumber || (this.props.data && this.props.data.qty)) && this.label} From ff69549d0e7f90d94e02c31f22d3f34a6a2817f8 Mon Sep 17 00:00:00 2001 From: Mathis Cucci Date: Thu, 16 Apr 2020 06:00:32 +0200 Subject: [PATCH 10/10] Add full focus request for search box & add order by --- app/Inventory.tsx | 38 +++++++++++++++++++++++++++++++++----- app/ItemList.tsx | 18 +++++++++++++++--- sass/_inventory.scss | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 78 insertions(+), 11 deletions(-) diff --git a/app/Inventory.tsx b/app/Inventory.tsx index e25e7b9..e9aad6f 100644 --- a/app/Inventory.tsx +++ b/app/Inventory.tsx @@ -30,7 +30,9 @@ export class Inventory extends Component { clothes : false, targetClothes : false, searchPocketsValue: '', - searchOtherValue: '' + searchOtherValue: '', + pocketsOrder: 0, + targetOrder: 0 } } @@ -57,6 +59,14 @@ export class Inventory extends Component { top: dragStore.mousey - offset * 2 } } + + requestFullFocus() { + fetch('http://gtalife/askFullFocus', { method: 'POST', body: "{}" }) + } + + releaseFullFocus() { + fetch('http://gtalife/releaseFullFocus', { method: 'POST', body: "{}" }) + } render() { const icons = Icons @@ -69,12 +79,21 @@ export class Inventory extends Component {
  |  
this.setState({ clothes : true })} >Vêtements
  |  
-
this.setState({ searchPocketsValue: event.target.value })} placeholder="Rechercher"/>
+
+ Trier par ▼ +
+
this.setState({ pocketsOrder : 0 })} className={this.state.pocketsOrder == 0 ? "selected" : ""}>{this.state.pocketsOrder == 0 ? "✔ " : ""}Alphabétique
+
this.setState({ pocketsOrder : 1 })} className={this.state.pocketsOrder == 1 ? "selected" : ""}>{this.state.pocketsOrder == 1 ? "✔ " : ""}Nombre
+ {/*
this.setState({ pocketsOrder : 2 })} className={this.state.pocketsOrder == 2 ? "selected" : ""}>{this.state.pocketsOrder == 2 ? "✔ " : ""}Poids
*/} +
+
+
  |  
+
this.requestFullFocus()} onBlur={() => this.releaseFullFocus()} className="searchBox" type="text" onChange={(event) => this.setState({ searchPocketsValue: event.target.value })} placeholder="Rechercher"/>
{inventoryStore.pocketsWeight} / 45
- + @@ -97,7 +116,16 @@ export class Inventory extends Component {
  |  
this.setState({ targetClothes : true })} >Vêtements
  |  
-
this.setState({ searchOtherValue: event.target.value })} placeholder="Rechercher"/>
+
+ Trier par ▼ +
+
this.setState({ targetOrder : 0 })} className={this.state.targetOrder == 0 ? "selected" : ""}>{this.state.targetOrder == 0 ? "✔ " : ""}Alphabétique
+
this.setState({ targetOrder : 1 })} className={this.state.targetOrder == 1 ? "selected" : ""}>{this.state.targetOrder == 1 ? "✔ " : ""}Nombre
+ {/*
this.setState({ targetOrder : 2 })} className={this.state.targetOrder == 2 ? "selected" : ""}>{this.state.targetOrder == 2 ? "✔ " : ""}Poids
*/} +
+
+
  |  
+
this.requestFullFocus()} onBlur={() => this.releaseFullFocus()} className="searchBox" type="text" onChange={(event) => this.setState({ searchOtherValue: event.target.value })} placeholder="Rechercher"/>
{inventoryStore.targetWeight} / {inventoryStore.targetMaxWeight}
)} @@ -105,7 +133,7 @@ export class Inventory extends Component { {inventoryStore.targetMaxWeight > 0 && ( - + )} diff --git a/app/ItemList.tsx b/app/ItemList.tsx index 74d3017..a876278 100644 --- a/app/ItemList.tsx +++ b/app/ItemList.tsx @@ -17,7 +17,19 @@ export class ItemList extends Component { get items() { if (this.props.items) { - return this.props.items.sort((a, b) => a.name.localeCompare(b.name)).map((item, id) => { + const order = this.props.order; + return this.props.items.sort((a, b) => { + switch(order) { + case 0: + return a.name.toString().localeCompare(b.name.toString()); + + case 1: + return b.qty - a.qty + + case 2: + } + + }).map((item, id) => { return }) } @@ -39,8 +51,8 @@ export class ItemList extends Component { filteredItems(searchValue) { const low = searchValue.toLowerCase() - return this.props.items.sort((a, b) => a.name.localeCompare(b.name)).map((item, id) => { - if (item.name.toLowerCase().indexOf(low) != -1) + return this.props.items.sort((a, b) => a.name.toString().localeCompare(b.name.toString())).map((item, id) => { + if (item.name.toString().toLowerCase().indexOf(low) != -1) return }) } diff --git a/sass/_inventory.scss b/sass/_inventory.scss index 800327e..9426e85 100644 --- a/sass/_inventory.scss +++ b/sass/_inventory.scss @@ -47,19 +47,46 @@ color: rgba(255, 255, 255, 1.0); } - &:last-child { - float: right; + .dropdown { + position: absolute; + min-width: 12%; + max-width: 12%; + + div { + background: rgba(100, 100, 100, 0.3); + padding: 5px; + text-align: center; + } + + div.selected, div:hover { + background: rgba(100, 100, 100, 0.6); + } + + display: none; + z-index: 1; + } + + &:hover .dropdown, .dropdown:hover { + display: block; } .searchBox { - border: .2px solid grey; + border: .2px solid rgba(100, 100, 100, 0.8); border-radius: 5px; font-size: 9px; padding: 5px; text-align: center; + background: rgba(100, 100, 100, 0); + color: white; + + &::-webkit-input-placeholder { /* Edge */ + color: white; + } + &:focus { outline: none; + background: rgba(100, 100, 100, 0.3); } } }