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

client/src/components/EventPreviewEdit/index.js

@@ -2,9 +2,8 @@ import { BIcon } from "../BIcon";
 import styles from "./index.module.scss";
 import { EventType } from "../EventType";
 import { API_CLIENT } from "../../constants";
-import { useHistory } from "react-router-dom";
+
 export const EventPreviewEdit = (props) => {
-    const history = useHistory();
     const getDate = (time) => {
         let date = new Date(time);
         return date.toLocaleDateString(navigator.language);
@@ -17,7 +16,6 @@ export const EventPreviewEdit = (props) => {
         });
     };
     const deleteItem = async (arg) => {
-        console.log("deleting..." + arg);
         await API_CLIENT.deleteEvent({ id: arg });
     };
     return (

client/src/components/Footer/index.js

@@ -1,10 +1,12 @@
 import { Link } from "react-router-dom";
-import { BIcon } from "../BIcon";
 import styles from "./index.module.scss";
 
 export const Footer = () => {
-
     return (
-       <div className={styles.footer}><Link aria-label="Credits" to="/credits" style={{ textDecoration: "none" }}><span className={styles.txt}>credits</span></Link></div>
+        <div className={styles.footer}>
+            <Link aria-label="Credits" to="/credits" style={{ textDecoration: "none" }}>
+                <span className={styles.txt}>credits</span>
+            </Link>
+        </div>
     );
 };

client/src/pages/CreateEvent/MapPopup.js

@@ -50,7 +50,7 @@ export const MapPopup = (props) => {
                 }}
                 showMarker={true}
                 width="100%"
-                height="60vh"
+                height="85vh"
                 center={center}
                 zoom={zoom}
             ></Map>

client/src/pages/CreateEvent/index.js

@@ -13,8 +13,11 @@ import { getPlace } from "../../utils/map/getPlace";
 import { MapPopup } from "./MapPopup";
 
 export const CreateEvent = () => {
-    useTitle("Tworzenie wydarzenia");
     const history = useHistory();
+    if (LOGIN_MANAGER.state === null) {
+        history.push("/");
+    }
+    useTitle("Tworzenie wydarzenia");
     const [locationText, setLocationText] = useState("Brak lokalizacji");
     const formik = useFormik({
         initialValues: {
@@ -120,7 +123,7 @@ export const CreateEvent = () => {
                                             />
                                         );
                                     },
-                                    { width: "70vw", backgroundColor: "#CCCCCC" }
+                                    { width: "95vw", backgroundColor: "#CCCCCC" }
                                 );
                             }}
                         >

client/src/pages/Dashboard/index.js

@@ -1,14 +1,20 @@
 import styles from "./index.module.scss";
+import { useRef } from "react";
 import { Stack } from "react-bootstrap";
 import { useState, useEffect } from "react";
 import { API_CLIENT } from "../../constants";
 import { container } from "../../global.module.scss";
 import { EventPreviewEdit } from "../../components/EventPreviewEdit";
-import { useHistory } from "react-router-dom";
+import { useHistory } from "react-router";
+import { LOGIN_MANAGER } from "../../constants";
+
 export const Dashboard = () => {
-    const [list, updateList] = useState();
-    let array = [];
     const history = useHistory();
+    if (LOGIN_MANAGER.state === null) {
+        history.push("/");
+    }
+    const [list, updateList] = useState();
+    const array = useRef([]);
     useEffect(() => {
         //chce wyrenderować eventpreview ale tylko dla eventów utworzonych przez danego użytkownika
         API_CLIENT.isLogged().then((data) => {
@@ -16,12 +22,12 @@ export const Dashboard = () => {
             if (data !== "not logged") {
                 API_CLIENT.getUserEvents(data.email).then((events) => {
                     if (events) {
-                        array = events;
+                        array.current = events;
                         console.log(array);
                         render();
                     }
                 });
-            }else{
+            } else {
                 history.push("/");
             }
         });