merge conflict

creativecolab · Feb 10, 2020 · 6fe652d · 6fe652d
1 parent 58bfa2c
commit 6fe652d
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+
     "@d4sd/components": "^3.1.5",
+    "@types/dompurify": "^2.0.1",
+
     "@types/jest": "^24.0.20",
     "@types/node": "^12.11.7",
     "@types/react": "^16.9.11",
@@ -14,6 +17,7 @@
     "babel-polyfill": "^6.26.0",
     "connected-react-router": "^6.5.2",
     "customize-cra": "^0.8.0",
+    "dompurify": "^2.0.7",
     "firebase": "^7.2.3",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",

diff --git a/src/components/layouts/preliminary-submission-layout/index.tsx b/src/components/layouts/preliminary-submission-layout/index.tsx
@@ -33,7 +33,7 @@ const PrelimSubmitLayout = (): JSX.Element => {
   };
 
   useEffect(() => {
-    const step: string | null = localStorage.getItem('prelimStep-d4sd-prelim-submit');
+    const step: string | null = 'feedback'//localStorage.getItem('prelimStep-d4sd-prelim-submit');
     if (step) {
       setSubmitStep(step);
     }

diff --git a/src/components/preliminarysubmission-cards/feedback/index.tsx b/src/components/preliminarysubmission-cards/feedback/index.tsx
@@ -1,7 +1,10 @@
-import React, { useEffect } from 'react';
-import useForm from 'react-hook-form';
-import { Form } from '@d4sd/components';
-import './style.less';
+import React, { useEffect } from "react";
+import useForm from "react-hook-form";
+import { Form, Row, Col } from "@d4sd/components";
+import "./style.less";
+import DOMPurify from "dompurify";
+import { Input } from "antd";
+import TextArea from "antd/lib/input/TextArea";
 
 interface FeedbackCardIF {
   setSubmitStep(step: string): void;
@@ -10,6 +13,17 @@ interface FeedbackCardIF {
 const FeedbackCard = (props: FeedbackCardIF): JSX.Element => {
   const { setSubmitStep } = props;
   const { register, handleSubmit, setValue } = useForm();
+  const projectName = localStorage.getItem("teamName-d4sd-prelim-submit");
+  const problemStatement = localStorage.getItem(
+    "problemstatement-d4sd-prelim-submit"
+  );
+
+  const prelimQuestion1 = localStorage.getItem("prelim-submission-question1") || "";
+  const prelimQuestion2 = localStorage.getItem("prelim-submission-question2") || "";
+  const prelimQuestion3 = localStorage.getItem("prelim-submission-question3") || "";
+
+  const questionList =
+    "<p>Here’s your opportunity to get input on your ideas. Your team can pose up to three questions to ask the community about your proposed solutions. Asking questions is optional but can really help facilitate feedback exchange. Advice for writing effective questions:</p>";
 
   /* eslint-disable */
   const onSubmit = (data: any): void => {
@@ -21,20 +35,97 @@ const FeedbackCard = (props: FeedbackCardIF): JSX.Element => {
 
   // register inputs
   useEffect(() => {
-    register({ name: 'stuff' });
-  // eslint-disable-next-line
+    register({ name: "stuff" });
+    // eslint-disable-next-line
   }, []);
 
   // eslint-disable-next-line
   const handleChange = (e: any) => {
+    console.log(e.target.name);
     setValue(e.target.name, e.target.value);
-    setSubmitStep('');
+    localStorage.setItem(e.target.name, e.target.value);
+    //setSubmitStep("");
   };
+
   return (
     <div className="ProjectInfoCard">
       <div className="ProjectInfo-body">
-        <p>FEEDBACK</p>
-        <Form layout="vertical" onSubmit={handleSubmit(onSubmit)} />
+        <Row type="flex" justify="center">
+          <Col xs={{ span: 20 }} sm={{ span: 11 }}>
+            <Row>
+              <h4>Project: {projectName}</h4>
+              <p>
+                <b>Team members: </b>
+              </p>
+            </Row>
+            <Row className="problemArea">
+              <h4>Submission Preview</h4>
+              <p>
+                <b>1. Problem Statement</b>
+              </p>
+              <div>
+                <p>{problemStatement}</p>
+              </div>
+              <p>
+                <b>2. Propose Initial Concepts</b>
+                <div>Show PDF</div>
+              </p>
+            </Row>
+          </Col>
+          <Col sm={{ span: 2 }}></Col>
+
+          <Col xs={{ span: 20 }} sm={{ span: 11 }}>
+            <h4>Question List</h4>
+            <div
+              dangerouslySetInnerHTML={{
+                __html: DOMPurify.sanitize(questionList)
+              }}
+            ></div>
+            <ul>
+              <li>
+                <p>
+                  <b>Specific: </b>Call attention to specific aspects of your
+                  proposals.
+                </p>
+              </li>
+              <li>
+                <p>
+                  <b>Open-ended: </b>
+                  Request open-ended answers rather than asking for Yes/No
+                  responses or trivial feedback.
+                </p>
+              </li>
+              <li>
+                <p>
+                  <b>Succinct: </b>
+                  Keep your questions to under 200 characters.
+                </p>
+              </li>
+              <li>
+                <p>
+                  <b>Comparitive: </b>
+                  Ask questions that compare different alternatives.
+                </p>
+              </li>
+            </ul>
+
+            <Form layout="vertical" onSubmit={handleSubmit(onSubmit)}>
+              <Input.Group>
+                <h4 className="questions">Question 1</h4>
+                <TextArea autoSize={{minRows: 3, maxRows: 5}} onChange={handleChange} name="prelim-submission-question1">
+                </TextArea>
+                <br />
+                <h4 className="questions">Question 2</h4>
+                <TextArea autoSize={{minRows: 3, maxRows: 5}} onChange={handleChange} name="prelim-submission-question2" value={prelimQuestion2}>
+                </TextArea>
+
+                <h4 className="questions">Question 3</h4>
+                <TextArea autoSize={{minRows: 3, maxRows: 5}} onChange={handleChange} name="prelim-submission-question3" value={prelimQuestion3}>
+                </TextArea>
+              </Input.Group>
+            </Form>
+          </Col>
+        </Row>
       </div>
     </div>
   );

diff --git a/src/components/preliminarysubmission-cards/feedback/style.less b/src/components/preliminarysubmission-cards/feedback/style.less
@@ -0,0 +1,26 @@
+@import "../../../styles/vars.less";
+@import "../../../styles/mixins.less";
+
+.ProjectInfoCard{
+  .ProjectInfo-body{
+    .problemArea{
+      div{
+      padding: 10px;
+      border: 2px solid #828282;
+      box-sizing: border-box;
+      border-radius: 10px;
+      }
+
+      h4{
+        margin-top: @margin-base-1/2;
+      }
+
+      >p{
+        margin-top: @margin-base-1/2;
+      }
+
+    }
+
+
+  }
+}