Skip to content
Snippets Groups Projects
Commit d08c4005 authored by Carl Valdemar Ebbesen's avatar Carl Valdemar Ebbesen
Browse files

goBack button on every page

parent befd6f08
Branches
No related tags found
No related merge requests found
import {Redirect, Route, Switch} from 'react-router'; import {Redirect, Route, Switch} from 'react-router';
import LandingPage from "./pages/landingPage/landingPage"; import LandingPage from "./pages/landingPage/landingPage";
import OverviewPage from "./pages/overviewPage/Overview"; import OverviewPage from "./pages/overviewPage/overview";
import { GlobalCommitContext } from './context/commitPageContext'; import { GlobalCommitContext } from './context/commitPageContext';
import { useState } from 'react'; import { useState } from 'react';
import IssuePage from './pages/issueListPage/issuePage'; import IssuePage from './pages/issueListPage/issuePage';
import { CommitPage } from './pages/commitGraphPage/CommitPage'; import { CommitPage } from './pages/commitGraphPage/CommitPage';
import { IssueGraphPage } from './pages/issueGraphPage/issueGraphPage'; import { IssueGraphPage } from './pages/issueGraphPage/issueGraphPage';
import CommitPageWrapper from "./pages/commitListPage/commitPageWrapper" import CommitPageWrapper from "./pages/commitListPage/commitPageWrapper"
import GobackButton from './components/goBack/goBackButton';
function App() { function App() {
const [testContext, setTestContext] = useState<string>('Admin'); const [testContext, setTestContext] = useState<string>('Admin');
......
...@@ -5,6 +5,7 @@ import style from "./goBackButton.module.css" ...@@ -5,6 +5,7 @@ import style from "./goBackButton.module.css"
const GobackButton = () => { const GobackButton = () => {
const history = useHistory(); const history = useHistory();
return( return(
<button className={style.button} onClick={()=> history.goBack()}>Go back</button> <button className={style.button} onClick={()=> history.goBack()}>Go back</button>
); );
}; };
......
...@@ -6,6 +6,7 @@ import styles from './CommitPage.module.scss'; ...@@ -6,6 +6,7 @@ import styles from './CommitPage.module.scss';
import { queryTypes, Commit } from '../../utils/queryType' import { queryTypes, Commit } from '../../utils/queryType'
import "react-loader-spinner/dist/loader/css/react-spinner-loader.css"; import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
import Loader from "react-loader-spinner"; import Loader from "react-loader-spinner";
import GobackButton from '../../components/goBack/goBackButton';
export const CommitPage = () => { export const CommitPage = () => {
const commitData = useGitlabApi(queryTypes.AllCommits); const commitData = useGitlabApi(queryTypes.AllCommits);
...@@ -24,6 +25,7 @@ export const CommitPage = () => { ...@@ -24,6 +25,7 @@ export const CommitPage = () => {
return ( return (
<div className={styles.pageContainer}> <div className={styles.pageContainer}>
<GobackButton/>
<h1>Charts for issues</h1> <h1>Charts for issues</h1>
<BarChart data={commitData.data as Commit[]} title="Commits per day"/> <BarChart data={commitData.data as Commit[]} title="Commits per day"/>
<PieChart data={commitData.data as Commit[]} title={"Commits per member"}/> <PieChart data={commitData.data as Commit[]} title={"Commits per member"}/>
......
...@@ -4,6 +4,7 @@ import {useGitlabApi} from "../../utils/gitlab_api_service"; ...@@ -4,6 +4,7 @@ import {useGitlabApi} from "../../utils/gitlab_api_service";
import {queryTypes, Commit} from "../../utils/queryType"; import {queryTypes, Commit} from "../../utils/queryType";
import style from "./commitListPage.module.css" import style from "./commitListPage.module.css"
import Loader from "react-loader-spinner"; import Loader from "react-loader-spinner";
import GobackButton from '../../components/goBack/goBackButton';
const CommitPageWrapper = () => { const CommitPageWrapper = () => {
...@@ -32,6 +33,7 @@ const CommitPageWrapper = () => { ...@@ -32,6 +33,7 @@ const CommitPageWrapper = () => {
//circles, grid, Oval - standard, //circles, grid, Oval - standard,
return ( return (
<div> <div>
<GobackButton/>
<h1>Commits</h1> <h1>Commits</h1>
<div className={style.ArrowDiv}> <div className={style.ArrowDiv}>
<button className={style.Button} disabled={disablePrev} onClick={decrease}> <button className={style.Button} disabled={disablePrev} onClick={decrease}>
......
import { useEffect } from 'react'; import { useEffect } from 'react';
import Loader from 'react-loader-spinner'; import Loader from 'react-loader-spinner';
import GobackButton from '../../components/goBack/goBackButton';
import { BarChart } from '../../components/graphs/barChart/barChart'; import { BarChart } from '../../components/graphs/barChart/barChart';
import { PieChart } from '../../components/graphs/pieChart/pieChart'; import { PieChart } from '../../components/graphs/pieChart/pieChart';
import { useGitlabApi } from '../../utils/gitlab_api_service'; import { useGitlabApi } from '../../utils/gitlab_api_service';
...@@ -25,6 +26,7 @@ export const IssueGraphPage = () => { ...@@ -25,6 +26,7 @@ export const IssueGraphPage = () => {
return ( return (
<div className={styles.pageContainer}> <div className={styles.pageContainer}>
<GobackButton/>
<h1>Charts for issues</h1> <h1>Charts for issues</h1>
<BarChart data={commitData.data as Issue[]} title="Issues authored per day"/> <BarChart data={commitData.data as Issue[]} title="Issues authored per day"/>
<PieChart data={commitData.data as Issue[]} title={"Issues authored per member"}/> <PieChart data={commitData.data as Issue[]} title={"Issues authored per member"}/>
......
...@@ -4,12 +4,14 @@ import styles from "./issuePage.module.css"; ...@@ -4,12 +4,14 @@ import styles from "./issuePage.module.css";
import {useGitlabApi} from "../../utils/gitlab_api_service"; import {useGitlabApi} from "../../utils/gitlab_api_service";
import {queryTypes, Issue} from "../../utils/queryType"; import {queryTypes, Issue} from "../../utils/queryType";
import ClipLoader from "react-spinners/ClipLoader"; import ClipLoader from "react-spinners/ClipLoader";
import GobackButton from '../../components/goBack/goBackButton';
const IssuePage = () => { const IssuePage = () => {
const {isLoading, error, data} = useGitlabApi(queryTypes.AllIssues) const {isLoading, error, data} = useGitlabApi(queryTypes.AllIssues)
return ( return (
<div className={styles.container}> <div className={styles.container}>
<GobackButton/>
<h1 className={styles.headline}> Issues </h1> <h1 className={styles.headline}> Issues </h1>
{isLoading ? <ClipLoader loading={isLoading}/> : <IssuesListComponent issues={data! as Issue[]} />} {isLoading ? <ClipLoader loading={isLoading}/> : <IssuesListComponent issues={data! as Issue[]} />}
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment