Skip to content

Commit baab097

Browse files
errc-leeerrc-lee
authored
Merge pull request #95 from open-source-labs/dev
Volume history bug fixes
2 parents 5dec141 + 4a25c1d commit baab097

File tree

15 files changed

+119
-93
lines changed

15 files changed

+119
-93
lines changed

‎src/components/css/styles.css‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ body {
1414
background: #042331;
1515
}
1616

17+
i {
18+
color: rgb(105, 105, 72);
19+
transition: 0.3s;
20+
}
21+
22+
ul {
23+
width: 100%;
24+
list-style-type: none;
25+
margin: 0;
26+
padding: 0;
27+
}
28+
1729
.container {
1830
display: flex;
1931
background: #042331;
@@ -62,6 +74,7 @@ body {
6274
background: #e1e4e6;
6375
/* min-width: 78vw; */
6476
}
77+
6578
.header span {
6679
font-size: 24px;
6780
}
@@ -221,18 +234,6 @@ body {
221234
padding-left: 25px;
222235
}
223236

224-
i {
225-
color: rgb(105, 105, 72);
226-
transition: 0.3s;
227-
}
228-
229-
ul {
230-
width: 100%;
231-
list-style-type: none;
232-
margin: 0;
233-
padding: 0;
234-
}
235-
236237
.box-button {
237238
position: relative;
238239
text-align: center;
@@ -257,11 +258,15 @@ ul {
257258
}
258259

259260
.stopped-info {
260-
font-size: 14px;
261261
margin-left: 5px;
262262
margin-right: 5px;
263263
}
264264

265+
.stopped-info ul {
266+
font-size: 14px;
267+
overflow: hidden;
268+
}
269+
265270
.stopped-button {
266271
text-align: center;
267272
background: white;
@@ -611,11 +616,11 @@ ul {
611616
.toggle-button {
612617
text-align: center;
613618
}
614-
615619
.toggle-button-detail {
616620
font-size: 12px;
617621
padding: 0px 75px;
618622
}
623+
619624
.arrow {
620625
color: white;
621626
}
@@ -656,3 +661,13 @@ ul {
656661
color: #052e41c0;
657662
background-color: white;
658663
}
664+
665+
.volume-container-details {
666+
padding: 5px;
667+
border-top: lightgray solid 2px;
668+
overflow: hidden;
669+
}
670+
671+
.volume-container-details ul {
672+
margin-left: 1rem;
673+
}

‎src/components/display/LineChartDisplay.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ const Metrics = (props) => {
448448
<label htmlFor='12-hours'> 12 hours</label>
449449
<input type='radio' id='other' name='timePeriod' value='24'></input>
450450
<label htmlFor='24-hours'> 24 hours</label>
451-
<br></br>
451+
<br/>
452452
{currentList}
453453
</form>
454454
<div></div>

‎src/components/display/NewUserDisplay.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ const NewUserDisplay = () => {
3737
<p>
3838
Create a new Docketeer account for an employee. Please confirm with the employee that their information is accurate before submitting.
3939
</p>
40-
<br></br>
40+
<br/>
4141
<p>
4242
Note: For the password, please choose random string of 6 characters, numbers, and symbols. Upon account creation, the user will receive an email with credentials and be able to update their password when logging in.
4343
</p>
44-
<br></br>
44+
<br/>
4545
<form className={classes.root} >
4646
<TextField
4747
id="signupEmail"
4848
label="Email"
4949
variant="outlined"
5050
/>
51-
<br></br>
51+
<br/>
5252
<TextField
5353
id="signupUsername"
5454
label="Username"
5555
variant="outlined"
5656
/>
57-
<br></br>
57+
<br/>
5858
<TextField
5959
id="signupPassword"
6060
label="Password"
@@ -63,7 +63,7 @@ const NewUserDisplay = () => {
6363
onChange={() => checkPasswordLength()}
6464
/>
6565
<span id="password-length-alert"></span>
66-
<br></br>
66+
<br/>
6767
<TextField
6868
id="signupPasswordConfirmation"
6969
label="Confirm Password"
@@ -72,7 +72,7 @@ const NewUserDisplay = () => {
7272
onChange={() => confirmPassword()}
7373
/>
7474
<span id="password-confirmation-alert"></span>
75-
<br></br>
75+
<br/>
7676
<TextField
7777
id="signupPhone"
7878
label="Phone"
@@ -82,9 +82,9 @@ const NewUserDisplay = () => {
8282
checkPhone(document.getElementById('signupPhone').value);
8383
}
8484
}
85-
/><br></br>
85+
/><br/>
8686
<span id="phone-alert"></span>
87-
<br></br>
87+
<br/>
8888
<Button
8989
variant="contained"
9090
size="medium"

‎src/components/login/login.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ const Login = () => {
131131
<header>
132132
<img src={Docketeer} width={160} />
133133
</header>
134-
<br></br>
135-
<br></br>
136-
<br></br>
134+
<br/>
135+
<br/>
136+
<br/>
137137
<div className="renderContainers">
138138
<div className="header">
139139
<h1 className="tabTitle">Login</h1>
@@ -142,18 +142,17 @@ const Login = () => {
142142
<form className={classes.root} onSubmit={handleLogin}>
143143
{/* <input id="username" type="text" placeholder="username"></input> */}
144144
<TextField id="username" label="Username" variant="outlined" />
145-
<br></br>
146-
<br></br>
145+
<br/>
146+
<br/>
147147
{/* <input id="password" type="password" placeholder="password"></input> */}
148148
<TextField id="password" label="Password" type="password" variant="outlined" />
149149
{/* <input type="submit"></input> */}
150-
<br></br>
150+
<br/>
151151
<Button variant="contained" color="primary" type="submit" size="medium" className={classes.button}>
152152
Login
153153
</Button>
154-
<hr></hr>
154+
<hr/>
155155
<div className="g-signin2" data-onsuccess="onSignIn" style={{width: '200px', borderRadius:'4px'}}></div>
156-
157156
</form>
158157
</div>
159158
</div>

‎src/components/tabs/Containers.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,17 @@ const Containers = (props) => {
1818
</div>
1919

2020
<div className="stopped-info">
21-
<li>Img: {container.Image}</li>
22-
<li>Created: {container.RunningFor}</li>
23-
<li>name: {container.Names}</li>
21+
<ul>
22+
<li>
23+
<strong>Img: </strong>{container.Image}
24+
</li>
25+
<li>
26+
<strong>Created: </strong>{container.RunningFor}
27+
</li>
28+
<li>
29+
<strong>Name: </strong>{container.Names}
30+
</li>
31+
</ul>
2432
</div>
2533
<div className="stopped-button">
2634
<button

‎src/components/tabs/ContainersUser.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,17 @@ const Containers = (props) => {
1818
</div>
1919

2020
<div className="stopped-info">
21-
<li>Img: {container.Image}</li>
22-
<li>Created: {container.RunningFor}</li>
23-
<li>name: {container.Names}</li>
21+
<ul>
22+
<li>
23+
<strong>Img: </strong> {container.Image}
24+
</li>
25+
<li>
26+
<strong>Created: </strong>{container.RunningFor}
27+
</li>
28+
<li>
29+
<strong>Name: </strong>{container.Names}
30+
</li>
31+
</ul>
2432
</div>
2533
</div>
2634
);
@@ -120,8 +128,8 @@ const Containers = (props) => {
120128
</div>
121129
</div>
122130
<ToggleDisplay container={container} />
123-
<br></br>
124-
<br></br>
131+
<br/>
132+
<br/>
125133
</div>
126134
</div>
127135
);

‎src/components/tabs/Images.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ const Images = (props) => {
2323
<p>{ele['tag']}</p>
2424
</div>
2525
<div className="stopped-info">
26-
<li>
27-
<strong>ID:</strong>
28-
{ele['imgid']}
29-
</li>
30-
<li>
31-
<strong>Size:</strong>
32-
{ele['size']}
33-
</li>
26+
<ul>
27+
<li>
28+
<strong>ID: </strong>{ele['imgid']}
29+
</li>
30+
<li>
31+
<strong>Size: </strong>{ele['size']}
32+
</li>
33+
</ul>
3434
</div>
3535
<div className="stopped-button">
3636
<button

‎src/components/tabs/ImagesUser.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ const Images = (props) => {
2323
<p>{ele['tag']}</p>
2424
</div>
2525
<div className="stopped-info">
26-
<li>
27-
<strong>ID:</strong>
28-
{ele['imgid']}
29-
</li>
30-
<li>
31-
<strong>Size:</strong>
32-
{ele['size']}
33-
</li>
26+
<ul>
27+
<li>
28+
<strong>ID: </strong>{ele['imgid']}
29+
</li>
30+
<li>
31+
<strong>Size: </strong>{ele['size']}
32+
</li>
33+
</ul>
3434
</div>
35-
<br></br>
36-
<br></br>
35+
<br/><br/>
3736
</div>
3837
);
3938
});

‎src/components/tabs/Settings.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,9 @@ const Settings = (props) => {
597597
<p>
598598
Allows you to (i) connect a mobile phone to your account, and (ii) choose your preferred method of communication.
599599
</p>
600-
<br></br>
600+
<br/>
601601
<p>1. Verify your mobile phone number on Twilio</p>
602-
<br></br>
602+
<br/>
603603
<form className={classes.root} autoComplete="off">
604604
<div>
605605
<TextField
@@ -661,13 +661,13 @@ const Settings = (props) => {
661661
) : null}
662662

663663
<p>2. Contact preference:</p>
664-
<br></br>
664+
<br/>
665665
<FormControl component="fieldset">
666666
<RadioGroup aria-label="Contact Preferences" name="contact_pref" value={value} onChange={handleRadioChange}>
667667
<FormControlLabel value="email" control={<Radio />} label="Email" />
668668
<FormControlLabel value="phone" control={<Radio />} label="Phone" />
669669
</RadioGroup>
670-
<br></br>
670+
<br/>
671671
<Button
672672
className={classes.button}
673673
size="medium"
@@ -689,11 +689,11 @@ const Settings = (props) => {
689689
Allows you to (i) customize monitoring and notification frequency, and (ii) define container conditions that will trigger notifications. When a container hits a threshold, an alert is sent via your preferred method of communication. Recommended values will be used by default.
690690
</p>
691691

692-
<br></br>
692+
<br/>
693693
<p>
694694
1. Setup / update notification criteria
695695
</p>
696-
<br></br>
696+
<br/>
697697
<div>
698698
<form className={classes.root} autoComplete="off">
699699
<TextField
@@ -743,9 +743,9 @@ const Settings = (props) => {
743743
</form>
744744
</div>
745745

746-
<br></br>
746+
<br/>
747747
<p>2. Configure notification thresholds</p>
748-
<br></br>
748+
<br/>
749749
<form className={classes.root} autoComplete="off">
750750
Current CPU Threshold: {`>${cpu_threshold}%`}
751751
<div>
@@ -768,9 +768,9 @@ const Settings = (props) => {
768768
>
769769
Confirm
770770
</Button>
771-
<br></br>
771+
<br/>
772772
Current Memory Threshold: {`>${mem_threshold}%`}
773-
<br></br>
773+
<br/>
774774
<TextField
775775
required
776776
id="mem-threshold-input"
@@ -791,11 +791,11 @@ const Settings = (props) => {
791791
>
792792
Confirm
793793
</Button>
794-
<br></br>
794+
<br/>
795795
{/* <p>2. Receive notification if container stops</p>
796796
<FormControlLabel value={true} control={<Checkbox />} label="" />
797-
<br></br> */}
798-
<br></br>
797+
<br/> */}
798+
<br/>
799799
<p>3. Stopped containers:</p>
800800
<FormControlLabel value={true} control={<Checkbox id="stopped-containers-input" onChange={handleStoppedContainersChange}/>} label="Receive notification when a container stops" />
801801
</div>
@@ -819,7 +819,7 @@ const Settings = (props) => {
819819
Allows you to get access to latest GitHub commits in your project
820820
repository on "Metrics" tab for selected containers
821821
</p>
822-
<br></br>
822+
<br/>
823823
<p>
824824
1. Add GitHub repositories url in Containers settings table below
825825
</p>

‎src/components/tabs/Users.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ const UserTable = () => {
257257
</Table>
258258
</TableContainer>
259259
</div>
260-
<br></br>
260+
<br/>
261261
<NewUserDisplay />
262262
</div>
263263
);

0 commit comments

Comments
 (0)