s412146/angular-develop-client
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

full layout added

Browse Source
This commit is contained in:
Dawid Kubicki 2019-01-13 12:17:16 +01:00
parent ac24169069
commit 17c0a90807
3 changed files with 356 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/app/admin/admin.component.html
View File

@ -1,25 +1,68 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6">
<h3>Dodawanie nowych urządzeń</h3> <h3>Dodawanie nowych urządzeń</h3>
<form class="admin-form"> <form class="admin-form">
<div class="input-wrapper"> <div class="input-wrapper">
<mat-form-field class="admin-full-width"> <mat-form-field class="admin-full-width">
<input matInput #message maxlength="256" placeholder="Message" /> <input
matInput
#nameDevice
maxlength="256"
placeholder="Nazwa urządzenia"
/>
<mat-hint align="start" <mat-hint align="start"
><strong>Don't disclose personal info</strong> ><strong
>Podaj nazwę czujnika (w przypadku ESPEasy name device)</strong
>
</mat-hint> </mat-hint>
<mat-hint align="end">{{ message.value.length }} / 256</mat-hint> <mat-hint align="end">{{ nameDevice.value.length }} / 100</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="input-wrapper"> <div class="input-wrapper">
<mat-form-field class="admin-full-width"> <mat-form-field class="admin-full-width">
<input matInput #message maxlength="256" placeholder="Message" /> <input
matInput
#ipDevice
maxlength="256"
placeholder="Adres IP urządzenia"
/>
<mat-hint align="start" <mat-hint align="start"
><strong>Don't disclose personal info</strong> ><strong>Podaj przypisany do urządzenia stały adres IP</strong>
</mat-hint> </mat-hint>
<mat-hint align="end">{{ message.value.length }} / 256</mat-hint> <mat-hint align="end">{{ ipDevice.value.length }} / 15</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="example-button-row">
<button mat-flat-button color="primary">Dodaj urządzenie</button>
</div>
</form> </form>
</div> </div>
<div class="col-md-6">
<h3>Usuwanie urządzeń</h3>
<form class="admin-form">
<div class="input-wrapper">
<mat-form-field class="admin-full-width">
<input
matInput
#nameDeleteDevice
maxlength="256"
placeholder="Nazwa urządzenia"
/>
<mat-hint align="start"
><strong
>Podaj nazwę czujnika (w przypadku ESPEasy name device)</strong
>
</mat-hint>
<mat-hint align="end"
>{{ nameDeleteDevice.value.length }} / 100</mat-hint
>
</mat-form-field>
</div>
<div class="example-button-row">
<button mat-flat-button color="accent">Usuń urządzenie</button>
</div>
</form>
</div>
</div>
</div> </div>

202
src/app/admin/admin.component.less
View File

@ -16,4 +16,206 @@
} }
} }
} }
.example-button-row button,
.example-button-row a {
margin-right: 8px;
}
}
table {
width: 100%;
}
.machine-row {
margin-top: 60px;
.machine-text {
color: #000000;
font-size: 36px;
font-weight: 300;
letter-spacing: 2px;
}
.machine-status {
color: #000000;
font-size: 23px;
font-weight: 300;
margin-left: 30px;
margin-top: 50px;
letter-spacing: 0.5px;
img {
width: 15px;
margin-top: -3px;
margin-left: 10px;
}
span {
font-size: 24px;
margin-left: 15px;
top: -10px;
}
}
.machine-status2 {
color: #000000;
font-size: 23px;
font-weight: 300;
margin-left: 30px;
margin-top: 10px;
letter-spacing: 0.5px;
img {
width: 15px;
margin-top: -3px;
margin-left: 10px;
}
span {
font-size: 24px;
margin-left: 15px;
top: -10px;
}
}
.machine-image {
width: 230px;
margin-top: 0px;
margin-left: 50px;
}
}
.stat-wrapper {
margin-left: 30px;
color: #000000;
font-size: 23px;
font-weight: 300;
.stat-text {
color: #000000;
font-size: 36px;
font-weight: 300;
letter-spacing: 2px;
margin-bottom: 30px;
}
}
.button-use {
margin-left: 30px;
margin-top: 20px;
}
.boldMe {
font-weight: 400;
}
.lists {
text-align: center;
font-size: 20px;
}
.machine-list {
margin-right: 0px;
margin-top: 60px;
text-align: center;
}
.row-list {
width: 700px;
display: inline-block;
}
.room-button {
border-radius: 12px;
background-color: white;
border: solid 1px red;
color: red;
padding: 10px;
width: 120px;
margin-bottom: 20px;
}
.room-button:hover {
-webkit-box-shadow: inset 0 0 0 2px #24a1fc;
box-shadow: inset 0 0 0 2px #24a1fc;
}
.room-button:active {
-webkit-box-shadow: inset 0 0 0 2px #24a1fc;
box-shadow: inset 0 0 0 2px #24a1fc;
}
.room-button:focus {
-webkit-box-shadow: inset 0 0 0 2px #24a1fc;
box-shadow: inset 0 0 0 2px #24a1fc;
}
@media only screen and (max-width: 1000px) {
.machine-image {
margin-left: 50px;
display: none;
}
}
@media only screen and (max-width: 800px) {
.machine-row {
.machine-text {
font-size: 30px;
}
}
.stat-wrapper {
.stat-text {
font-size: 30px;
}
}
}
.col-xs-3 {
margin-left: -5px;
}
@media only screen and (max-width: 700px) {
.row-list {
width: 100%;
}
}
@media only screen and (max-width: 600px) {
.room-button {
width: 100px;
font-size: 12px;
padding: 3px;
}
.machine-list {
margin-top: 60px;
}
}
@media only screen and (max-width: 500px) {
table {
width: 50%;
}
.room-button {
width: 80px;
font-size: 10px;
padding-top: 10px;
padding-bottom: 10px;
}
.machine-row {
.machine-text {
font-size: 24px;
}
}
.stat-wrapper {
.stat-text {
font-size: 20px;
font-weight: 600;
}
}
.stat-wrapper {
.list-group {
span {
font-size: 18px;
}
}
}
} }

185
src/app/status-list/status-list.component.less
View File

@ -1,27 +1,18 @@
table{ table {
width:100%; width: 100%;
} }
.machine-row {
.machine-row{
margin-top: 60px; margin-top: 60px;
.machine-text{ .machine-text {
color: #000000; color: #000000;
font-size: 36px; font-size: 36px;
font-weight: 300; font-weight: 300;
letter-spacing: 2px; letter-spacing: 2px;
} }
.machine-status {
.machine-status{
color: #000000; color: #000000;
font-size: 23px; font-size: 23px;
font-weight: 300; font-weight: 300;
@ -29,19 +20,19 @@ table{
margin-top: 50px; margin-top: 50px;
letter-spacing: 0.5px; letter-spacing: 0.5px;
img{ img {
width: 15px; width: 15px;
margin-top: -3px; margin-top: -3px;
margin-left: 10px; margin-left: 10px;
} }
span{ span {
font-size: 24px; font-size: 24px;
margin-left: 15px; margin-left: 15px;
top: -10px; top: -10px;
} }
} }
.machine-status2{ .machine-status2 {
color: #000000; color: #000000;
font-size: 23px; font-size: 23px;
font-weight: 300; font-weight: 300;
@ -49,32 +40,27 @@ table{
margin-top: 10px; margin-top: 10px;
letter-spacing: 0.5px; letter-spacing: 0.5px;
img{ img {
width: 15px; width: 15px;
margin-top: -3px; margin-top: -3px;
margin-left: 10px; margin-left: 10px;
} }
span{ span {
font-size: 24px; font-size: 24px;
margin-left: 15px; margin-left: 15px;
top: -10px; top: -10px;
} }
} }
.machine-image {
.machine-image{
width: 230px; width: 230px;
margin-top: 0px; margin-top: 0px;
margin-left:50px; margin-left: 50px;
} }
} }
.stat-wrapper {
.stat-wrapper {
margin-left: 30px; margin-left: 30px;
color: #000000; color: #000000;
font-size: 23px; font-size: 23px;
@ -87,144 +73,125 @@ table{
letter-spacing: 2px; letter-spacing: 2px;
margin-bottom: 30px; margin-bottom: 30px;
} }
}
.button-use {
}
.button-use{
margin-left: 30px; margin-left: 30px;
margin-top: 20px; margin-top: 20px;
} }
.boldMe{ .boldMe {
font-weight: 400; font-weight: 400;
} }
.lists{ .lists {
text-align: center; text-align: center;
font-size:20px; font-size: 20px;
} }
.machine-list{ .machine-list {
margin-right:0px; margin-right: 0px;
margin-top:60px; margin-top: 60px;
text-align: center; text-align: center;
} }
.row-list{ .row-list {
width:700px; width: 700px;
display: inline-block; display: inline-block;
} }
.room-button {
.room-button{
border-radius: 12px; border-radius: 12px;
background-color: white; background-color: white;
border: solid 1px red; border: solid 1px red;
color: red; color: red;
padding:10px; padding: 10px;
width:120px; width: 120px;
margin-bottom:20px; margin-bottom: 20px;
} }
.room-button:hover {
.room-button:hover{ -webkit-box-shadow: inset 0 0 0 2px #24a1fc;
-webkit-box-shadow:inset 0 0 0 2px #24a1fc; box-shadow: inset 0 0 0 2px #24a1fc;
box-shadow:inset 0 0 0 2px #24a1fc; }
} .room-button:active {
.room-button:active { -webkit-box-shadow: inset 0 0 0 2px #24a1fc;
-webkit-box-shadow:inset 0 0 0 2px #24a1fc; box-shadow: inset 0 0 0 2px #24a1fc;
box-shadow:inset 0 0 0 2px #24a1fc; }
} .room-button:focus {
.room-button:focus { -webkit-box-shadow: inset 0 0 0 2px #24a1fc;
-webkit-box-shadow:inset 0 0 0 2px #24a1fc; box-shadow: inset 0 0 0 2px #24a1fc;
box-shadow:inset 0 0 0 2px #24a1fc; }
}
@media only screen and (max-width: 1000px) { @media only screen and (max-width: 1000px) {
.machine-image{ .machine-image {
margin-left:50px; margin-left: 50px;
display:none; display: none;
} }
} }
@media only screen and (max-width: 800px) { @media only screen and (max-width: 800px) {
.machine-row{ .machine-row {
.machine-text{ .machine-text {
font-size:30px; font-size: 30px;
} }
} }
.stat-wrapper{ .stat-wrapper {
.stat-text{ .stat-text {
font-size:30px; font-size: 30px;
} }
} }
} }
.col-xs-3{ .col-xs-3 {
margin-left:-5px; margin-left: -5px;
} }
@media only screen and (max-width: 700px) { @media only screen and (max-width: 700px) {
.row-list{ .row-list {
width:100%; width: 100%;
} }
} }
@media only screen and (max-width: 600px) { @media only screen and (max-width: 600px) {
.room-button{ .room-button {
width:100px; width: 100px;
font-size:12px; font-size: 12px;
padding:3px; padding: 3px;
} }
.machine-list{ .machine-list {
margin-top:60px; margin-top: 60px;
} }
} }
@media only screen and (max-width: 500px) { @media only screen and (max-width: 500px) {
table{ table {
width:50%; width: 50%;
} }
.room-button{ .room-button {
width:80px; width: 80px;
font-size:10px; font-size: 10px;
padding-top:10px; padding-top: 10px;
padding-bottom:10px; padding-bottom: 10px;
} }
.machine-row{ .machine-row {
.machine-text{ .machine-text {
font-size:24px; font-size: 24px;
} }
} }
.stat-wrapper{ .stat-wrapper {
.stat-text{ .stat-text {
font-size:20px; font-size: 20px;
font-weight:600; font-weight: 600;
} }
} }
.stat-wrapper {
.stat-wrapper{ .list-group {
.list-group{ span {
span{ font-size: 18px;
font-size:18px;
} }
} }
} }
} }