Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/egalware/webdoorcreator into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-05-22 09:01:26 +02:00
parent d10933c76e 1d9ec9be58
commit 3997aa97e9
4 changed files with 38 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebDoorCreator.UI/Pages/OrdersHomePage.razor
+3 -70
View File
@@ -1,72 +1,5 @@
@page "/OrdersHomePage"
@*<AuthorizeView>
<Authorized>
@if (ord2Show == null)
{
<div class="cardOrders">
<div class="row mb-3">
<div class="fw-bold fs-2 text-start col-4">
WEB DOOR CREATOR
</div>
<div class="d-flex justify-content-between col-8">
<OrderFilter FilterUpdated="updateFilter"></OrderFilter>
<button type="button" class="btn btn-sm btn-success" data-bs-toggle="modal" data-bs-target="#newOrderModal">
<i class="fa-solid fa-plus"></i> Add new order
</button>
</div>
</div>
<div style="min-height: 35rem;">
<OrderList updateRecordCount="UpdateTotCount" actFilter="@currFilter" E_SetOrd2Show="@setOrd2Show" E_currOrderStatus="catchCurrOrder" B_doorChaged="@doorChange" UserCurrCompany="@userCurrCompany" ></OrderList>
</div>
<div class="mt-2">
<EgwCoreLib.Razor.DataPager @ref="pagerOrderHP" PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@totalCount" showLoading="@isLoading" />
</div>
</div>
<!-- Modal Order -->
<div class="modal fade" id="newOrderModal" tabindex="-1" aria-labelledby="newOrderModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="newOrderModalLabel">Insert new order</h1>
</div>
<div class="modal-body">
<div class="w-100">
<div class="form-floating">
<input id="orderCodExt" @bind-value="@orderCodExt" class="form-control w-100 w-100w-100 my-1" />
<label for="orderCodExt" class="form-label">Order external code</label>
</div>
<div class="form-floating">
<textarea id="orderDescr" @bind="@orderDescr" class="form-control w-100" rows="3"></textarea>
<label for="orderDescr" class="form-label">Order description</label>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
@if (orderCodExt != "")
{
<button type="button" class="btn btn-primary" @onclick="()=>addNewOrder(context.User.Identity?.Name!)" data-bs-dismiss="modal">Save changes</button>
}
</div>
</div>
</div>
</div>
}
else
{
<OrderDets E_SendDoor="@SetCurrDoor" E_isEmpty="@setOrd2Null" OrderView="@ord2Show"></OrderDets>
}
@if (currDoor != null)
{
<DoorModal userId="@userId" E_DoorClose="@SetCurrDoor" OrderId="@currDoor.OrderId" CurrDoorId="@currDoor.DoorId"></DoorModal>
}
</Authorized>
</AuthorizeView>*@
<AuthorizeView>
<Authorized>
<div class="w-100 text-center">
@@ -97,7 +30,7 @@
{
<div class="d-flex justify-content-around">
<div class="cardOrders01 wRed01">
<div class="px-5 d-flex justify-content-between flex-wrap align-items-center text-light mb-3" style="--bgStepColor: @stepColor">
<div class="px-5 d-flex justify-content-between flex-wrap align-items-center mb-3" style="--bgStepColor: @stepColor">
<div class="fw-bold fs-2 text-start">
ORDER LIST
</div>
@@ -150,7 +83,7 @@
@if (ord2Show != null)
{
<div class="cardOrders01 wRed02">
<div class="px-5 d-flex justify-content-between flex-wrap align-items-center text-light mb-3">
<div class="px-5 d-flex justify-content-between flex-wrap align-items-center mb-3">
<div class="fw-bold fs-2 text-start">
ORDER LIST
</div>
@@ -196,7 +129,7 @@
</div>
<div class="d-flex justify-content-around">
<div class="cardOrders02 wRed01">
<div class="px-5 d-flex justify-content-between flex-wrap align-items-center text-light mb-3">
<div class="px-5 d-flex justify-content-between flex-wrap align-items-center mb-3">
<div class="fw-bold fs-2 text-start">
DOORS LIST
</div>
WebDoorCreator.UI/Pages/OrdersHomePage.razor.css
+16 -42
View File
@@ -1,28 +1,4 @@
.cardOrders {
width: 100%;
border-radius: 18px;
padding: 1rem 4rem 0.5rem 4rem;
box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px 3px;
/*box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px -9px;*/
margin-top: 0.5rem;
margin-bottom: 1rem;
}
/*div {
background-color: red;
animation-name: example;
animation-duration: 4s;
}
@keyframes example {
from {
background-color: transparent;
}
to {
background-color: yellow;
}
}*/
.cardOrders {
width: 100%;
border-radius: 18px;
padding: 1rem 4rem 0.5rem 4rem;
@@ -32,7 +8,6 @@
position: relative;
}
.cardOrders01 {
/*box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px -9px;*/
width: 100%;
border-radius: 18px;
padding: 1rem 4rem 0.5rem 4rem;
@@ -41,11 +16,10 @@
margin-bottom: 1rem;
position: relative;
background-color: #FFFFFF;
/*background-image: linear-gradient(to bottom, rgba(145,215,55,1), rgba(145,215,55,50%));*/
color: #000;
z-index: 10;
}
.cardOrders02 {
/*box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px -9px;*/
width: 100%;
border-radius: 18px;
padding: 1rem 4rem 0.5rem 4rem;
@@ -54,11 +28,9 @@
margin-bottom: 1rem;
position: relative;
background-color: #FFFFFF;
/*background-image: linear-gradient(to bottom, rgba(245,115,15,1), rgba(245,115,15,50%));*/
z-index: 20;
}
.cardOrders03 {
/*box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px -9px;*/
width: 100%;
border-radius: 18px;
padding: 1rem 4rem 0.5rem 4rem;
@@ -67,49 +39,51 @@
margin-bottom: 1rem;
position: relative;
background-color: #FFFFFF;
/*background-image: linear-gradient(to bottom, rgba(35,245,135,1), rgba(35,245,135,50%));*/
z-index: 30;
}
.wRed01 {
width: 95%;
margin-bottom: -1.5rem;
background-color: #696969;
color: #FFF;
animation-name: shrink01;
animation-duration: 0.6s;
background-color: #696969;
background-image: none;
}
.wRed02 {
width: 90%;
margin-bottom: -1.5rem;
background-color: #333333;
color: white;
animation-name: shrink02;
animation-duration: 0.6s;
background-color: #333333;
background-image: none;
color: white;
}
@keyframes shrink01 {
0% {
width: 100%;
/*background-image: linear-gradient(to bottom, rgba(145,215,55,1), rgba(145,215,55,50%));*/
background-color: #FFF;
color: black;
}
99% {
80% {
width: 95%;
/*background-color: #FFF;*/
background-color: #696969;
/*background-image: linear-gradient(to bottom, rgba(145,215,55,100%), rgba(145,215,55,50%));*/
color: black;
}
100% {
width: 95%;
background-color: #696969;
color: #FFF;
}
}
@keyframes shrink02 {
from {
0% {
width: 95%;
background-color: #696969;
}
to {
80% {
width: 90%;
color: white;
background-color: #333333;
}
100% {
width: 90%;
}
}
WebDoorCreator.UI/Pages/OrdersHomePage.razor.less
+18 -41
View File
@@ -1,29 +1,4 @@
.cardOrders {
width: 100%;
border-radius: 18px;
padding: 1rem 4rem 0.5rem 4rem;
box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px 3px;
/*box-shadow: rgba(0, 0, 0, 0.45) 0px 20px 22px -9px;*/
margin-top: 0.5rem;
margin-bottom: 1rem;
}
/*div {
background-color: red;
animation-name: example;
animation-duration: 4s;
}
@keyframes example {
from {
background-color: transparent;
}
to {
background-color: yellow;
}
}*/
@animTime: 0.6s;
@animTime: 0.6s;
@w01: 100%;
@w02: 95%;
@w03: 90%;
@@ -42,21 +17,19 @@
.cardOrders01 {
.cardOrders;
background-color: #FFFFFF;
/*background-image: linear-gradient(to bottom, rgba(145,215,55,1), rgba(145,215,55,50%));*/
color: #000;
z-index: 10;
}
.cardOrders02 {
.cardOrders;
background-color: #FFFFFF;
/*background-image: linear-gradient(to bottom, rgba(245,115,15,1), rgba(245,115,15,50%));*/
z-index: 20;
}
.cardOrders03 {
.cardOrders;
background-color: #FFFFFF;
/*background-image: linear-gradient(to bottom, rgba(35,245,135,1), rgba(35,245,135,50%));*/
z-index: 30;
}
@@ -64,49 +37,53 @@
.wRed01 {
width: @w02;
margin-bottom: -1.5rem;
background-color: #696969;
color: #FFF;
animation-name: shrink01;
animation-duration: @animTime;
background-color: #696969;
background-image: none;
}
.wRed02 {
width: @w03;
margin-bottom: -1.5rem;
background-color: #333333;
color: white;
animation-name: shrink02;
animation-duration: @animTime;
background-color: #333333;
background-image: none;
color: white;
}
@keyframes shrink01 {
0% {
width: @w01;
/*background-image: linear-gradient(to bottom, rgba(145,215,55,1), rgba(145,215,55,50%));*/
background-color: #FFF;
color: black;
}
99% {
80% {
width: @w02;
/*background-color: #FFF;*/
background-color: #696969;
/*background-image: linear-gradient(to bottom, rgba(145,215,55,100%), rgba(145,215,55,50%));*/
color: black;
}
100% {
width: @w02;
background-color: #696969;
color: #FFF;
}
}
@keyframes shrink02 {
from {
0% {
width: @w02;
background-color: #696969;
}
to {
80% {
width: @w03;
color: white;
background-color: #333333;
}
100% {
width: @w03;
}
}
WebDoorCreator.UI/Pages/OrdersHomePage.razor.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.cardOrders{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;}.cardOrders{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;}.cardOrders01{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;background-color:#fff;z-index:10;}.cardOrders02{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;background-color:#fff;z-index:20;}.cardOrders03{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;background-color:#fff;z-index:30;}.wRed01{width:95%;margin-bottom:-1.5rem;animation-name:shrink01;animation-duration:.6s;background-color:#696969;background-image:none;}.wRed02{width:90%;margin-bottom:-1.5rem;animation-name:shrink02;animation-duration:.6s;background-color:#333;background-image:none;color:#fff;}@keyframes shrink01{0%{width:100%;}99%{width:95%;background-color:#696969;}100%{width:95%;background-color:#696969;}}@keyframes shrink02{from{width:95%;background-color:#696969;}to{width:90%;color:#fff;background-color:#333;}}
.cardOrders{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;}.cardOrders01{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;background-color:#fff;color:#000;z-index:10;}.cardOrders02{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;background-color:#fff;z-index:20;}.cardOrders03{width:100%;border-radius:18px;padding:1rem 4rem .5rem 4rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;background-color:#fff;z-index:30;}.wRed01{width:95%;margin-bottom:-1.5rem;background-color:#696969;color:#fff;animation-name:shrink01;animation-duration:.6s;}.wRed02{width:90%;margin-bottom:-1.5rem;background-color:#333;color:#fff;animation-name:shrink02;animation-duration:.6s;}@keyframes shrink01{0%{width:100%;background-color:#fff;color:#000;}80%{width:95%;background-color:#696969;color:#000;}100%{width:95%;color:#fff;}}@keyframes shrink02{0%{width:95%;background-color:#696969;}80%{width:90%;background-color:#333;}100%{width:90%;}}