diff --git a/gatsby-browser.js b/gatsby-browser.js index 02addb6e..aee72655 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,16 +1,17 @@ -import React from "react"; -import { MuiThemeProvider, createMuiTheme } from "@material-ui/core"; -import "firebase/auth"; +import { createMuiTheme, MuiThemeProvider } from "@material-ui/core"; import "firebase/analytics"; +import "firebase/auth"; import "firebase/firestore"; +import React from "react"; import { ModalProvider } from "./src/contexts/ModalContext"; +import { ResumeProvider } from "./src/contexts/ResumeContext"; import { ThemeProvider } from "./src/contexts/ThemeContext"; import { UserProvider } from "./src/contexts/UserContext"; - import "./src/styles/colors.css"; -import "./src/styles/tailwind.css"; import "./src/styles/global.css"; -import { ResumeProvider } from "./src/contexts/ResumeContext"; +import "./src/styles/shadows.css"; +import "./src/styles/tailwind.css"; +import "./src/styles/toastify.css"; const theme = createMuiTheme({ typography: { diff --git a/src/components/builder/left/LeftNavbar.js b/src/components/builder/left/LeftNavbar.js new file mode 100644 index 00000000..610f4f79 --- /dev/null +++ b/src/components/builder/left/LeftNavbar.js @@ -0,0 +1,23 @@ +import { Link } from "gatsby"; +import React from "react"; +import Avatar from "../../shared/Avatar"; +import Logo from "../../shared/Logo"; +import styles from "./LeftNavbar.module.css"; + +const LeftNavbar = () => { + return ( +
+ + + + +
+ +
+ + +
+ ); +}; + +export default LeftNavbar; diff --git a/src/components/builder/left/LeftNavbar.module.css b/src/components/builder/left/LeftNavbar.module.css new file mode 100644 index 00000000..76be3678 --- /dev/null +++ b/src/components/builder/left/LeftNavbar.module.css @@ -0,0 +1,6 @@ +.container { + width: 75px; + z-index: 20; + box-shadow: var(--left-shadow); + @apply p-4 h-screen flex flex-col items-center; +} diff --git a/src/components/builder/left/LeftSidebar.js b/src/components/builder/left/LeftSidebar.js new file mode 100644 index 00000000..b66d4dc4 --- /dev/null +++ b/src/components/builder/left/LeftSidebar.js @@ -0,0 +1,24 @@ +import React from "react"; +import Input from "../../shared/Input"; +import LeftNavbar from "./LeftNavbar"; +import styles from "./LeftSidebar.module.css"; + +const LeftSidebar = () => { + return ( +
+ + +
+
+

Profile

+
+
+ +
+
+
+
+ ); +}; + +export default LeftSidebar; diff --git a/src/components/builder/left/LeftSidebar.module.css b/src/components/builder/left/LeftSidebar.module.css new file mode 100644 index 00000000..12374d54 --- /dev/null +++ b/src/components/builder/left/LeftSidebar.module.css @@ -0,0 +1,12 @@ +.container { + z-index: 10; + box-shadow: var(--left-shadow); + @apply w-full h-screen p-8; +} + +.circle { + width: 60px; + height: 60px; + flex: 0 0 60px; + @apply bg-gray-300 rounded-full; +} diff --git a/src/components/dashboard/ResumePreview.js b/src/components/dashboard/ResumePreview.js index 2bdbe8b3..c65baf83 100644 --- a/src/components/dashboard/ResumePreview.js +++ b/src/components/dashboard/ResumePreview.js @@ -1,4 +1,5 @@ import { Menu, MenuItem } from "@material-ui/core"; +import { navigate } from "gatsby"; import moment from "moment"; import React, { useContext, useState } from "react"; import { MdMoreHoriz, MdOpenInNew } from "react-icons/md"; @@ -12,9 +13,7 @@ const ResumePreview = ({ resume }) => { const { createResumeModal } = useContext(ModalContext); const { deleteResume } = useContext(ResumeContext); - const handleOpen = () => { - console.log("Hello, World!"); - }; + const handleOpen = () => navigate(`/app/builder/${resume.id}`); const handleMenuClick = (event) => { setAnchorEl(event.currentTarget); diff --git a/src/components/dashboard/TopNavbar.js b/src/components/dashboard/TopNavbar.js index f7f798c9..5fc773b5 100644 --- a/src/components/dashboard/TopNavbar.js +++ b/src/components/dashboard/TopNavbar.js @@ -1,11 +1,12 @@ +import { Link, navigate } from "gatsby"; import React, { useContext } from "react"; -import Logo from "../shared/Logo"; import UserContext from "../../contexts/UserContext"; +import Avatar from "../shared/Avatar"; +import Logo from "../shared/Logo"; import styles from "./TopNavbar.module.css"; -import { navigate, Link } from "gatsby"; const TopNavbar = () => { - const { user, logout } = useContext(UserContext); + const { logout } = useContext(UserContext); const handleLogout = async () => { await logout(); @@ -27,11 +28,7 @@ const TopNavbar = () => { Logout - {user.displayName} + diff --git a/src/components/dashboard/TopNavbar.module.css b/src/components/dashboard/TopNavbar.module.css index 274e5acc..e145f827 100644 --- a/src/components/dashboard/TopNavbar.module.css +++ b/src/components/dashboard/TopNavbar.module.css @@ -1,6 +1,7 @@ .navbar { height: 65px; - @apply w-full shadow; + box-shadow: var(--bottom-shadow); + @apply w-full; } .navbar > div { diff --git a/src/components/shared/Avatar.js b/src/components/shared/Avatar.js new file mode 100644 index 00000000..61f07cc8 --- /dev/null +++ b/src/components/shared/Avatar.js @@ -0,0 +1,18 @@ +import cx from "classnames"; +import React, { useContext } from "react"; +import UserContext from "../../contexts/UserContext"; +import styles from "./Avatar.module.css"; + +const Avatar = ({ className }) => { + const { user } = useContext(UserContext); + + return ( + {user.displayName} + ); +}; + +export default Avatar; diff --git a/src/components/shared/Avatar.module.css b/src/components/shared/Avatar.module.css new file mode 100644 index 00000000..6675eb1f --- /dev/null +++ b/src/components/shared/Avatar.module.css @@ -0,0 +1,3 @@ +.container { + @apply w-12 h-12 rounded-full; +} diff --git a/src/components/shared/Input.js b/src/components/shared/Input.js index 3f4734b7..e34af5a0 100644 --- a/src/components/shared/Input.js +++ b/src/components/shared/Input.js @@ -1,3 +1,4 @@ +import cx from "classnames"; import React from "react"; import { v4 as uuidv4 } from "uuid"; import styles from "./Input.module.css"; @@ -8,13 +9,14 @@ const Input = ({ value, error, onChange, + className, placeholder, type = "text", }) => { const uuid = uuidv4(); return ( -
+