diff --git a/src/App.js b/src/App.js index 37c6545..428eada 100644 --- a/src/App.js +++ b/src/App.js @@ -2,10 +2,11 @@ import React, {useState, useEffect} from "react"; import StyledFirebaseAuth from 'react-firebaseui/StyledFirebaseAuth'; import firebase from'firebase' import { Provider } from "react-redux"; -import { Router, Link } from "@reach/router"; +import { Router } from "@reach/router"; import Boxes from "./boxes/Boxes"; -import styles from "./App.module.css"; +import SignedIn from "./SignedIn/SignedIn.js"; import setupStore from "./store/setupStore.js"; + const config = { apiKey: "AIzaSyC5krz4RBiT87RK7cEidh3n-A4H63uGcyM", authDomain: "retrod-7e2cd.firebaseapp.com", @@ -33,17 +34,7 @@ function App() {
{isSignedIn ? ( <> -

You're Signed In

- - -

Sprint {sprint}

-
- - - -
+ ) : ( <> diff --git a/src/App.module.css b/src/App.module.css deleted file mode 100644 index 68a2df7..0000000 --- a/src/App.module.css +++ /dev/null @@ -1,6 +0,0 @@ -.grid{ - display: grid; - grid-template-columns: auto auto auto; - grid-column-gap: 1em; - margin: 1rem; -} diff --git a/src/Items/Items.js b/src/Items/Items.js index 5f86f9b..aed550d 100644 --- a/src/Items/Items.js +++ b/src/Items/Items.js @@ -1,5 +1,6 @@ import React from 'react'; import { databaseRef } from '../store/firebase.js' +import styles from "./items.module.css"; export default function Item({ item, boxId, sprint }) { const handleClick = e => { @@ -16,9 +17,9 @@ export default function Item({ item, boxId, sprint }) { databaseRef.ref(url + item.id + `/completed`).set(item.completed === false ? true : false) } return ( -
- {item.title} - +
+

{item.title}

+
) } diff --git a/src/Items/items.module.css b/src/Items/items.module.css new file mode 100644 index 0000000..cf1a917 --- /dev/null +++ b/src/Items/items.module.css @@ -0,0 +1,14 @@ +.flexItem{ + display: flex; + justify-content: space-between; +} +button{ + background: none; + border: none; +} +.checkmark{ + color: green; +} +.redx{ + color: red; +} diff --git a/src/SignedIn/SignedIn.js b/src/SignedIn/SignedIn.js new file mode 100644 index 0000000..383e7a2 --- /dev/null +++ b/src/SignedIn/SignedIn.js @@ -0,0 +1,32 @@ +import React, { useState } from "react"; +import firebase from'firebase' +import { Link } from "@reach/router"; +import Boxes from "../boxes/Boxes"; +import styles from "./signedIn.module.css"; + +export default function SignedIn() { + const [sprint, setSprint] = useState(1); + return ( +
+
+
+

{firebase.auth().currentUser.displayName}

+
+ user profile +
+ +
+
+ +

Sprint {sprint}

+
+ + + +
+
+ ) +} diff --git a/src/SignedIn/signedIn.module.css b/src/SignedIn/signedIn.module.css new file mode 100644 index 0000000..84e38d4 --- /dev/null +++ b/src/SignedIn/signedIn.module.css @@ -0,0 +1,31 @@ +body{ + background: lightseagreen; +} +.grid{ + display: grid; + grid-template-columns: auto auto auto; + grid-column-gap: 1em; + margin: 1rem; +} +.alignRight{ + width: 100%; + display: flex; + flex-direction: column; + align-items: flex-end; +} +.marginRight{ + margin-right: 1rem; +} +.signOutButton{ + background: none; + border: none; + text-decoration: underline; + cursor: pointer; + width: 100%; + text-align: right; + padding: 0; + margin-top: 1rem; +} +.alignRight .profilePicture{ + max-width: 50px; +} diff --git a/src/boxes/Boxes.js b/src/boxes/Boxes.js index 719315b..243ff2f 100644 --- a/src/boxes/Boxes.js +++ b/src/boxes/Boxes.js @@ -5,7 +5,6 @@ import Cards from '../cards/Cards.js' export default function Boxes({ sectionName, boxId, sprint }) { return (
-

{sectionName}

diff --git a/src/boxes/Boxes.module.css b/src/boxes/Boxes.module.css index 369b994..12b3322 100644 --- a/src/boxes/Boxes.module.css +++ b/src/boxes/Boxes.module.css @@ -1,3 +1,4 @@ .box{ border: .15rem solid black; + background: lightgrey; } diff --git a/src/cards/Cards.js b/src/cards/Cards.js index bf5dce0..72a2e49 100644 --- a/src/cards/Cards.js +++ b/src/cards/Cards.js @@ -3,12 +3,14 @@ import { databaseRef } from '../store/firebase.js' import Item from '../Items/Items.js'; import NewItem from '../NewItem/NewItem.js' import DeleteItem from '../deleteItem/DeleteItem.js' +import styles from "./cards.module.css"; -export function Cards({item, setItem, boxId, sprint}) { +export function Cards({item, setItem, boxId, sprint, sectionName}) { return ( <> +

{sectionName}

{item.map((i, index) => ( -
+
loading...
; }; - return {}}/> + return {}}/> } diff --git a/src/cards/Cards.module.scss b/src/cards/Cards.module.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/cards/cards.module.css b/src/cards/cards.module.css new file mode 100644 index 0000000..3315527 --- /dev/null +++ b/src/cards/cards.module.css @@ -0,0 +1,5 @@ +.cardBackground{ + background: white; + margin: .5em; + padding: 1em; +} diff --git a/src/deleteItem/DeleteItem.js b/src/deleteItem/DeleteItem.js index f8349e1..b715734 100644 --- a/src/deleteItem/DeleteItem.js +++ b/src/deleteItem/DeleteItem.js @@ -1,5 +1,6 @@ import React from 'react'; import { databaseRef } from '../store/firebase.js' +import styles from "./deleteItem.module.css"; export default function DeleteItem({ item, boxId, objectId, sprint }) { // const [value, setValue ] = useState(""); @@ -25,6 +26,6 @@ export default function DeleteItem({ item, boxId, objectId, sprint }) { retroRef.remove() } return ( - + ) } diff --git a/src/deleteItem/deleteItem.module.css b/src/deleteItem/deleteItem.module.css new file mode 100644 index 0000000..f84475f --- /dev/null +++ b/src/deleteItem/deleteItem.module.css @@ -0,0 +1,9 @@ +.deleteButton{ + color: darkred; + width: 100%; + display: flex; + justify-content: flex-end; + font-size: .5em; + font-weight: bolder; + letter-spacing: 1px; +}