Skip to content

Commit 130709a

Browse files
committed
replace ugly exit button with new one
1 parent 9367fbb commit 130709a

File tree

8 files changed

+115
-73
lines changed

8 files changed

+115
-73
lines changed

ui/package-lock.json

Lines changed: 40 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/src/Components/DashBoard/Repository/GitComponents/GitDiffViewComponent.js

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { GIT_TRACKED_FILES } from "../../../../actionStore";
77
import { ContextProvider } from "../../../../context";
88
import "../../../../prism.css";
99
import { globalAPIEndpoint } from "../../../../util/env_config";
10-
import "../../../styles/GitDiffView.css";
1110
import "prismjs/components/prism-markdown";
1211

1312
export default function GitDiffViewComponent() {
@@ -99,17 +98,28 @@ export default function GitDiffViewComponent() {
9998
let fileName = splitEntry[splitEntry.length - 1];
10099

101100
return (
102-
<div className="git-diff--files--list" title={fileEntry}>
103-
<div className="bg-gray-100 p-1 rounded">
104-
<div className="git-diff--files--label">Directory:</div>
105-
<div className="git-diff--files--directory">{dirSplit}</div>
101+
<div
102+
className="my-2 block cursor-pointer border border-dashed border-blue-800"
103+
title={fileEntry}
104+
>
105+
<div className="bg-gray-50 p-1 rounded">
106+
<div className="font-sans font-semibold text-blue-400">
107+
Directory:
108+
</div>
109+
<div className="text-gray-500 truncate font-light">
110+
{dirSplit}
111+
</div>
112+
</div>
113+
<div className="mx-1 my-2 text-sm font-sans text-blue-800">
114+
{fileName}
106115
</div>
107-
<div className="git-diff--files--filename_sm">{fileName}</div>
108116
</div>
109117
);
110118
} else {
111119
return (
112-
<span className="git-diff--files--filename_lg">{fileEntry}</span>
120+
<span className="text-lg p-2 border-b-2 border-gray-200 w-full">
121+
{fileEntry}
122+
</span>
113123
);
114124
}
115125
};
@@ -263,10 +273,10 @@ export default function GitDiffViewComponent() {
263273
if (line[0] && line[0] === "+") {
264274
return (
265275
<div
266-
className="git-diff--codeview--change bg-green-100"
276+
className="w-full flex items-center gap-1 bg-green-100 w-screen"
267277
key={`${line}-${uuidv4()}`}
268278
>
269-
<div className="git-diff--codeview--linenumber border-green-400 text-green-500">
279+
<div className="font-sans text-center w-16 mx-2 border-r border-green-400 text-green-500">
270280
{++lineCounter}
271281
</div>
272282
<pre className="w-5/6 mx-2">
@@ -285,10 +295,10 @@ export default function GitDiffViewComponent() {
285295
} else if (line[0] && line[0] === "-") {
286296
return (
287297
<div
288-
className="git-diff--codeview--change bg-red-100"
298+
className="w-full flex items-center gap-1 bg-red-100 w-screen"
289299
key={`${line}-${uuidv4()}`}
290300
>
291-
<div className="git-diff--codeview--linenumber border-red-400 text-red-400">
301+
<div className="font-sans text-center w-16 mx-2 border-r border-red-400 text-red-400">
292302
-
293303
</div>
294304
<pre className="w-5/6 mx-2">
@@ -308,13 +318,13 @@ export default function GitDiffViewComponent() {
308318
if (line[0]) {
309319
return (
310320
<div
311-
className="git-diff--codeview--change bg-white-200 "
321+
className="w-full flex items-center gap-1 bg-white-200 w-screen"
312322
key={`${line}-${uuidv4()}`}
313323
>
314-
<div className="git-diff--codeview--linenumber">
324+
<div className="font-sans text-gray-300 text-center w-16 mx-2 border-r border-gray-200">
315325
{++lineCounter}
316326
</div>
317-
<pre className="w-5/6">
327+
<pre className="w-5/6 mx-2">
318328
<code
319329
dangerouslySetInnerHTML={{
320330
__html: Prism.highlight(
@@ -345,33 +355,38 @@ export default function GitDiffViewComponent() {
345355
<>
346356
{changedFiles && changedFiles.length > 0 ? (
347357
<>
348-
<div className="git-diff--wrapper">
349-
<div className="git-diff--files" style={{ height: "880px" }}>
358+
<div className="w-full flex justify-center mx-auto">
359+
<div
360+
className="overflow-auto break-words p-3 bg-white border-2 border-dashed border-gray-300 w-1/4 rounded-lg shadow-md"
361+
style={{ height: "880px" }}
362+
>
350363
{getDiffFiles()}
351364
</div>
352365

353366
{!activeFileName ? (
354-
<div className="git-diff--msg">
355-
Click on a file to see difference information
367+
<div className="mt-4 p-4 mb-auto bg-gray-200 rounded shadow w-1/2 font-sans font-semibold mx-auto flex justify-center text-center">
368+
Click on a file to see difference
356369
</div>
357370
) : (
358371
""
359372
)}
360373

361374
{warnStatus ? (
362-
<div className="git-diff--warn">{warnStatus}</div>
375+
<div className="mx-auto my-auto block bg-yellow-200 text-yellow-700 p-5 text-xl font-semibold rounded-lg shadow border border-b-2 border-dashed border-yellow-300">
376+
{warnStatus}
377+
</div>
363378
) : null}
364379

365380
{diffStatState &&
366381
diffStatState !== "Click on a file item to see the difference" &&
367382
!warnStatus ? (
368-
<div className="git-diff--codeview">
383+
<div className="w-3/4 mx-auto my-auto break-all p-3">
369384
{diffStatState ? statFormat() : ""}
370385
{fileLineDiffState &&
371386
fileLineDiffState !==
372387
"Click on a file item to see the difference" ? (
373388
<div
374-
className="git-diff--codeview--content"
389+
className="p-3 overflow-auto break-words w-full"
375390
style={{ height: "800px" }}
376391
>
377392
{fileLineDiffComponent()}
@@ -388,9 +403,11 @@ export default function GitDiffViewComponent() {
388403
) : (
389404
<>
390405
{isApiCalled ? (
391-
<div className="git-diff--error">No File changes in the repo</div>
406+
<div className="mx-auto bg-yellow-100 w-full my-2 p-3 border-dashed rounded-lg shadow border-b-4 border-yellow-400 text-xl font-sans font-semibold text-center text-yellow-600">
407+
No File changes in the repo
408+
</div>
392409
) : (
393-
<div className="git-diff--loader">
410+
<div className="w-full p-4 mx-auto text-center font-sans font-semibold text-xl rounded-lg shadow my-2 bg-pink-50 border-b-4 border-dashed border-pink-400">
394411
<span className="text-gray-400">
395412
Fetching changed files from the server...
396413
</span>

ui/src/Components/DashBoard/Repository/GitComponents/GitOperation/CommitComponent.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import axios from "axios";
22
import React, { useEffect, useRef, useState } from "react";
33
import { globalAPIEndpoint } from "../../../../../util/env_config";
4-
import "../../../../styles/GitOperations.css";
54

65
export default function CommitComponent(props) {
76
const { repoId } = props;

0 commit comments

Comments
 (0)