From 318393116e96077b982ac84c0c008cfb0a144e91 Mon Sep 17 00:00:00 2001
From: andreasrys <andrerys@stud.ntnu.no>
Date: Mon, 4 Oct 2021 20:06:27 +0200
Subject: [PATCH] fix conflicts
---
src/App.tsx | 3 ++-
.../commitListPage.module.css} | 0
.../commitPage.tsx => commitListPage/commitListPage.tsx} | 4 ++--
.../{CommitPage => commitListPage}/commitPageWrapper.tsx | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
rename src/pages/{CommitPage/commitPage.module.css => commitListPage/commitListPage.module.css} (100%)
rename src/pages/{CommitPage/commitPage.tsx => commitListPage/commitListPage.tsx} (94%)
rename src/pages/{CommitPage => commitListPage}/commitPageWrapper.tsx (95%)
diff --git a/src/App.tsx b/src/App.tsx
index 38f222b..c56000d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,6 +7,7 @@ import { useState } from 'react';
import IssuePage from './pages/issuePage';
import { CommitPage } from './pages/commitGraphPage/CommitPage';
import { IssueGraphPage } from './pages/issueGraphPage/issueGraphPage';
+import CommitPageWrapper from "./pages/commitListPage/commitPageWrapper"
function App() {
const [testContext, setTestContext] = useState<string>('Admin');
@@ -32,7 +33,7 @@ function App() {
<IssueGraphPage />
</Route>
<Route exact path={"/commitlist"}>
-
+ <CommitPageWrapper/>
</Route>
<Route exact path={"/commitgraph"}>
<GlobalCommitContext.Provider value = {{testContext, setTestContext}}>
diff --git a/src/pages/CommitPage/commitPage.module.css b/src/pages/commitListPage/commitListPage.module.css
similarity index 100%
rename from src/pages/CommitPage/commitPage.module.css
rename to src/pages/commitListPage/commitListPage.module.css
diff --git a/src/pages/CommitPage/commitPage.tsx b/src/pages/commitListPage/commitListPage.tsx
similarity index 94%
rename from src/pages/CommitPage/commitPage.tsx
rename to src/pages/commitListPage/commitListPage.tsx
index 948178a..25c0240 100644
--- a/src/pages/CommitPage/commitPage.tsx
+++ b/src/pages/commitListPage/commitListPage.tsx
@@ -1,7 +1,7 @@
import React, {FC, useState} from 'react';
import {Commit} from "../../utils/queryType";
import Select, {SingleValue} from "react-select";
-import style from "./commitPage.module.css"
+import style from "./commitListPage.module.css"
interface iSingleCommit {
@@ -26,7 +26,7 @@ const SingleCommit: FC<iSingleCommit> = (props) => {
<div className={style.Description}>
<b>Author: </b>
<p>
- {props.author_name} at {props.created_at.getUTCDate()}.{props.created_at.getUTCMonth()}
+ {props.author_name} at {props.created_at.getUTCDate()}.{props.created_at.getUTCMonth()+1}
- {props.created_at.getUTCHours()}:{props.created_at.getUTCMinutes()}
</p>
</div>
diff --git a/src/pages/CommitPage/commitPageWrapper.tsx b/src/pages/commitListPage/commitPageWrapper.tsx
similarity index 95%
rename from src/pages/CommitPage/commitPageWrapper.tsx
rename to src/pages/commitListPage/commitPageWrapper.tsx
index 8226bfc..8d78f76 100644
--- a/src/pages/CommitPage/commitPageWrapper.tsx
+++ b/src/pages/commitListPage/commitPageWrapper.tsx
@@ -1,8 +1,8 @@
import React, {useEffect, useState} from 'react';
-import CommitComponent from "./commitPage";
+import CommitComponent from "./commitListPage"
import {useGitlabApi} from "../../utils/gitlab_api_service";
import {queryTypes, Commit} from "../../utils/queryType";
-import style from "./commitPage.module.css"
+import style from "./commitListPage.module.css"
import Loader from "react-loader-spinner";
--
GitLab