fix merge conflicts

fac-17 · Oct 16, 2019 · faf5f8c · faf5f8c
2 parents 7153fd1 + 43a2461
commit faf5f8c
Show file tree

Hide file tree

Showing 43 changed files with 731 additions and 301 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/lambda/getData.js b/lambda/getData.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,9 +5,12 @@
   "dependencies": {
     "axios": "^0.19.0",
     "netlify-lambda": "^1.6.3",
+    "framer-motion": "^1.6.14",
     "react": "^16.10.2",
     "react-contenteditable": "^3.3.2",
+    "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.10.2",
+    "react-reveal": "^1.2.2",
     "react-router-dom": "^5.1.2",
     "react-scripts": "3.1.2",
     "react-swipeable": "^5.4.0"
@@ -36,12 +39,12 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^4.1.1",
+    "@testing-library/jest-dom": "^4.1.2",
     "@testing-library/react": "^9.3.0",
     "cypress": "^3.4.1",
     "enzyme": "^3.10.0",
-    "enzyme-adapter-react-15": "^1.4.0",
-    "enzyme-adapter-react-16": "^1.14.0",
+    "enzyme-adapter-react-15": "^1.4.1",
+    "enzyme-adapter-react-16": "^1.15.1",
     "react-test-renderer": "^16.10.2"
   }
 }
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/App.css b/src/App.css
@@ -16,7 +16,7 @@ h3 {
   font-family: 'Montserrat', sans-serif;
   font-size: 1em;
   color: black;
-  margin-bottom:1.5em;
+  margin-bottom:1em;
 }
 
 figcaption {

diff --git a/src/App.jsx b/src/App.jsx
@@ -23,11 +23,7 @@ function App() {
           <Route exact path="/" component={PrivacyPolicy} />
           <Route exact path="/welcome" component={Welcome} />
           <Route exact path="/about" component={About} />
-          <Route
-            exact
-            path="/feelingoverwhelmed"
-            component={FeelingOverwhelmed}
-          />
+          <Route exact path="/feelingoverwhelmed" component={FeelingOverwhelmed} />
           <Route exact path="/helpingourselves" component={HelpingOurselves} />
           <Route exact path="/myappointment" component={MyAppointment} />
           <Route exact path="/emotions" component={Emotions} />

diff --git a/src/components/.DS_Store b/src/components/.DS_Store