From aca3ef0a0d0521b5245a0247cdbed44364ed2886 Mon Sep 17 00:00:00 2001 From: seotts Date: Wed, 22 Apr 2020 15:38:39 -0400 Subject: [PATCH 1/8] Add scary subcategories --- .../modal/report/report-options.jsx | 68 ++++++++++++++++++- src/l10n.json | 16 ++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/src/components/modal/report/report-options.jsx b/src/components/modal/report/report-options.jsx index db0dc9d14..1d3882960 100644 --- a/src/components/modal/report/report-options.jsx +++ b/src/components/modal/report/report-options.jsx @@ -55,7 +55,73 @@ const REPORT_OPTIONS = [ { value: '2', label: {id: 'report.reasonScary'}, - prompt: + prompt: ( + + + + ) + }} + /> + ), + subcategories: [ + { + value: '', + label: {id: 'report.reasonPlaceHolder'}, + prompt: + }, + { + value: '15', + label: {id: 'report.reasonJumpscare'}, + prompt: ( +
+

+

+
+ ) + }, + { + value: '17', + label: {id: 'report.reasonWeapons'}, + prompt: ( +
+

+

+
+ ) + }, + { + value: '16', + label: {id: 'report.reasonEvent'}, + prompt: ( +
+

+

+
+ ) + }, + { + value: '14', + label: {id: 'report.reasonScaryImages'}, + prompt: ( +
+

+

+
+ ) + }, + { + value: '18', + label: {id: 'report.reasonThreatening'}, + prompt: + } + ] }, { value: '3', diff --git a/src/l10n.json b/src/l10n.json index 3f844ca1c..348d19b70 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -251,6 +251,11 @@ "report.reasonCopy": "Exact Copy of Project", "report.reasonUncredited": "Uses Image/Music Without Credit", "report.reasonScary": "Too Violent or Scary", + "report.reasonJumpscare": "Jumpscare", + "report.reasonWeapons": "Uses realistic weapons", + "report.reasonEvent": "Violent event happens", + "report.reasonScaryImages": "Scary images", + "report.reasonThreatening": "Threatens or bullies another Scratcher", "report.reasonLanguage": "Inappropriate Language", "report.reasonMusic": "Inappropriate Music", "report.reasonMissing": "Please select a reason", @@ -270,7 +275,16 @@ "report.promptPlaceholder": "Select a reason why above.", "report.promptCopy": "Please provide a link to the original project", "report.promptUncredited": "Please provide links to the uncredited content", - "report.promptScary": "Please say why the project is too violent or scary", + "report.promptScary": "Please select the main reason why you feel this project may break the {CommunityGuidelinesLink}.", + "report.promptJumpscare1": "A \"jumpscare\" is when something unexpected flashes on the screen with the intent to scare someone.", + "report.promptJumpscare2": "Please let us know more about the \"jumpscare,\" such as what happens, and when does it happen in the project. Also, providing the name of the sprite, costume, or backdrop, associated with the jumpscare is helpful.", + "report.promptWeapons1": "Please let us know where the image, drawing, or sound of realistic weapons occurs in the project, such as the name of the sprite, costume, or backdrop.", + "report.promptWeapons2": "Tip: Scratch projects should not contain realistic weapons, such as photographs of guns, realistic drawings or sounds. However, cartoon or fictional items like laser beams are okay.", + "report.promptEvent1": "Please let us know more about the scary event or story in the project. Providing more details will help the Scratch Team better understand the issue and address it.", + "report.promptEvent2": "Tip: Scratch is used by all people of ages. It’s important projects do not contain mature themes such as harming someone.", + "report.promptScaryImages1": "Please let us know why you feel this image is too scary for Scratch, and where the image occurs in the project, such as the name of the sprite, costume, or backdrop.", + "report.promptScaryImages2": "Tip: Scratch is used by all people of ages. It’s important projects do not contain blood, realistic violence, or anything that may feel scary or too mature for younger audiences.", + "report.promptThreatening": "Please let us know why you feel this project is threatening another Scratcher.", "report.promptLanguage": "Please say where the inappropriate language occurs in the project (For example: Notes & Credits, sprite name, project text, etc.)", "report.promptMusic": "Please say the name of the audio file with the inappropriate music", "report.promptPersonal": "Please say where the personal contact information is shared (For example: Notes & Credits, sprite name, project text, etc.)", From b476a1e4b3df1bbf9f1f91c9f9110b5466721808 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 26 Apr 2020 14:58:21 +0900 Subject: [PATCH 2/8] Fix invisible actor on FollowStudio --- src/views/splash/presentation.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx index 162b2e63c..90f98525e 100644 --- a/src/views/splash/presentation.jsx +++ b/src/views/splash/presentation.jsx @@ -65,10 +65,10 @@ class ActivityList extends React.Component { return ( ); case 'loveproject': From b2544e1cbdcd766ae59187649bc691374d54a24e Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 26 Apr 2020 17:05:42 +0900 Subject: [PATCH 3/8] Fix lint --- src/views/splash/presentation.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx index 90f98525e..5ec7c9d97 100644 --- a/src/views/splash/presentation.jsx +++ b/src/views/splash/presentation.jsx @@ -65,10 +65,10 @@ class ActivityList extends React.Component { return ( ); case 'loveproject': From 84d861f29901298422d5eb1c214ea3f91040a073 Mon Sep 17 00:00:00 2001 From: R4356th <61620631+R4356th@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:01:09 +0600 Subject: [PATCH 4/8] Update people.json --- src/views/credits/people.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/credits/people.json b/src/views/credits/people.json index 8c13c3b1d..529b8b423 100644 --- a/src/views/credits/people.json +++ b/src/views/credits/people.json @@ -234,4 +234,9 @@ "userId": 26779669, "name": "Kathy" } + { + "userName": "MunchtheCat", + "userId": 59383434, + "name": "Kait" + } ] From 5826058da51386a289b4b6a29daed9ebba0839c4 Mon Sep 17 00:00:00 2001 From: R4356th <61620631+R4356th@users.noreply.github.com> Date: Mon, 27 Apr 2020 23:51:26 +0600 Subject: [PATCH 5/8] Update people.json --- src/views/credits/people.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/credits/people.json b/src/views/credits/people.json index 529b8b423..9b247410d 100644 --- a/src/views/credits/people.json +++ b/src/views/credits/people.json @@ -233,7 +233,7 @@ "userName": "pondermake", "userId": 26779669, "name": "Kathy" - } + }, { "userName": "MunchtheCat", "userId": 59383434, From 2797064c31c6a9fe50e274a924fcc52a7144d79a Mon Sep 17 00:00:00 2001 From: DD Liu Date: Wed, 29 Apr 2020 19:11:42 -0400 Subject: [PATCH 6/8] Update gui --- 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 f9a3af4e4..2acdf16f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15788,9 +15788,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200427175226", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200427175226.tgz", - "integrity": "sha512-D+07MEFzzIL761hSRwJM3B6cXBCLfktl9ywtpu6loS+9KakR/+8csYhmow8U8gK1o25VEtK9Q+tnkNb2OkFmpQ==", + "version": "0.1.0-prerelease.20200429223514", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200429223514.tgz", + "integrity": "sha512-Gy7JEWd33TQ4PtFWKREFJ2GvomNvgUPTQWnecMI1WXB/spt6g0quaYEsg/Zyhr5ICBT2DbQH2wIUWEJ+wXFw+g==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index e212d3372..7f0cbc210 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20200427175226", + "scratch-gui": "0.1.0-prerelease.20200429223514", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 9447650cb9eed78d10bfd255e50bea5218e2072f Mon Sep 17 00:00:00 2001 From: DD Liu Date: Wed, 29 Apr 2020 21:46:05 -0400 Subject: [PATCH 7/8] Update gui --- 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 2acdf16f7..cccc94604 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15788,9 +15788,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200429223514", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200429223514.tgz", - "integrity": "sha512-Gy7JEWd33TQ4PtFWKREFJ2GvomNvgUPTQWnecMI1WXB/spt6g0quaYEsg/Zyhr5ICBT2DbQH2wIUWEJ+wXFw+g==", + "version": "0.1.0-prerelease.20200430013259", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200430013259.tgz", + "integrity": "sha512-n8qC29eyxWESrD+lbx3CKOZD1JHJOAjC2azGX4m70CHSFAB1zvRQisH/aP/dwqO8O5NzJ83FzpqJ61+8m4h8+A==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index 7f0cbc210..c568c3ecc 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20200429223514", + "scratch-gui": "0.1.0-prerelease.20200430013259", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 35e6187f66a27c5c7f9df8d6b6d524d588f36289 Mon Sep 17 00:00:00 2001 From: DD Liu Date: Thu, 30 Apr 2020 12:47:31 -0400 Subject: [PATCH 8/8] update gui --- 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 cccc94604..22126a0ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15788,9 +15788,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200430013259", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200430013259.tgz", - "integrity": "sha512-n8qC29eyxWESrD+lbx3CKOZD1JHJOAjC2azGX4m70CHSFAB1zvRQisH/aP/dwqO8O5NzJ83FzpqJ61+8m4h8+A==", + "version": "0.1.0-prerelease.20200430160141", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200430160141.tgz", + "integrity": "sha512-8ml/C49zN+I5oM5Rjtu/C6cDknYrwrOjqQwUlemcYzA3lBP03bPxgHh/Rnug4B+XKMDEwdD5/lm6d4EFDr74Sw==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index c568c3ecc..d27e38378 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20200430013259", + "scratch-gui": "0.1.0-prerelease.20200430160141", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0",