From 4bf7bd211275b69722e726dff1cab1d0b3e01ec1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 03:37:06 +0000 Subject: [PATCH 1/9] Bump scratch-l10n from 3.13.20210630031503 to 3.13.20210701031453 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210630031503 to 3.13.20210701031453. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210630031503...3.13.20210701031453) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77ca9a93e..e99185ba2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21386,9 +21386,9 @@ } }, "scratch-l10n": { - "version": "3.13.20210630031503", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210630031503.tgz", - "integrity": "sha512-2LIumtLBd8KVg2YpmJlToMHH24CPlV+4crcyPbI4gScHnFKGKHTQK0eZNCMO7tZEMi47hfl8xXVbIcryhi3iNQ==", + "version": "3.13.20210701031453", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210701031453.tgz", + "integrity": "sha512-tJCBymZm6EvUu7E5q2ufD7F2Ld1Z+FjNA6Y8rUrS3MZjWdyqIcED3Fev9qFaGVQ+E/82QG1EV6UFQzexJOHtBg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 85e71ab36..de5608bcc 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210629084355", - "scratch-l10n": "3.13.20210630031503", + "scratch-l10n": "3.13.20210701031453", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From ecbedb78f11e7c68737920f73063159044d5cd73 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 10:40:21 +0000 Subject: [PATCH 2/9] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210629084355 to 0.1.0-prerelease.20210701034811. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210629084355...0.1.0-prerelease.20210701034811) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 34 +++++++++++----------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index e99185ba2..e03f5fe7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20853,9 +20853,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210629072645", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210629072645.tgz", - "integrity": "sha512-FpP4YIUQg3dgAKvn5QQ26DeBJyt4XsuJffXoFR5S5SLLuUgfWlh2+YYPx4otLj89neywvt7wqu/3pepYGyASOw==", + "version": "0.1.0-prerelease.20210630045645", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210630045645.tgz", + "integrity": "sha512-Mi/GwKug+Oyd176P9YmAySar2C0qGmoiEE5hzPNxcCbtXeTVIQDh3JwTBziVFqqPDdkyTqxopunLpfa0FYQ3ZQ==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20863,9 +20863,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210629084355", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210629084355.tgz", - "integrity": "sha512-bFEx92eZkC/gPpWulvktGEUvX5u/ncIJy4r44YIMs1B+R5xbnu2yauOSVbrc+D18iMLzdB9LvL7HPpcDE4zw2Q==", + "version": "0.1.0-prerelease.20210701034811", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210701034811.tgz", + "integrity": "sha512-FpQNX3yYcxocT1l+1Yvkc0aOulS5ajguiPst95dAzt0Rns5b04M2Npl574kpuZU8GFCjpTU5hH1SI6xu47w/yw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20916,8 +20916,8 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210629072645", - "scratch-l10n": "3.13.20210629031507", + "scratch-blocks": "0.1.0-prerelease.20210630045645", + "scratch-l10n": "3.13.20210701031453", "scratch-paint": "0.2.0-prerelease.20210615011117", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -21086,9 +21086,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.761", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.761.tgz", - "integrity": "sha512-7a/wV/plM/b95XjTdA2Q4zAxxExTDKkNQpTiaU/nVT8tGCQVtX9NsnTjhALBFICpOB58hU6xg5fFC3CT2Bybpg==", + "version": "1.3.763", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz", + "integrity": "sha512-UyvEPae0wvzsyNJhVfGeFSOlUkHEze8xSIiExO5tZQ8QTr7obFiJWGk3U4e7afFOJMQJDszqU/3Pk5jtKiaSEg==", "dev": true }, "has-flag": { @@ -21308,18 +21308,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.13.20210629031507", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210629031507.tgz", - "integrity": "sha512-IxBJKogspgEe6879EpLFkrU524tFMN5avsFNVeAKJn1rO1RODOEfpGl4U27gq6WlhiYSGaqtoB8ObXvRHMWhmg==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index de5608bcc..d10aae703 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210629084355", + "scratch-gui": "0.1.0-prerelease.20210701034811", "scratch-l10n": "3.13.20210701031453", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 9f2ba06d2a2f9af65115c490eef150d30583483a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 3 Jul 2021 03:21:53 +0000 Subject: [PATCH 3/9] Bump scratch-l10n from 3.13.20210701031453 to 3.13.20210703031554 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210701031453 to 3.13.20210703031554. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210701031453...3.13.20210703031554) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 24 ++++++++++++++++++------ package.json | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e03f5fe7c..53fedcb79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.762", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.762.tgz", - "integrity": "sha512-LehWjRpfPcK8F1Lf/NZoAwWLWnjJVo0SZeQ9j/tvnBWYcT99qDqgo4raAfS2oTKZjPrR/jxruh85DGgDUmywEA==", + "version": "1.3.766", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz", + "integrity": "sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w==", "dev": true }, "semver": { @@ -21308,6 +21308,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.13.20210701031453", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210701031453.tgz", + "integrity": "sha512-tJCBymZm6EvUu7E5q2ufD7F2Ld1Z+FjNA6Y8rUrS3MZjWdyqIcED3Fev9qFaGVQ+E/82QG1EV6UFQzexJOHtBg==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21374,9 +21386,9 @@ } }, "scratch-l10n": { - "version": "3.13.20210701031453", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210701031453.tgz", - "integrity": "sha512-tJCBymZm6EvUu7E5q2ufD7F2Ld1Z+FjNA6Y8rUrS3MZjWdyqIcED3Fev9qFaGVQ+E/82QG1EV6UFQzexJOHtBg==", + "version": "3.13.20210703031554", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210703031554.tgz", + "integrity": "sha512-SY6+VqsJ4/Ft49KnqWLsr0hP1cZuZ1itkSHv+nsEj3Q3zePadVa1eoC4+gL/lEBeg3iEtGjWU4JhiSuDkMsETQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index d10aae703..2d8700fd7 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210701034811", - "scratch-l10n": "3.13.20210701031453", + "scratch-l10n": "3.13.20210703031554", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 88560a4dd74c143b2bf5a5a7e9bafdee66246c7a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 4 Jul 2021 03:20:48 +0000 Subject: [PATCH 4/9] Bump scratch-l10n from 3.13.20210703031554 to 3.13.20210704031505 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210703031554 to 3.13.20210704031505. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210703031554...3.13.20210704031505) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 53fedcb79..3eff153d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21386,9 +21386,9 @@ } }, "scratch-l10n": { - "version": "3.13.20210703031554", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210703031554.tgz", - "integrity": "sha512-SY6+VqsJ4/Ft49KnqWLsr0hP1cZuZ1itkSHv+nsEj3Q3zePadVa1eoC4+gL/lEBeg3iEtGjWU4JhiSuDkMsETQ==", + "version": "3.13.20210704031505", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210704031505.tgz", + "integrity": "sha512-tWBnK5yh4e39fV8EBErbBS9E1ofKskqM6b5NGRy3PtE00yttcsefzdtvi+DtNo+4ZpOPBjQtegm+KNyhZLpdxA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 2d8700fd7..52a93d221 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210701034811", - "scratch-l10n": "3.13.20210703031554", + "scratch-l10n": "3.13.20210704031505", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From b38804739019af49eda8afbce8ff7efe97b3963a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 10:35:27 +0000 Subject: [PATCH 5/9] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210701034811 to 0.1.0-prerelease.20210703033613. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210701034811...0.1.0-prerelease.20210703033613) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3eff153d5..904b74a25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20863,9 +20863,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210701034811", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210701034811.tgz", - "integrity": "sha512-FpQNX3yYcxocT1l+1Yvkc0aOulS5ajguiPst95dAzt0Rns5b04M2Npl574kpuZU8GFCjpTU5hH1SI6xu47w/yw==", + "version": "0.1.0-prerelease.20210703033613", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210703033613.tgz", + "integrity": "sha512-sGfyOzC79M7L73NjbGBmh5V5ET803Ypxhcjc7EQ8/Aglt4rY/TMxJ+BVFC4ypnJbm9UfRFV0xjbCMFvnwbpIjQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20917,7 +20917,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210630045645", - "scratch-l10n": "3.13.20210701031453", + "scratch-l10n": "3.13.20210703031554", "scratch-paint": "0.2.0-prerelease.20210615011117", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -21086,9 +21086,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.763", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz", - "integrity": "sha512-UyvEPae0wvzsyNJhVfGeFSOlUkHEze8xSIiExO5tZQ8QTr7obFiJWGk3U4e7afFOJMQJDszqU/3Pk5jtKiaSEg==", + "version": "1.3.766", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz", + "integrity": "sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w==", "dev": true }, "has-flag": { @@ -21309,9 +21309,9 @@ "dev": true }, "scratch-l10n": { - "version": "3.13.20210701031453", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210701031453.tgz", - "integrity": "sha512-tJCBymZm6EvUu7E5q2ufD7F2Ld1Z+FjNA6Y8rUrS3MZjWdyqIcED3Fev9qFaGVQ+E/82QG1EV6UFQzexJOHtBg==", + "version": "3.13.20210703031554", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210703031554.tgz", + "integrity": "sha512-SY6+VqsJ4/Ft49KnqWLsr0hP1cZuZ1itkSHv+nsEj3Q3zePadVa1eoC4+gL/lEBeg3iEtGjWU4JhiSuDkMsETQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 52a93d221..c8910090e 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210701034811", + "scratch-gui": "0.1.0-prerelease.20210703033613", "scratch-l10n": "3.13.20210704031505", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 4866d96da11d3d1596bf57588f31b66fa09dc8a9 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Tue, 6 Jul 2021 14:36:12 -0400 Subject: [PATCH 6/9] fix(studios): change the curators, projects and managers load count to 24 Changing from 20 to 24 will fix the issue where we are loading rows that aren't "full" on a 3-tile row. Now it will always fill a row no matter the display breakpoint (1,2 or 3 tiles per row) --- src/views/studio/lib/studio-member-actions.js | 12 ++++++------ src/views/studio/lib/studio-project-actions.js | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/studio/lib/studio-member-actions.js b/src/views/studio/lib/studio-member-actions.js index c8eb56db0..cbd7be791 100644 --- a/src/views/studio/lib/studio-member-actions.js +++ b/src/views/studio/lib/studio-member-actions.js @@ -17,6 +17,8 @@ const Errors = keyMirror({ MANAGER_LIMIT: null }); +const PER_PAGE_LIMIT = 24; + const normalizeError = (err, body, res) => { if (err) return Errors.NETWORK; if (res.statusCode === 400 && body.message === 'too many owners') { @@ -40,15 +42,14 @@ const loadManagers = () => ((dispatch, getState) => { const state = getState(); const studioId = selectStudioId(state); const managerCount = managers.selector(state).items.length; - const managersPerPage = 20; const opts = { uri: `/studios/${studioId}/managers/`, - params: {limit: managersPerPage, offset: managerCount} + params: {limit: PER_PAGE_LIMIT, offset: managerCount} }; api(withAdmin(opts, state), (err, body, res) => { const error = normalizeError(err, body, res); if (error) return dispatch(managers.actions.error(error)); - dispatch(managers.actions.append(body, body.length === managersPerPage)); + dispatch(managers.actions.append(body, body.length === PER_PAGE_LIMIT)); }); }); @@ -56,15 +57,14 @@ const loadCurators = () => ((dispatch, getState) => { const state = getState(); const studioId = selectStudioId(state); const curatorCount = curators.selector(state).items.length; - const curatorsPerPage = 20; const opts = { uri: `/studios/${studioId}/curators/`, - params: {limit: curatorsPerPage, offset: curatorCount} + params: {limit: PER_PAGE_LIMIT, offset: curatorCount} }; api(withAdmin(opts, state), (err, body, res) => { const error = normalizeError(err, body, res); if (error) return dispatch(curators.actions.error(error)); - dispatch(curators.actions.append(body, body.length === curatorsPerPage)); + dispatch(curators.actions.append(body, body.length === PER_PAGE_LIMIT)); }); }); diff --git a/src/views/studio/lib/studio-project-actions.js b/src/views/studio/lib/studio-project-actions.js index 0cf048cd6..cd40c0068 100644 --- a/src/views/studio/lib/studio-project-actions.js +++ b/src/views/studio/lib/studio-project-actions.js @@ -17,6 +17,8 @@ const Errors = keyMirror({ USER_MUTED: null }); +const PER_PAGE_LIMIT = 24; + const normalizeError = (err, body, res) => { if (err) return Errors.NETWORK; if (res.statusCode === 403 && body.mute_status) return Errors.USER_MUTED; @@ -32,15 +34,14 @@ const loadProjects = () => ((dispatch, getState) => { const state = getState(); const studioId = selectStudioId(state); const projectCount = projects.selector(state).items.length; - const projectsPerPage = 20; const opts = { uri: `/studios/${studioId}/projects/`, - params: {limit: projectsPerPage, offset: projectCount} + params: {limit: PER_PAGE_LIMIT, offset: projectCount} }; api(withAdmin(opts, state), (err, body, res) => { const error = normalizeError(err, body, res); if (error) return dispatch(projects.actions.error(error)); - dispatch(projects.actions.append(body, body.length === projectsPerPage)); + dispatch(projects.actions.append(body, body.length === PER_PAGE_LIMIT)); }); }); From d693beb1b33669f0022c6a4b92159d61f9596592 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Tue, 6 Jul 2021 14:51:16 -0400 Subject: [PATCH 7/9] fix(studios): share css to make load more buttons full width Changes the markup and css classes used by activity, curators, managers and projects grids to use a shared full-width load more button --- src/views/studio/studio-activity.jsx | 8 ++++---- src/views/studio/studio-curators.jsx | 2 +- src/views/studio/studio-managers.jsx | 2 +- src/views/studio/studio-projects.jsx | 2 +- src/views/studio/studio.scss | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/studio/studio-activity.jsx b/src/views/studio/studio-activity.jsx index ef65c406c..59af45ea6 100644 --- a/src/views/studio/studio-activity.jsx +++ b/src/views/studio/studio-activity.jsx @@ -196,8 +196,8 @@ const StudioActivity = ({items, loading, error, moreToLoad, onLoadMore}) => { getComponentForItem(item) )} -
- {moreToLoad && + {moreToLoad && +
- } -
+
+ } ); }; diff --git a/src/views/studio/studio-curators.jsx b/src/views/studio/studio-curators.jsx index 22df830fd..57eb5c69e 100644 --- a/src/views/studio/studio-curators.jsx +++ b/src/views/studio/studio-curators.jsx @@ -66,7 +66,7 @@ const StudioCurators = ({ />) )} {moreToLoad && -
+
+
+ }
- {moreToLoad && -
- -
- } + } {!loading && items.length === 0 && diff --git a/src/views/studio/modals/user-projects-modal.scss b/src/views/studio/modals/user-projects-modal.scss index 315d53e78..31bb9d2cf 100644 --- a/src/views/studio/modals/user-projects-modal.scss +++ b/src/views/studio/modals/user-projects-modal.scss @@ -44,10 +44,6 @@ } } - .studio-projects-load-more { - display: contents; - } - .studio-projects-done-row { display: flex; justify-content: flex-end; From 6aeddcfed393bb9496e4a9c025cc90d47476769a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 10:31:56 +0000 Subject: [PATCH 9/9] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210703033613 to 0.1.0-prerelease.20210707095345. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210703033613...0.1.0-prerelease.20210707095345) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 904b74a25..d1134cb18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20853,9 +20853,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210630045645", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210630045645.tgz", - "integrity": "sha512-Mi/GwKug+Oyd176P9YmAySar2C0qGmoiEE5hzPNxcCbtXeTVIQDh3JwTBziVFqqPDdkyTqxopunLpfa0FYQ3ZQ==", + "version": "0.1.0-prerelease.20210701042432", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210701042432.tgz", + "integrity": "sha512-cJMwFz32YFlCq8fVBFLTqHjWYU9/TIOLVOi77aXD93TtZIhzhq80AgFmB6607XlBsWavd65bZ1pZ2FC32q0Sog==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20863,9 +20863,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210703033613", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210703033613.tgz", - "integrity": "sha512-sGfyOzC79M7L73NjbGBmh5V5ET803Ypxhcjc7EQ8/Aglt4rY/TMxJ+BVFC4ypnJbm9UfRFV0xjbCMFvnwbpIjQ==", + "version": "0.1.0-prerelease.20210707095345", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210707095345.tgz", + "integrity": "sha512-m8lCy3p1UxPBBFngZpYiWhEomTTAFhid4NTtoughFl/MQQ8kpqy8phVTuK51ieD/DMXRuJdISP1jKRgzd7UQ+Q==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20916,7 +20916,7 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210630045645", + "scratch-blocks": "0.1.0-prerelease.20210701042432", "scratch-l10n": "3.13.20210703031554", "scratch-paint": "0.2.0-prerelease.20210615011117", "scratch-render": "0.1.0-prerelease.20210325231800", @@ -21086,9 +21086,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.766", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz", - "integrity": "sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w==", + "version": "1.3.769", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.769.tgz", + "integrity": "sha512-B+3hW8D76/uoTPSobWI3D/CFn2S4jPn88dVJ+BkD88Lz6LijQpL+hfdzIFJGTQK4KdE0XwmNbjUQFH1OQVwKdQ==", "dev": true }, "has-flag": { diff --git a/package.json b/package.json index c8910090e..408189e81 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210703033613", + "scratch-gui": "0.1.0-prerelease.20210707095345", "scratch-l10n": "3.13.20210704031505", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0",