Skip to content

Commit a70e906

Browse files
committed
will fix general styling, nav bar ui, users-table ui in users tab, spacing in processLogs
1 parent 3757168 commit a70e906

File tree

3 files changed

+55
-36
lines changed

3 files changed

+55
-36
lines changed

src/components/css/styles.css

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
header {
1111
display: flex;
1212
justify-content: center;
13+
color: #042331;
1314
}
1415

1516
body {
@@ -19,7 +20,8 @@ body {
1920

2021
i {
2122
color: rgb(105, 105, 72);
22-
transition: 0.3s;
23+
transition: 0.7s;
24+
margin-right: 8px;
2325
}
2426

2527
ul {
@@ -60,7 +62,7 @@ h4 {
6062
padding: 0px 25px 0px 25px;
6163
min-width: 78vw;
6264
height: 100%;
63-
/* flex-wrap: wrap; */
65+
flex-wrap: wrap;
6466
overflow: scroll;
6567
border-radius: 0.3rem;
6668
background: #e1e4e6;
@@ -90,6 +92,10 @@ h4 {
9092
padding-bottom: 120px;
9193
}
9294

95+
.container-heading{
96+
margin: 30px;
97+
}
98+
9399
.settings-container.inner-box {
94100
border-radius: 0.7rem;
95101
}
@@ -110,6 +116,7 @@ h4 {
110116
}
111117

112118
.tabTitle {
119+
margin: 25px;
113120
font-weight: bolder;
114121
font-size: 30px;
115122
}
@@ -220,11 +227,13 @@ h4 {
220227
}
221228

222229
.tab ul li:hover {
223-
border-left: #e1e4e6 12px solid;
230+
/* border-left: #e1e4e6 5px solid; */
231+
224232
}
225233

226234
.tab ul li a:hover {
227235
font-weight: 900;
236+
color: #ecfffe;
228237
}
229238

230239
.tab ul li a:hover i {
@@ -379,12 +388,9 @@ h4 {
379388

380389
.users-container {
381390
border-radius: 0.5rem;
382-
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3),
383-
0 0 40px rgba(0, 0, 0, 0.1) inset;
384-
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3),
385-
0 0 40px rgba(0, 0, 0, 0.1) inset;
386-
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset;
387-
/* overflow: hidden; */
391+
box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px;
392+
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px;
393+
-moz-box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px;
388394
}
389395

390396
.settings-container {
@@ -394,13 +400,11 @@ h4 {
394400
flex-direction: column;
395401
background-color: white;
396402
margin: 20px 0px 20px 0px;
397-
padding: 15px;
398-
-webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3),
399-
0 0 40px rgba(0, 0, 0, 0.1) inset;
400-
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3),
401-
0 0 40px rgba(0, 0, 0, 0.1) inset;
402-
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset;
403+
padding: 30px;
403404
border-radius: 0.5rem;
405+
box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px;
406+
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px;
407+
-moz-box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px;
404408
line-height: 1.5rem;
405409
}
406410

@@ -790,4 +794,9 @@ h4 {
790794
padding: 1vh 1vw;
791795
width: 50vw;
792796
margin: 1vh 1vw 0 0;
797+
border-radius: 0.2rem;
798+
}
799+
800+
.user-table{
801+
height: calc(100% - 70px) !important;
793802
}

src/components/tabs/ProcessLogs.js

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable react/prop-types */
2-
import React from 'react';
3-
import ProcessLogsCard from '../display/ProcessLogsCard';
2+
import React from 'react'
3+
import ProcessLogsCard from '../display/ProcessLogsCard'
44

55
/**
66
* Display all running and stopped containers. Each box can be selected to view process log tables.
@@ -9,42 +9,51 @@ import ProcessLogsCard from '../display/ProcessLogsCard';
99
*/
1010

1111
const ProcessLogs = (props) => {
12-
const renderRunningList = [];
12+
const renderRunningList = []
1313
props.runningList.map((container, index) => {
1414
renderRunningList.push(
1515
<ProcessLogsCard
1616
key={index}
1717
index={index}
1818
container={container}
19-
status='Running'
20-
/>
21-
);
22-
});
19+
status="Running"
20+
/>,
21+
)
22+
})
2323

24-
const renderStoppedList = [];
24+
const renderStoppedList = []
2525
props.stoppedList.map((container, index) => {
2626
renderStoppedList.push(
27-
<ProcessLogsCard key={index} index={index} container={container} status='Stopped' />
28-
);
29-
});
27+
<ProcessLogsCard
28+
key={index}
29+
index={index}
30+
container={container}
31+
status="Stopped"
32+
/>,
33+
)
34+
})
3035

3136
return (
32-
<div className='renderContainers'>
33-
<div className='header'>
34-
<h1 className='tabTitle'>Process Logs</h1>
37+
<div className="renderContainers">
38+
<div className="header">
39+
<h1 className="tabTitle">Process Logs</h1>
3540
</div>
3641

37-
<h3>Running Containers: {props.runningList.length}</h3>
42+
<h3 className="container-heading">
43+
Running Containers: {props.runningList.length}
44+
</h3>
3845

39-
<div className='containers'>{renderRunningList}</div>
46+
<div className="containers">{renderRunningList}</div>
4047

4148
<br></br>
4249

43-
<h3>Stopped Containers: {props.stoppedList.length}</h3>
50+
<h3 className="container-heading">
51+
Stopped Containers: {props.stoppedList.length}
52+
</h3>
4453

45-
<div className='containers'>{renderStoppedList}</div>
54+
<div className="containers">{renderStoppedList}</div>
4655
</div>
47-
);
48-
};
56+
)
57+
}
4958

50-
export default ProcessLogs;
59+
export default ProcessLogs

src/components/tabs/Users.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ const UserTable = () => {
111111
* Double click on the role to access the drop down menu
112112
</Typography>
113113
<DataGrid
114+
className="user-table"
114115
sx={{}}
115116
columns={columns}
116117
rows={userList}

0 commit comments

Comments
 (0)