Merge branch 'master' of https://github.com/makoteq/eco-hack

client/src/components/Pop-up/Popup.js

@@ -1,30 +0,0 @@
-import React from "react";
-import "./index.scss";
-import Hand from "./AnimatedHand";
-
-export default function Popup(props) {
-  return props.trigger ? (
-    <div className="popup">
-      <div className="popup-inner">
-        <div className="popup-text">
-          {props.children}
-          <br />
-          <br />
-          <br />
-          <br />
-          <button className="close-btn" onClick={() => props.setTrigger(false)}>
-            Zaczynamy!
-          </button>
-          <br />
-          <br />
-          <br />
-        </div>
-        <div className="Animation">
-          <Hand></Hand>
-        </div>
-      </div>
-    </div>
-  ) : (
-    ""
-  );
-}

client/src/components/Pop-up/ShowPopup.js

@@ -1,25 +0,0 @@
-import Popup from "./Popup.js";
-import { useState, useEffect } from "react";
-
-function ShowPopup() {
-  const [timedPopup, setTimedPopup] = useState(false);
-
-  useEffect(() => {
-    setTimedPopup(true);
-  }, []);
-
-  return (
-    <div className="App">
-      <Popup trigger={timedPopup} setTrigger={setTimedPopup}>
-        <p>
-          Ta platforma powstała na rzecz ochrony i ratowania środowiska naszej
-          planety oraz pokazanie, że akcje ekologiczne mogą być ciekawe i pewnym
-          sposobem rozrywki. Życzymy ci ciekawie spędzonego czasu na naszej
-          platformie i miłych wrażeń.
-        </p>
-      </Popup>
-    </div>
-  );
-}
-
-export default ShowPopup;

client/src/components/Pop-up/index.scss

@@ -1,42 +0,0 @@
-.popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100vh;
-  background-color: rgba(0, 0, 0, 0.2);
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.popup-inner {
-  position: relative;
-  padding-top: 64px;
-  width: 100%;
-  max-width: 440px;
-  background-color: white;
-}
-.popup-text {
-  text-align: center;
-  padding: 32px;
-  width: 100%;
-  background-color: white;
-}
-
-.close-btn {
-  border-radius: 12px;
-  padding: 10px 24px;
-  border: none;
-  background-color: #cecece;
-  transition-duration: 0.4s;
-}
-.close-btn:hover {
-  background-color: hsl(122, 58%, 71%); /* Green */
-}
-
-.popup-inner .Animation {
-  text-align: left;
-  padding-bottom: 32px;
-}

client/src/pages/Credits/index.js

@@ -4,10 +4,11 @@ import { ReactComponent as Person } from "../../assets/person.svg";
 import { ReactComponent as Person1 } from "../../assets/person1.svg";
 import { ReactComponent as Person2 } from "../../assets/person2.svg";
 import "./index.scss";
-
+import { container } from "../../global.module.scss";
 export const Credits = () => {
   return (
     //Icons
+    <div className={container}>
     <div className="credits">
       <div className="credits__team">
         <h6>THE ECO-MEET TEAM</h6>
@@ -44,5 +45,5 @@ export const Credits = () => {
         </a>
       </div>
     </div>
-  );
+    </div>);
 };