Skip to content

Commit

Permalink
Merge pull request #133 from simplitrac/hamburgermenu-for-chart-and-edit
Browse files Browse the repository at this point in the history
added hamburger menu to edit and chart pages
  • Loading branch information
anpaulan authored Sep 8, 2024
2 parents 22f98fd + f29f80a commit 07076f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions client/src/components/Chart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
import BackButton from "./BackButton.jsx";
import { auth, onAuthStateChanged } from "../config/initializeFirestore.js";
import '../App.css';
import HamburgerMenu from "./HamburgerMenu.jsx";

function App() {
const [userId, setUserId] = useState("");
Expand Down Expand Up @@ -40,6 +41,7 @@ function App() {
return (
<div className="App">
<h1>SimpliTrac</h1>
<HamburgerMenu />
<LookerStudioChart dimensions={dimensions} userEmail={userEmail} />
<BackButton />
</div>
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/EditTransactionsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import BackButton from "./BackButton.jsx";
import '../App.css';
import { Button } from "@chakra-ui/react";
import EditTransactionsJoyride from './EditTransactionJoyride.jsx';
import HamburgerMenu from "./HamburgerMenu.jsx";

const EditTransactionsPage = () => {
const { user, setUser, setScreen, setServerResponse, runEditTransactionsTour, setRunEditTransactionsTour } = useContext(AppContext);
Expand Down Expand Up @@ -93,6 +94,7 @@ const EditTransactionsPage = () => {

return (
<>
<HamburgerMenu />
<EditTransactionsJoyride />
<form onSubmit={handleSubmit(onSubmit)} data-tour="edit-transactions-form">
<div className="edit-buttons">
Expand Down

0 comments on commit 07076f4

Please sign in to comment.