SpringRole · SanjamSinghKalsi · Jun 9, 2021 · Jun 9, 2021 · Jun 9, 2021 · Jun 9, 2021
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,8 @@
+FROM node:14.16-slim
+WORKDIR /ask-feed-frontend-client
+COPY package.json /ask-feed-frontend-client/package.json
+RUN npm install
+COPY . /ask-feed-frontend-client
+RUN npm run build
+CMD ["npm", "start"]
+EXPOSE 3000
diff --git a/package.json b/package.json
@@ -9,7 +9,9 @@
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^12.8.3",
     "axios": "^0.21.1",
+    "http-proxy-middleware": "^2.0.0",
     "install": "^0.13.0",
+    "lodash": "^4.17.21",
     "materialize-css": "^1.0.0-rc.2",
     "npm": "^7.16.0",
     "react": "^17.0.2",
@@ -18,6 +20,7 @@
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.3",
     "redux": "^4.1.0",
+    "redux-form": "^8.3.7",
     "redux-thunk": "^2.3.0",
     "web-vitals": "^1.1.2"
   },

diff --git a/public/index.html b/public/index.html
@@ -10,6 +10,10 @@
       content="Web site created using create-react-app"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+     <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"
+    />
     <!--
       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/

diff --git a/src/actions/index.js b/src/actions/index.js
@@ -1,7 +1,14 @@
-// import axios from "axios";
-// import { FETCH_USER } from "./types";
+import axios from "axios";
+import { FETCH_USER, FETCH_SURVEYS } from "./types";
+export const submitSurvey = (values, history) => async (dispatch) => {
+  const res = await axios.post(
+    "http://localhost:2000/survey/createsurvey",
+    values
+  );
+  dispatch({ type: FETCH_USER, payload: res.data });
+};
 
-// export const fetchUser = () => async (dispatch) => {
-//   const res = axios.get("/api/current_user");
-//   dispatch({ type: FETCH_USER, payload: res.data });
-// };
+export const fetchSurveys = () => async (dispatch) => {
+  const res = await axios.get("http://localhost:2000/survey/getSurvey");
+  dispatch({ type: FETCH_SURVEYS, payload: res.data });
+};
diff --git a/src/actions/types.js b/src/actions/types.js
@@ -1 +1,2 @@
 export const FETCH_USER = "fetch_user";
+export const FETCH_SURVEYS = "fetch_surveys";
diff --git a/src/components/About.js b/src/components/About.js
@@ -4,13 +4,7 @@ import "./About.css";
 const About = () => {
   return (
     <>
-      {/* <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <meta charset="utf-8">
-      <meta name="keywords" content=""><meta name="description" content=""><meta name="page_type" content="np-template-header-footer-from-plugin"> */}
-
-      {/* <meta name="generator" content="Nicepage 3.16.1, nicepage.com"></head> */}
-      {/* <body class="u-body u-hide-header" data-style="blank" data-posts="" data-global-section-properties="{&quot;colorings&quot;:{&quot;light&quot;:[&quot;clean&quot;],&quot;colored&quot;:[&quot;clean&quot;],&quot;dark&quot;:[&quot;dark&quot;]}}" data-source="blank" data-page-sections-style="[]" data-page-coloring-types="{&quot;light&quot;:[&quot;clean&quot;],&quot;colored&quot;:[&quot;clean&quot;],&quot;dark&quot;:[&quot;dark&quot;]}" data-page-category="&quot;Basic&quot;" data-back-link="html-templates" data-back-link-title="HTML Template" data-wp-back-link="wordpress-themes" data-wp-back-link-title="WordPress Themes" data-jm-back-link="joomla-templates" data-jm-back-link-title="Free Joomla Templates" data-created-with-title="Website Builder Software" data-wp-created-with-link="wordpress-website-builder" data-wp-created-with-title="WordPress Website Builder" data-jm-created-with-link="joomla-page-builder" data-jm-created-with-title="Joomla Page Builder"><section class="u-clearfix u-image u-block-bb46-1" custom-posts-hash="[]" data-style="blank" data-section-properties="{&quot;margin&quot;:&quot;none&quot;,&quot;stretch&quot;:true}" id="carousel_ca00" data-source="fix" data-id="bb46" data-image-width="662" data-image-height="750"> */}
-      <p className="about">
+         <p className="about">
         <div class="u-clearfix u-sheet u-block-bb46-2">
           <div class="u-clearfix u-expanded-width u-layout-wrap u-block-bb46-3">
             <div class="u-layout">

diff --git a/src/components/ActivationEmail.css b/src/components/ActivationEmail.css
@@ -0,0 +1,5 @@
+.login-anchor {
+  font-size: 30px;
+  text-decoration: none;
+  color: #3362a8;
+}
diff --git a/src/components/ActivationEmail.js b/src/components/ActivationEmail.js
@@ -1,10 +1,12 @@
 import React, { useState, useEffect } from "react";
-import { NavLink, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import { showErrMsg, showSuccessMsg } from "./utils/notification/Notification";
 import axios from "axios";
+import "./ActivationEmail.css";
+import logo from "./LandingPage/images/favicon.png";
 function ActivationEmail() {
   const { token } = useParams();
-  // console.log(token);
+
   const [err, setErr] = useState("");
   const [success, setSuccess] = useState("");
   console.log(useParams());
@@ -13,40 +15,44 @@ function ActivationEmail() {
     if (token) {
       const activationEmail = async () => {
         try {
-          const res = await axios.post(`/api/activate/${token}`, {
-            token,
-          });
+          const res = await axios.post(
+            `http://localhost:2000/api/activate/${token}`,
+            {
+              token,
+            }
+          );
           setSuccess(res.data.msg);
         } catch (err) {
           err.response.data.msg && setErr(err.response.data.msg);
         }
-        // console.log(res);
       };
       activationEmail();
     }
   }, [token]);
 
-  // const res = await fetch("/api/signup", {
-  //   method: "POST",
-  //   headers: {
-  //     "Content-Type": "application/json",
-  //   },
-
-  //   const [err, setErr] = useState("");
-  //   const [success, setSuccess] = useState("");
-  //   useEffect(()=>{
-  //       if(tonpmken){
-  //           const
-  //       }
-  //   })
   return (
-    <div className="active_page">
-      {err && showErrMsg(err)}
-      {success && showSuccessMsg(success)}
-      {/* <NavLink>Kindly click on this link</NavLink> */}
-      <h1>Successs!!</h1>
-      {/* <Button onClick={}/> */}
-    </div>
+    <>
+      <div className="active_page">
+        {err && showErrMsg(err)}
+        {success && showSuccessMsg(success)}
+
+        <h1
+          className="message"
+          style={{ textAlign: "center", marginTop: "30px" }}
+        >
+          Successs!! Click on login to get redirected to the login page!
+        </h1>
+        <a
+          href="/login"
+          className="login-anchor"
+          style={{ textAlign: "center", left: "50px" }}
+        >
+          Login!
+        </a>
+      </div>
+      <img src={logo} alt="logo" className="logo-activation" />
+    </>
   );
 }
 export default ActivationEmail;
+
diff --git a/src/components/App.js b/src/components/App.js
@@ -5,27 +5,23 @@ import { connect } from "react-redux";
 import * as actions from "../actions";
 import Login from "./Login";
 import Signup from "./Signup";
-import About from "./About";
+import ResetLink from "./ResetLink";
 import Dashboard from "./Dashboard";
-import SurveyNew from "./SurveyNew";
-import Header from "./Header";
-import "./App.css";
+import ResetPassword from "./ResetPassword";
+import SurveyNew from "./surveys/SurveyNew";
+import Logout from "./Logout";
+import EditInfo from "./EditInfo";
 import ActivationEmail from "./ActivationEmail";
+import StoringYes from "./surveys/StoringYes.js";
+import StoringNo from "./surveys/StoringNo.js";
 
-class App extends Component {
-  // componentDidMount() {
-  //   this.props.fetchUser();
-  // }
 
+class App extends Component {
   render() {
     return (
       <div className="container">
         <BrowserRouter>
           <div>
-            {/* <Route exact path="/header">
-            <Header />
-          </Route> */}
-            {/* <Header /> */}
             <Route exact path="/">
               <LandingPage />
             </Route>
@@ -35,9 +31,6 @@ class App extends Component {
             <Route exact path="/register">
               <Signup />
             </Route>
-            {/* <Route exact path="/about">
-            <About />
-          </Route> */}
             <Route exact path="/dashboard">
               <Dashboard />
             </Route>
@@ -46,10 +39,27 @@ class App extends Component {
               path="/api/activate/:token"
               component={ActivationEmail}
             />
-
-            {/* <Route exact path="/surveys/new">
-            <SurveyNew />
-          </Route>  */}
+            <Route exact path="/api/resetlink">
+              <ResetLink />
+            </Route>
+            <Route exact path="/api/changepassword/:token">
+              <ResetPassword />
+            </Route>
+            <Route
+              exact
+              path="/survey/response/yes/:id"
+              component={StoringYes}
+            />
+            <Route exact path="/survey/response/no/:id" component={StoringNo} />
+            <Route exact path="/surveys/new">
+              <SurveyNew />
+            </Route>
+            <Route exact path="/api/logout">
+              <Logout />
+            </Route>
+            <Route exact path="/api/editInfo">
+              <EditInfo />
+            </Route>
           </div>
         </BrowserRouter>
       </div>
@@ -58,3 +68,4 @@ class App extends Component {
 }
 
 export default connect(null, actions)(App);
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export const FETCH_USER = "fetch_user";
		export const FETCH_SURVEYS = "fetch_surveys";