From a2fc07aa62cc51fb2a2006c580a16a748ae944eb Mon Sep 17 00:00:00 2001 From: drgoodcat <60068941+drgoodcat@users.noreply.github.com> Date: Mon, 4 Oct 2021 23:03:43 +0200 Subject: [PATCH] colors ;-; --- client/src/components/EventPreview/index.js | 106 +++++++++++--------- index.js | 90 ++++++++--------- 2 files changed, 105 insertions(+), 91 deletions(-) diff --git a/client/src/components/EventPreview/index.js b/client/src/components/EventPreview/index.js index ff28685..8f07a94 100644 --- a/client/src/components/EventPreview/index.js +++ b/client/src/components/EventPreview/index.js @@ -3,50 +3,64 @@ import { BIcon } from "../BIcon"; import styles from "./index.module.scss"; import React, { useState, useEffect } from "react"; export const EventPreview = (props) => { - const [label, setLabel] = useState(""); - const [color, setColor] = useState("white"); - useEffect(() => { - switch (props.type) { - case 1: - setColor("#53d188"); - setLabel("sadzenie drzew"); - break; - case 2: - setColor("#FBBEBE"); - setLabel("zbieranie śmieci"); - break; - default: - } - }, [label, color, props.type, props.time]); - const getDate = (time) => { - let date = new Date(time); - return date.toLocaleDateString(navigator.language); - }; - const getTime = (time) => { - let date = new Date(time); - return date.toLocaleTimeString(navigator.language, { hour: "2-digit", minute: "2-digit" }); - }; - return ( - -
- {props.name ?? "Event name"}

-
- - {`${getDate(props.time)} ${getTime(props.time)}` ?? ""} - - - {props.address?.split(", ").splice(0, 2).join(", ")} - -
-
-
- {label} -
- - utworzone {getDate(props.createdTime)} o godzinie {getTime(props.createdTime)} - -
-
- - ); + const [label, setLabel] = useState(""); + const [color, setColor] = useState("white"); + useEffect(() => { + switch (props.type) { + case 1: + setColor("#53d188"); + setLabel("sadzenie drzew"); + break; + case 2: + setColor("#FBBEBE"); + setLabel("zbieranie śmieci"); + break; + case 3: + setColor("#FFFF99"); + setLabel("happening/meeting"); + break; + case 4: + setColor("#C0C0C0"); + setLabel("inne"); + default: + } + }, [label, color, props.type, props.time]); + const getDate = (time) => { + let date = new Date(time); + return date.toLocaleDateString(navigator.language); + }; + const getTime = (time) => { + let date = new Date(time); + return date.toLocaleTimeString(navigator.language, { + hour: "2-digit", + minute: "2-digit", + }); + }; + return ( + +
+ {props.name ?? "Event name"}{" "} +

+
+ + {" "} + {`${getDate(props.time)} ${getTime(props.time)}` ?? ""} + + + {" "} + {props.address?.split(", ").splice(0, 2).join(", ")} + +
+
+
+ {label} +
+ + utworzone {getDate(props.createdTime)} o godzinie{" "} + {getTime(props.createdTime)} + +
+
+ + ); }; diff --git a/index.js b/index.js index 8e48533..92358e8 100644 --- a/index.js +++ b/index.js @@ -1,64 +1,64 @@ -require('dotenv').config(); +require("dotenv").config(); const express = require("express"); const cors = require("cors"); const app = express(); -const path = require('path'); +const path = require("path"); const port = process.env.PORT || 5000; const mongoose = require("mongoose"); const events = require("./models/events"); const bodyParser = require("body-parser"); app.use(bodyParser.json()); // to support JSON-encoded bodies app.use( - bodyParser.urlencoded({ - // to support URL-encoded bodies - extended: true, - }) + bodyParser.urlencoded({ + // to support URL-encoded bodies + extended: true, + }) ); -app.use(express.static(path.join(__dirname, 'client/build'))); +app.use(express.static(path.join(__dirname, "client/build"))); app.use( - cors({ - origin: "*", - }) + cors({ + origin: "*", + }) ); mongoose - .connect(process.env.MONGO_URI, { - useNewUrlParser: true, - useUnifiedTopology: true, - }) - .then(() => console.log("connected")) - .catch((err) => console.log(err)); - app.get('/', (req,res) =>{ - res.sendFile(path.join(__dirname+'/client/build/index.html')); - }); + .connect(process.env.MONGO_URI, { + useNewUrlParser: true, + useUnifiedTopology: true, + }) + .then(() => console.log("connected")) + .catch((err) => console.log(err)); +app.get("/", (req, res) => { + res.sendFile(path.join(__dirname + "/client/build/index.html")); +}); app.get("/api/getEvents", async (req, res) => { - try { - const event = await events.find(); - if (!event) throw Error("something went wrong"); - console.log(event); - res.status(200).json(event); - } catch (err) { - res.status(400).json({ msg: err }); - } + try { + const event = await events.find(); + if (!event) throw Error("something went wrong"); + console.log(event); + res.status(200).json(event); + } catch (err) { + res.status(400).json({ msg: err }); + } }); app.post("/api/createEvent", (req, res) => { - let data = { - name: req.body.name, - type: req.body.type, - address: req.body.address, - time: req.body.time, - created: { time: Date.now() }, - lat: req.body.lat, - lon: req.body.lon, - }; - events.create(data, (err) => { - if (err) return res.status(400).json({ msg: err }); - // saved! - res.status(200).json("ok"); - }); + let data = { + name: req.body.name, + type: req.body.type, + address: req.body.address, + time: req.body.time, + created: { time: Date.now() }, + lat: req.body.lat, + lon: req.body.lon, + }; + events.create(data, (err) => { + if (err) return res.status(400).json({ msg: err }); + // saved! + res.status(200).json("ok"); + }); }); app.use((req, res, next) => { - res.sendFile(path.join(__dirname+'/client/build/index.html')); -}) -app.listen(port, () => { - console.log(`Example app listening at http://localhost:${port}`); + res.sendFile(path.join(__dirname + "/client/build/index.html")); +}); +app.listen(port, () => { + console.log(`Example app listening at http://localhost:${port}`); });