From d08c4005ada14e356952c740d3049aa55fbabc5b Mon Sep 17 00:00:00 2001 From: Carl Valdemar Ebbesen <ecvebbesen@gmail.com> Date: Mon, 4 Oct 2021 22:01:53 +0200 Subject: [PATCH] goBack button on every page --- src/App.tsx | 5 +++-- src/components/goBack/goBackButton.tsx | 5 +++-- src/pages/commitGraphPage/CommitPage.tsx | 2 ++ src/pages/commitListPage/commitPageWrapper.tsx | 2 ++ src/pages/issueGraphPage/issueGraphPage.tsx | 2 ++ src/pages/issueListPage/issuePage.tsx | 2 ++ 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index f61e34a..5c9d0f0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,16 +1,17 @@ import {Redirect, Route, Switch} from 'react-router'; import LandingPage from "./pages/landingPage/landingPage"; -import OverviewPage from "./pages/overviewPage/Overview"; +import OverviewPage from "./pages/overviewPage/overview"; import { GlobalCommitContext } from './context/commitPageContext'; import { useState } from 'react'; import IssuePage from './pages/issueListPage/issuePage'; import { CommitPage } from './pages/commitGraphPage/CommitPage'; import { IssueGraphPage } from './pages/issueGraphPage/issueGraphPage'; import CommitPageWrapper from "./pages/commitListPage/commitPageWrapper" +import GobackButton from './components/goBack/goBackButton'; function App() { - const [testContext, setTestContext] = useState<string>('Admin'); + const [testContext, setTestContext] = useState<string>('Admin'); return ( <div className="App"> <Switch> diff --git a/src/components/goBack/goBackButton.tsx b/src/components/goBack/goBackButton.tsx index d391b46..ceeca44 100644 --- a/src/components/goBack/goBackButton.tsx +++ b/src/components/goBack/goBackButton.tsx @@ -4,9 +4,10 @@ import style from "./goBackButton.module.css" const GobackButton = () => { const history = useHistory(); - return ( + return( + <button className={style.button} onClick={()=> history.goBack()}>Go back</button> - ); + ); }; export default GobackButton; \ No newline at end of file diff --git a/src/pages/commitGraphPage/CommitPage.tsx b/src/pages/commitGraphPage/CommitPage.tsx index f05eb46..5392c5d 100644 --- a/src/pages/commitGraphPage/CommitPage.tsx +++ b/src/pages/commitGraphPage/CommitPage.tsx @@ -6,6 +6,7 @@ import styles from './CommitPage.module.scss'; import { queryTypes, Commit } from '../../utils/queryType' import "react-loader-spinner/dist/loader/css/react-spinner-loader.css"; import Loader from "react-loader-spinner"; +import GobackButton from '../../components/goBack/goBackButton'; export const CommitPage = () => { const commitData = useGitlabApi(queryTypes.AllCommits); @@ -24,6 +25,7 @@ export const CommitPage = () => { return ( <div className={styles.pageContainer}> + <GobackButton/> <h1>Charts for issues</h1> <BarChart data={commitData.data as Commit[]} title="Commits per day"/> <PieChart data={commitData.data as Commit[]} title={"Commits per member"}/> diff --git a/src/pages/commitListPage/commitPageWrapper.tsx b/src/pages/commitListPage/commitPageWrapper.tsx index 8d78f76..8fbbfee 100644 --- a/src/pages/commitListPage/commitPageWrapper.tsx +++ b/src/pages/commitListPage/commitPageWrapper.tsx @@ -4,6 +4,7 @@ import {useGitlabApi} from "../../utils/gitlab_api_service"; import {queryTypes, Commit} from "../../utils/queryType"; import style from "./commitListPage.module.css" import Loader from "react-loader-spinner"; +import GobackButton from '../../components/goBack/goBackButton'; const CommitPageWrapper = () => { @@ -32,6 +33,7 @@ const CommitPageWrapper = () => { //circles, grid, Oval - standard, return ( <div> + <GobackButton/> <h1>Commits</h1> <div className={style.ArrowDiv}> <button className={style.Button} disabled={disablePrev} onClick={decrease}> diff --git a/src/pages/issueGraphPage/issueGraphPage.tsx b/src/pages/issueGraphPage/issueGraphPage.tsx index 9f44c99..816e30f 100644 --- a/src/pages/issueGraphPage/issueGraphPage.tsx +++ b/src/pages/issueGraphPage/issueGraphPage.tsx @@ -1,5 +1,6 @@ import { useEffect } from 'react'; import Loader from 'react-loader-spinner'; +import GobackButton from '../../components/goBack/goBackButton'; import { BarChart } from '../../components/graphs/barChart/barChart'; import { PieChart } from '../../components/graphs/pieChart/pieChart'; import { useGitlabApi } from '../../utils/gitlab_api_service'; @@ -25,6 +26,7 @@ export const IssueGraphPage = () => { return ( <div className={styles.pageContainer}> + <GobackButton/> <h1>Charts for issues</h1> <BarChart data={commitData.data as Issue[]} title="Issues authored per day"/> <PieChart data={commitData.data as Issue[]} title={"Issues authored per member"}/> diff --git a/src/pages/issueListPage/issuePage.tsx b/src/pages/issueListPage/issuePage.tsx index 82c679d..7972a6c 100644 --- a/src/pages/issueListPage/issuePage.tsx +++ b/src/pages/issueListPage/issuePage.tsx @@ -4,12 +4,14 @@ import styles from "./issuePage.module.css"; import {useGitlabApi} from "../../utils/gitlab_api_service"; import {queryTypes, Issue} from "../../utils/queryType"; import ClipLoader from "react-spinners/ClipLoader"; +import GobackButton from '../../components/goBack/goBackButton'; const IssuePage = () => { const {isLoading, error, data} = useGitlabApi(queryTypes.AllIssues) return ( <div className={styles.container}> + <GobackButton/> <h1 className={styles.headline}> Issues </h1> {isLoading ? <ClipLoader loading={isLoading}/> : <IssuesListComponent issues={data! as Issue[]} />} </div> -- GitLab