merge in master

remove functions and utils related to deprecated Users table
AlexandraOM · Feb 20, 2020 · f17f0b7 · f17f0b7
2 parents a3e9db3 + abc7516
commit f17f0b7
Show file tree

Hide file tree

Showing 33 changed files with 486 additions and 189 deletions.
diff --git a/functions/get-users/get-users.js b/functions/get-users/get-users.js
diff --git a/functions/post-user/post-user.js b/functions/post-user/post-user.js
diff --git a/public/SSfavicon.ico b/public/SSfavicon.ico
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/SSfavicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Web site created using create-react-app"
+      content="A safe space to report sexual harrassment and abuse at work"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/SSfavicon.ico" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,10 +24,10 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Safe Space from the MU</title>
   </head>
   <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <noscript>You'll need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--
       This HTML file is a template.

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/src/App/App.js b/src/App/App.js
@@ -9,8 +9,8 @@ function App() {
         <Route exact path='/' render={() => <Home />} />
         <Route exact path='/report/:index' render={() => <Report />} />
         <Route exact path='/report/section/:index' render={() => <Report />} />
-        <Route exact path='/report/review' render={() => <Report />} />
         <Route exact path='/report/submit' render={() => <Report />} />
+        <Route exact path='/report/confirm' render={() => <Report />} />
         <Route path='/frequently-asked-questions' render={() => <FAQs />} />
         <Route path='/about' render={() => <About />} />
         <Route path='/support' render={() => <Support />} />

diff --git a/src/assets/safespace-logo.svg b/src/assets/safespace-logo.svg
diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js
@@ -41,7 +41,6 @@ const ButtonNext = styled(Button)`
     letter-spacing: 0.2px;
     text-decoration-line: underline;
     color: #7768a6;
-    // color: linear-gradient(296.3deg, #7768a6 2.65%, #ca68a4 86.52%) !important;
     cursor: pointer;
   }
 `;
@@ -53,7 +52,6 @@ const ButtonBack = styled(Button)`
     letter-spacing: 0.2px;
     text-decoration-line: underline;
     color: #e16a1e;
-    // color: linear-gradient(296.3deg, #7768a6 2.65%, #ca68a4 86.52%) !important;
     cursor: pointer;
   }
 `;

diff --git a/src/components/FAQuestion/FAQuestion.js b/src/components/FAQuestion/FAQuestion.js
@@ -1,5 +1,37 @@
 import React from 'react';
 const FAQuestion = () => {
+  //   What is sexual harassment?
+  // Sexual harassment is when someone behaves in a way that makes you feel distressed, intimidated or offended and the behaviour is of a sexual nature.
+  // This includes:
+  // Sexual comments or jokes
+  // Physical behaviour; unwelcome sexual advances, touching and various forms of sexual assault
+  // Displaying photos, pictures or drawings of a sexual nature
+  // Sending messages, emails etc. with sexual content
+  // Learn more on theMU.org
+  // What is sexual assault?
+  // Sexual assault is any type of sexual activity or contact that you do not consent to
+  // Is the MU Safe Space for you?
+  // We want to hear from you if you do or wish to make all or part of your living from music. You could be a student or a professional. You could be employed, self employed, not working at the moment, or looking for work.
+  // We also want to hear from you if you are an amateur musician. You could be playing in a community orchestra or performing as part of a choir.
+  // We need as many musicians as possible to share their experiences. The more experiences musicians share, the easier it will be for us to spot patterns and identify where we need to focus our work to create meaningful and lasting change.
+  // If you are aged 16 or under, or the incident happened when you were 16 or under, it will not be covered by this survey. Please contact the Rape Crisis or the NSPCC for advice and support. You can also find a list of organisations at theMU.org/safespace [specify]
+  // If you need an immediate help and support, check the services you can contact now [link to the immediate help page]
+  // What the MU Safe Space can do
+  // For MU members:
+  // We can advise you on your legal rights
+  // We can provide information about relevant support services
+  // We can support you if you would like to seek redress
+  // We may be able to raise a complaint with the employer, engager, or even directly with the perpetrator
+  // If both the alleged perpetrator and the complainant are MU members, then we also have the option of disciplinary action under MU rules.
+  // For everyone:
+  // We can provide advice on what your rights are
+  // We can provide information about relevant support services
+  // In cases of bullying, discrimination and other inappropriate behaviour we can provide advice on your options and further steps.
+  // What the MU Safe Space cannot do
+  // We cannot provide counselling. But we will always provide information on relevant support services
+  // We are very limited in terms of what can be done industrially to address a complaint of a sexual assault.
+  // We cannot guarantee the outcome that you want.
+
   return <p>FAQuestion goes here</p>;
 };
 

diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -9,6 +9,7 @@ import {
 } from '@rmwc/top-app-bar';
 import '@material/top-app-bar/dist/mdc.top-app-bar.css';
 import { Bubbles } from '../style';
+import { ReactComponent as Logo } from '../../assets/safespace-logo.svg';
 
 const AppBar = styled(TopAppBar)`
   && {
@@ -20,6 +21,10 @@ const AppBar = styled(TopAppBar)`
   }
 `;
 
+const SSLogo = styled(Logo)`
+  width: 50vw;
+`;
+
 const Header = () => {
   return (
     <>
@@ -30,6 +35,7 @@ const Header = () => {
               {/* <a href='/about'>About</a>
               <a href='/freq'>FAQ</a> */}
             </TopAppBarTitle>
+            <SSLogo />
           </TopAppBarSection>
         </TopAppBarRow>
       </AppBar>

diff --git a/src/components/style.js b/src/components/style.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { ReactComponent as HeaderBubbles } from '../assets/Header-bubbles.svg';
+import { ReactComponent as HeaderBubbles2 } from '../assets/Header-bubbles2.svg';
 import { ReactComponent as LowerBubbles } from '../assets/Footer-bubbles.svg';
 import styled from 'styled-components';
 import { Typography } from '@rmwc/typography';
@@ -12,6 +13,14 @@ const StyledBubbles = styled(HeaderBubbles)`
   height: 100%;
 `;
 
+const StyledBubbles2 = styled(HeaderBubbles2)`
+  position: relative;
+  left: -4em;
+  top: -104px;
+  max-width: 130%;
+  height: 100%;
+`;
+
 const BubblesContainer = styled.div`
   top: 0em;
   position: absolute;
@@ -30,6 +39,14 @@ const Bubbles = () => {
   );
 };
 
+const Bubbles2 = () => {
+  return (
+    <BubblesContainer>
+      <StyledBubbles2 />
+    </BubblesContainer>
+  );
+};
+
 const FooterBubbles = styled(LowerBubbles)`
   position: absolute;
   left: -4em;
@@ -51,7 +68,7 @@ const FormContainer = styled.div`
   #text {
     color: pink;
   }
-  input[type='text'] {
+  input[placeholder] {
     color: #abb1d0;
   }
 
@@ -88,6 +105,15 @@ const FlexRow = styled.div`
   display: flex;
   flex-flow: row nowrap;
   padding-bottom: 0.5em;
+  justify-content: space-between;
 `;
 
-export { Bubbles, FooterBubbles, FormContainer, TypeQ, FlexColumn, FlexRow };
+export {
+  Bubbles,
+  Bubbles2,
+  FooterBubbles,
+  FormContainer,
+  TypeQ,
+  FlexColumn,
+  FlexRow,
+};
diff --git a/src/model/FAQuestions.js b/src/model/FAQuestions.js
@@ -0,0 +1,36 @@
+export default [{ faq: '', answer: '' },
+
+{faq:"What is sexual harassment?",
+answer:["Sexual harassment is when someone behaves in a way that makes you feel distressed, intimidated or offended and the behaviour is of a sexual nature."
+"This includes: ",
+"Sexual comments or jokes",
+"Physical behaviour; unwelcome sexual advances, touching and various forms of sexual assault",
+"Displaying photos, pictures or drawings of a sexual nature",
+"Sending messages, emails etc. with sexual content",
+"Learn more on theMU.org"]},
+{faq:"What is sexual assault?",
+answer:["Sexual assault is any type of sexual activity or contact that you do not consent to"],
+{faq:"Is the MU Safe Space for you?",
+answer: ["We want to hear from you if you do or wish to make all or part of your living from music. You could be a student or a professional. You could be employed, self employed, not working at the moment, or looking for work.",
+"We also want to hear from you if you are an amateur musician. You could be playing in a community orchestra or performing as part of a choir.",
+"We need as many musicians as possible to share their experiences. The more experiences musicians share, the easier it will be for us to spot patterns and identify where we need to focus our work to create meaningful and lasting change.",
+"If you are aged 16 or under, or the incident happened when you were 16 or under, it will not be covered by this survey. Please contact the Rape Crisis or the NSPCC for advice and support. You can also find a list of organisations at theMU.org/safespace [specify]"
+"If you need an immediate help and support, check the services you can contact now [link to the immediate help page]"
+]},{faq:"What the MU Safe Space can do...",
+answer:["For MU members:"
+"We can advise you on your legal rights"
+We can provide information about relevant support services
+We can support you if you would like to seek redress
+We may be able to raise a complaint with the employer, engager, or even directly with the perpetrator
+If both the alleged perpetrator and the complainant are MU members, then we also have the option of disciplinary action under MU rules.
+For everyone:
+We can provide advice on what your rights are
+We can provide information about relevant support services
+In cases of bullying, discrimination and other inappropriate behaviour we can provide advice on your options and further steps.
+What the MU Safe Space cannot do
+We cannot provide counselling. But we will always provide information on relevant support services
+We are very limited in terms of what can be done industrially to address a complaint of a sexual assault.
+We cannot guarantee the outcome that you want.
+
+
+}];
diff --git a/src/model/dividers.js b/src/model/dividers.js
@@ -1,37 +1,33 @@
 export default [
   {
+    section: 0,
     paras: [
       'There are four sections to this survey.',
       'No question is compulsory and you can exit the process any time by closing the browser.',
+      'The first section includes questions on what happened and details about the event.',
     ],
     explainer: 'All information you provide is confidential.',
-    title: 'What When Where',
-    index: 0,
   },
   {
+    section: 0,
     paras: [
       'The next section asks questions about what happened and the person who did this.',
     ],
     explainer: 'All information you provide is confidential.',
-    title: 'Perpetrator',
-    index: 1,
   },
   {
+    section: 0,
     paras: [
       'The next section is going to ask about your experience with reporting.',
       "There is an option to say that you haven't reported before",
     ],
     explainer: 'All information you provide is confidential.',
-    title: 'Reporting',
-    index: 2,
   },
   {
+    section: 0,
     paras: [
       'The next section covers a few more questions about you to get a broader picture of harassment in the music industry',
-      "There is an option to say that you haven't reported before",
     ],
     explainer: 'All information you provide is confidential.',
-    title: 'Victim',
-    index: 3,
   },
 ];
diff --git a/src/model/questions.js b/src/model/questions.js
@@ -84,7 +84,7 @@ export default [
     page: 4,
     section: 1,
     content: ['Man', 'Woman'],
-    question: 'Was the harrasser(s) or perpetrator(s) a...',
+    question: 'Was the person who did this a:',
     type: 'radio',
   },
   {

diff --git a/src/model/responses.js b/src/model/responses.js
@@ -6,7 +6,7 @@ export default {
   'Did the incident take place in the UK?': 'renewedTest',
   'What kind of location did the incident take place in?': 'renewedTest',
   'Where exactly did the incident take place?': 'renewedTest',
-  'Was the harrasser(s) or perpetrator(s) a...': 'renewedTest',
+  'Was the person who did this a:': 'renewedTest',
   'What is their relationship to you?': 'renewedTest',
   'Have you experienced sexual harrassment by the same perpetrator before?':
     'renewedTest',