Skip to content

Commit

Permalink
Merge pull request #95 from open-source-labs/dev
Browse files Browse the repository at this point in the history 
Volume history bug fixes
  • Loading branch information
@errc-lee
errc-lee authored Oct 8, 2021
2 parents 5dec141 + 4a25c1d commit baab097
Show file tree
Hide file tree
Showing 15 changed files with 119 additions and 93 deletions.
43 changes: 29 additions & 14 deletions src/components/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ body {
background: #042331;
}

i {
color: rgb(105, 105, 72);
transition: 0.3s;
}

ul {
width: 100%;
list-style-type: none;
margin: 0;
padding: 0;
}

.container {
display: flex;
background: #042331;
Expand Down Expand Up @@ -62,6 +74,7 @@ body {
background: #e1e4e6;
/* min-width: 78vw; */
}

.header span {
font-size: 24px;
}
Expand Down Expand Up @@ -221,18 +234,6 @@ body {
padding-left: 25px;
}

i {
color: rgb(105, 105, 72);
transition: 0.3s;
}

ul {
width: 100%;
list-style-type: none;
margin: 0;
padding: 0;
}

.box-button {
position: relative;
text-align: center;
Expand All @@ -257,11 +258,15 @@ ul {
}

.stopped-info {
font-size: 14px;
margin-left: 5px;
margin-right: 5px;
}

.stopped-info ul {
font-size: 14px;
overflow: hidden;
}

.stopped-button {
text-align: center;
background: white;
Expand Down Expand Up @@ -611,11 +616,11 @@ ul {
.toggle-button {
text-align: center;
}

.toggle-button-detail {
font-size: 12px;
padding: 0px 75px;
}

.arrow {
color: white;
}
Expand Down Expand Up @@ -656,3 +661,13 @@ ul {
color: #052e41c0;
background-color: white;
}

.volume-container-details {
padding: 5px;
border-top: lightgray solid 2px;
overflow: hidden;
}

.volume-container-details ul {
margin-left: 1rem;
}
2 changes: 1 addition & 1 deletion src/components/display/LineChartDisplay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ const Metrics = (props) => {
<label htmlFor='12-hours'> 12 hours</label>
<input type='radio' id='other' name='timePeriod' value='24'></input>
<label htmlFor='24-hours'> 24 hours</label>
<br></br>
<br/>
{currentList}
</form>
<div></div>
Expand Down
16 changes: 8 additions & 8 deletions src/components/display/NewUserDisplay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ const NewUserDisplay = () => {
<p>
Create a new Docketeer account for an employee. Please confirm with the employee that their information is accurate before submitting.
</p>
<br></br>
<br/>
<p>
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.
</p>
<br></br>
<br/>
<form className={classes.root} >
<TextField
id="signupEmail"
label="Email"
variant="outlined"
/>
<br></br>
<br/>
<TextField
id="signupUsername"
label="Username"
variant="outlined"
/>
<br></br>
<br/>
<TextField
id="signupPassword"
label="Password"
Expand All @@ -63,7 +63,7 @@ const NewUserDisplay = () => {
onChange={() => checkPasswordLength()}
/>
<span id="password-length-alert"></span>
<br></br>
<br/>
<TextField
id="signupPasswordConfirmation"
label="Confirm Password"
Expand All @@ -72,7 +72,7 @@ const NewUserDisplay = () => {
onChange={() => confirmPassword()}
/>
<span id="password-confirmation-alert"></span>
<br></br>
<br/>
<TextField
id="signupPhone"
label="Phone"
Expand All @@ -82,9 +82,9 @@ const NewUserDisplay = () => {
checkPhone(document.getElementById('signupPhone').value);
}
}
/><br></br>
/><br/>
<span id="phone-alert"></span>
<br></br>
<br/>
<Button
variant="contained"
size="medium"
Expand Down
15 changes: 7 additions & 8 deletions src/components/login/login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ const Login = () => {
<header>
<img src={Docketeer} width={160} />
</header>
<br></br>
<br></br>
<br></br>
<br/>
<br/>
<br/>
<div className="renderContainers">
<div className="header">
<h1 className="tabTitle">Login</h1>
Expand All @@ -142,18 +142,17 @@ const Login = () => {
<form className={classes.root} onSubmit={handleLogin}>
{/* <input id="username" type="text" placeholder="username"></input> */}
<TextField id="username" label="Username" variant="outlined" />
<br></br>
<br></br>
<br/>
<br/>
{/* <input id="password" type="password" placeholder="password"></input> */}
<TextField id="password" label="Password" type="password" variant="outlined" />
{/* <input type="submit"></input> */}
<br></br>
<br/>
<Button variant="contained" color="primary" type="submit" size="medium" className={classes.button}>
Login
</Button>
<hr></hr>
<hr/>
<div className="g-signin2" data-onsuccess="onSignIn" style={{width: '200px', borderRadius:'4px'}}></div>

</form>
</div>
</div>
Expand Down
14 changes: 11 additions & 3 deletions src/components/tabs/Containers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,17 @@ const Containers = (props) => {
</div>

<div className="stopped-info">
<li>Img: {container.Image}</li>
<li>Created: {container.RunningFor}</li>
<li>name: {container.Names}</li>
<ul>
<li>
<strong>Img: </strong>{container.Image}
</li>
<li>
<strong>Created: </strong>{container.RunningFor}
</li>
<li>
<strong>Name: </strong>{container.Names}
</li>
</ul>
</div>
<div className="stopped-button">
<button
Expand Down
18 changes: 13 additions & 5 deletions src/components/tabs/ContainersUser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,17 @@ const Containers = (props) => {
</div>

<div className="stopped-info">
<li>Img: {container.Image}</li>
<li>Created: {container.RunningFor}</li>
<li>name: {container.Names}</li>
<ul>
<li>
<strong>Img: </strong> {container.Image}
</li>
<li>
<strong>Created: </strong>{container.RunningFor}
</li>
<li>
<strong>Name: </strong>{container.Names}
</li>
</ul>
</div>
</div>
);
Expand Down Expand Up @@ -120,8 +128,8 @@ const Containers = (props) => {
</div>
</div>
<ToggleDisplay container={container} />
<br></br>
<br></br>
<br/>
<br/>
</div>
</div>
);
Expand Down
16 changes: 8 additions & 8 deletions src/components/tabs/Images.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ const Images = (props) => {
<p>{ele['tag']}</p>
</div>
<div className="stopped-info">
<li>
<strong>ID:</strong>
{ele['imgid']}
</li>
<li>
<strong>Size:</strong>
{ele['size']}
</li>
<ul>
<li>
<strong>ID: </strong>{ele['imgid']}
</li>
<li>
<strong>Size: </strong>{ele['size']}
</li>
</ul>
</div>
<div className="stopped-button">
<button
Expand Down
19 changes: 9 additions & 10 deletions src/components/tabs/ImagesUser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@ const Images = (props) => {
<p>{ele['tag']}</p>
</div>
<div className="stopped-info">
<li>
<strong>ID:</strong>
{ele['imgid']}
</li>
<li>
<strong>Size:</strong>
{ele['size']}
</li>
<ul>
<li>
<strong>ID: </strong>{ele['imgid']}
</li>
<li>
<strong>Size: </strong>{ele['size']}
</li>
</ul>
</div>
<br></br>
<br></br>
<br/><br/>
</div>
);
});
Expand Down
28 changes: 14 additions & 14 deletions src/components/tabs/Settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,9 @@ const Settings = (props) => {
<p>
Allows you to (i) connect a mobile phone to your account, and (ii) choose your preferred method of communication.
</p>
<br></br>
<br/>
<p>1. Verify your mobile phone number on Twilio</p>
<br></br>
<br/>
<form className={classes.root} autoComplete="off">
<div>
<TextField
Expand Down Expand Up @@ -661,13 +661,13 @@ const Settings = (props) => {
) : null}

<p>2. Contact preference:</p>
<br></br>
<br/>
<FormControl component="fieldset">
<RadioGroup aria-label="Contact Preferences" name="contact_pref" value={value} onChange={handleRadioChange}>
<FormControlLabel value="email" control={<Radio />} label="Email" />
<FormControlLabel value="phone" control={<Radio />} label="Phone" />
</RadioGroup>
<br></br>
<br/>
<Button
className={classes.button}
size="medium"
Expand All @@ -689,11 +689,11 @@ const Settings = (props) => {
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.
</p>

<br></br>
<br/>
<p>
1. Setup / update notification criteria
</p>
<br></br>
<br/>
<div>
<form className={classes.root} autoComplete="off">
<TextField
Expand Down Expand Up @@ -743,9 +743,9 @@ const Settings = (props) => {
</form>
</div>

<br></br>
<br/>
<p>2. Configure notification thresholds</p>
<br></br>
<br/>
<form className={classes.root} autoComplete="off">
Current CPU Threshold: {`>${cpu_threshold}%`}
<div>
Expand All @@ -768,9 +768,9 @@ const Settings = (props) => {
>
Confirm
</Button>
<br></br>
<br/>
Current Memory Threshold: {`>${mem_threshold}%`}
<br></br>
<br/>
<TextField
required
id="mem-threshold-input"
Expand All @@ -791,11 +791,11 @@ const Settings = (props) => {
>
Confirm
</Button>
<br></br>
<br/>
{/* <p>2. Receive notification if container stops</p>
<FormControlLabel value={true} control={<Checkbox />} label="" />
<br></br> */}
<br></br>
<br/> */}
<br/>
<p>3. Stopped containers:</p>
<FormControlLabel value={true} control={<Checkbox id="stopped-containers-input" onChange={handleStoppedContainersChange}/>} label="Receive notification when a container stops" />
</div>
Expand All @@ -819,7 +819,7 @@ const Settings = (props) => {
Allows you to get access to latest GitHub commits in your project
repository on "Metrics" tab for selected containers
</p>
<br></br>
<br/>
<p>
1. Add GitHub repositories url in Containers settings table below
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/tabs/Users.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ const UserTable = () => {
</Table>
</TableContainer>
</div>
<br></br>
<br/>
<NewUserDisplay />
</div>
);
Expand Down
Loading

0 comments on commit baab097

Please sign in to comment.