diff --git a/src/App.tsx b/src/App.tsx
index c56000d0086334d0d6c5a05d5bd16c33ec35dc98..5c9d0f0f5675a7a39f31c0939b0fde5103d695c7 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/issuePage';
+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.module.css b/src/components/goBack/goBackButton.module.css
new file mode 100644
index 0000000000000000000000000000000000000000..def165a329288c2f943d5b5fbafc000b51caa50c
--- /dev/null
+++ b/src/components/goBack/goBackButton.module.css
@@ -0,0 +1,14 @@
+.button {
+ padding: 10px;
+ border-radius: 16px;
+ background-color: #F5CA7B;
+ font-size: 16px;
+ position: absolute;
+ left: 30px;
+ top: 30px;
+ cursor: pointer;
+}
+
+.button:hover{
+ background-color: #f3d295;
+}
\ No newline at end of file
diff --git a/src/components/goBack/goBackButton.tsx b/src/components/goBack/goBackButton.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..ceeca444e68f31cc96a0b5a93b39f971c31b12a0
--- /dev/null
+++ b/src/components/goBack/goBackButton.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { useHistory } from 'react-router';
+import style from "./goBackButton.module.css"
+
+const GobackButton = () => {
+ const history = useHistory();
+ 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 f05eb4689f36ed50a22adc005134de23d071ec42..5392c5d38574cac8be6f319b239d00cd94a71e6a 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 8d78f76bbc61d8a8ac38ea01fe907a859d15d458..8fbbfeeb96d1039b4f356cc1227c2c2218a6ebc1 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 9f44c99d20cc405576b78c7b6f930135b451ca33..816e30fdd4f9494c992b796025539297b844adcd 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/issuePage.module.css b/src/pages/issueListPage/issuePage.module.css
similarity index 100%
rename from src/pages/issuePage.module.css
rename to src/pages/issueListPage/issuePage.module.css
diff --git a/src/pages/issuePage.tsx b/src/pages/issueListPage/issuePage.tsx
similarity index 62%
rename from src/pages/issuePage.tsx
rename to src/pages/issueListPage/issuePage.tsx
index 150d9b23ae1ee715c3c7d687f2ad6ae1971137d2..7972a6caec4772de75762a9b4513338a81c6c29a 100644
--- a/src/pages/issuePage.tsx
+++ b/src/pages/issueListPage/issuePage.tsx
@@ -1,15 +1,17 @@
import React from 'react';
-import IssuesListComponent from "../components/issuesListComponent/issuesListComponent";
+import IssuesListComponent from "../../components/issuesListComponent/issuesListComponent";
import styles from "./issuePage.module.css";
-import {useGitlabApi} from "../utils/gitlab_api_service";
-import {queryTypes, Issue} from "../utils/queryType";
+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>
diff --git a/src/pages/overviewPage/Overview.tsx b/src/pages/overviewPage/Overview.tsx
index 8824980ebc56d5632b0cfc6b96351bf6d4d5bef8..5416261d5e479f59cd1453d10ceae677b1b59ff4 100644
--- a/src/pages/overviewPage/Overview.tsx
+++ b/src/pages/overviewPage/Overview.tsx
@@ -4,6 +4,7 @@ import { useGitlabApi } from '../../utils/gitlab_api_service';
import { Languages, queryTypes } from '../../utils/queryType';
import StatsBox from '../../components/stats/statsBox';
import { ClipLoader } from 'react-spinners';
+import GobackButton from '../../components/goBack/goBackButton';
const OverviewPage = () => {
const slug = window.location.pathname;
@@ -13,11 +14,12 @@ const OverviewPage = () => {
return (
<div className={style.wrapper}>
+ <GobackButton/>
{slug==="/overview" ?<h1>Stats:</h1>: null}
{isLoading ? <ClipLoader loading={isLoading}/> :
slug==="/overview" ?<StatsBox content={data as Languages ? Object.entries(data as Languages).map(element => `${element[0]}: ${element[1]} %`): ["Loading ..."] } />
:null}
- <h2 style={{marginTop: "30px"}}>{slug=== "/overview" ?"More info:": "Choose display form"}</h2>
+ <h2 style={{marginTop: "30px"}}>{slug=== "/overview" ?"More info:": "Choose display form:"}</h2>
<div className={style.buttonWrapper}>
<button className={style.button} onClick= {() => history.push(slug=== "/overview" ? "/issue" : `${slug}graph`)}>
{slug=== "/overview" ? "Issues" : "Graph"}