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

Merge branch '16-add-back-button-on-all-screens' into 'master'

Resolve "Add back button on all screens"

Closes #16

See merge request it2810-h21/team-11/gitlab-visualization!20
parents 0258603b f79654fd
No related branches found
No related tags found
No related merge requests found
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');
......
.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
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
......@@ -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"}/>
......
......@@ -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}>
......
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"}/>
......
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>
......
......@@ -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"}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment