diff --git a/src/App.tsx b/src/App.tsx index c56000d0086334d0d6c5a05d5bd16c33ec35dc98..f61e34ac5660223ee586689e370cc9846a633bf8 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,7 +4,7 @@ import LandingPage from "./pages/landingPage/landingPage"; 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" 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..d391b462822ff221085d61d31f25bc5ee5978537 --- /dev/null +++ b/src/components/goBack/goBackButton.tsx @@ -0,0 +1,12 @@ +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/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 70% rename from src/pages/issuePage.tsx rename to src/pages/issueListPage/issuePage.tsx index 150d9b23ae1ee715c3c7d687f2ad6ae1971137d2..82c679de23165c7b62238474086ad2456652c310 100644 --- a/src/pages/issuePage.tsx +++ b/src/pages/issueListPage/issuePage.tsx @@ -1,8 +1,8 @@ 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"; const IssuePage = () => { diff --git a/src/pages/overviewPage/Overview.tsx b/src/pages/overviewPage/Overview.tsx index 8824980ebc56d5632b0cfc6b96351bf6d4d5bef8..d15ce067fa859c6bacf1272ed96b4bc5e65a4917 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 from:"}</h2> <div className={style.buttonWrapper}> <button className={style.button} onClick= {() => history.push(slug=== "/overview" ? "/issue" : `${slug}graph`)}> {slug=== "/overview" ? "Issues" : "Graph"}