Skip to content

Commit

Permalink
Updated nuget packages and added bordered tables.
Browse files Browse the repository at this point in the history
  • Loading branch information
@uncheckederror
uncheckederror committed Apr 13, 2024
1 parent 3dc2cd9 commit 95652bf
Show file tree
Hide file tree
Showing 26 changed files with 84 additions and 151 deletions.
4 changes: 2 additions & 2 deletions Messaging.Tests/Messaging.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="Xunit.Priority" Version="1.1.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Messaging/Messaging.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageReference Include="PhoneNumbersNA" Version="1.0.13" />
<PackageReference Include="PhoneNumbersNA" Version="1.0.14" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageReference Include="Serilog" Version="3.1.1" />
Expand Down
4 changes: 2 additions & 2 deletions NumberSearch.DataAccess/NumberSearch.DataAccess.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="Dapper" Version="2.1.44" />
<PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="MailKit" Version="4.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MimeKit" Version="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Npgsql" Version="8.0.2" />
<PackageReference Include="PhoneNumbersNA" Version="1.0.13" />
<PackageReference Include="PhoneNumbersNA" Version="1.0.14" />
<PackageReference Include="Serilog" Version="3.1.1" />
</ItemGroup>

Expand Down
168 changes: 49 additions & 119 deletions NumberSearch.Ops/Pages/Orders.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
@if (Model?.Orders is not null && Model?.Orders.Length > 0)
{
<div class="table-responsive d-none d-md-block">
<table class="table table-striped table-borderless table-hover">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>
Expand Down Expand Up @@ -190,50 +190,48 @@
</span>
}
</p>
<div class="d-xl-none">
@if (order?.PortRequest is not null && order?.Order is not null && order.PortRequest.OrderId == order.Order.OrderId)
{
<p>
<div class="btn-group" role="group" aria-label="Basic example">
<a href="/Home/PortRequests/@order?.Order?.OrderId" class="btn btn-info text-white">
Edit Related Port Request
</a>
</div>
</p>
}
else if (order?.ProductOrders is not null && order.ProductOrders.Where(x => x.PortedPhoneNumberId.HasValue).Any())
{
<p>
<div class="btn-group" role="group" aria-label="Basic example">
<a href="https://acceleratenetworks.com/Cart/PortingInformation/@order?.Order?.OrderId" class="btn btn-dark" target="_blank" rel="noopener noreferrer">
Get Port Request From Customer
</a>
</div>
</p>
}
@if (order?.PortRequest is not null && order?.Order is not null && order.PortRequest.OrderId == order.Order.OrderId)
{
<p>
<div class="btn-group mt-2" role="group" aria-label="Basic example">
@if (!string.IsNullOrWhiteSpace(order?.Order?.UpfrontInvoiceLink))
{
<a href="@order?.Order?.UpfrontInvoiceLink" class="btn btn-outline-success" target="_blank" rel="noopener noreferrer">
View Upfront Quote
</a>
}
@if (!string.IsNullOrWhiteSpace(order?.Order?.ReoccuringInvoiceLink))
{
<a href="@order?.Order?.ReoccuringInvoiceLink" class="btn btn-outline-primary" target="_blank" rel="noopener noreferrer">
View Recurring Quote
</a>
}
@if (!string.IsNullOrWhiteSpace(order?.Order?.BillingClientId))
{
<a href="https://billing.acceleratenetworks.com/clients/@order?.Order?.BillingClientId" class="btn btn-outline-info" target="_blank" rel="noopener noreferrer">
View Billing Client
</a>
}
<div class="btn-group" role="group" aria-label="Basic example">
<a href="/Home/PortRequests/@order?.Order?.OrderId" class="btn btn-primary text-white">
Edit Related Port Request
</a>
</div>
</p>
}
else if (order?.ProductOrders is not null && order.ProductOrders.Where(x => x.PortedPhoneNumberId.HasValue).Any())
{
<p>
<div class="btn-group" role="group" aria-label="Basic example">
<a href="https://acceleratenetworks.com/Cart/PortingInformation/@order?.Order?.OrderId" class="btn btn-dark" target="_blank" rel="noopener noreferrer">
Get Port Request From Customer
</a>
</div>
</p>
</div>
}
<p>
<div class="btn-group mt-2" role="group" aria-label="Basic example">
@if (!string.IsNullOrWhiteSpace(order?.Order?.UpfrontInvoiceLink))
{
<a href="@order?.Order?.UpfrontInvoiceLink" class="btn btn-outline-success" target="_blank" rel="noopener noreferrer">
View Upfront Quote
</a>
}
@if (!string.IsNullOrWhiteSpace(order?.Order?.ReoccuringInvoiceLink))
{
<a href="@order?.Order?.ReoccuringInvoiceLink" class="btn btn-outline-primary" target="_blank" rel="noopener noreferrer">
View Recurring Quote
</a>
}
@if (!string.IsNullOrWhiteSpace(order?.Order?.BillingClientId))
{
<a href="https://billing.acceleratenetworks.com/clients/@order?.Order?.BillingClientId" class="btn btn-outline-info" target="_blank" rel="noopener noreferrer">
View Billing Client
</a>
}
</div>
</p>
</td>
<td>
<strong class="d-xl-none">Customer Name</strong>
Expand All @@ -245,20 +243,18 @@
<a href="mailto:@order?.Order?.Email" target="_blank">@order?.Order?.Email</a>
</p>
<p class="m-0">@order?.Order?.ContactPhoneNumber</p>
<div class="d-xl-none">
<strong>Address</strong>
<p>
@order?.Order?.Address
<strong>Address</strong>
<p>
@order?.Order?.Address

@order?.Order?.Address2
@order?.Order?.Address2

@order?.Order?.City
@order?.Order?.City

@order?.Order?.State
@order?.Order?.State

@order?.Order?.Zip
</p>
</div>
@order?.Order?.Zip
</p>
</td>
<td>
@if (order?.ProductOrders is not null)
Expand Down Expand Up @@ -378,80 +374,14 @@
}
}
</td>
<td>
<div class="d-none d-xl-block">
<p>
@order?.Order?.Address

@order?.Order?.Address2

@order?.Order?.City

@order?.Order?.State

@order?.Order?.Zip
</p>
</div>
</td>
<td>
<div class="d-none d-xl-block">
@if (order?.PortRequest is not null && order?.Order is not null && order.PortRequest.OrderId == order.Order.OrderId)
{
<p>
<div class="btn-group" role="group" aria-label="Basic example">
<a href="/Home/PortRequests/@order?.Order?.OrderId" class="btn btn-info text-white">
Edit Related Port Request
</a>
</div>
</p>
}
else if (order?.ProductOrders is not null && order.ProductOrders.Where(x => x.PortedPhoneNumberId.HasValue).Any())
{
<p>
<div class="btn-group" role="group" aria-label="Basic example">
<a href="https://acceleratenetworks.com/Cart/PortingInformation/@order?.Order?.OrderId" class="btn btn-dark" target="_blank" rel="noopener noreferrer">
Get Port Request From Customer
</a>
</div>
</p>
}
@if ((!string.IsNullOrWhiteSpace(order?.Order?.UpfrontInvoiceLink)
|| !string.IsNullOrWhiteSpace(order?.Order?.ReoccuringInvoiceLink)
|| !string.IsNullOrWhiteSpace(order?.Order?.BillingClientId)))
{
<p>
<div class="btn-group mt-2" role="group" aria-label="Basic example">
@if (!string.IsNullOrWhiteSpace(order?.Order?.UpfrontInvoiceLink))
{
<a href="@order?.Order?.UpfrontInvoiceLink" class="btn btn-outline-success" target="_blank" rel="noopener noreferrer">
View Upfront Quote
</a>
}
@if (!string.IsNullOrWhiteSpace(order?.Order?.ReoccuringInvoiceLink))
{
<a href="@order?.Order?.ReoccuringInvoiceLink" class="btn btn-outline-primary" target="_blank" rel="noopener noreferrer">
View Recurring Quote
</a>
}
@if (!string.IsNullOrWhiteSpace(order?.Order?.BillingClientId))
{
<a href="https://billing.acceleratenetworks.com/clients/@order?.Order?.BillingClientId" class="btn btn-outline-info" target="_blank" rel="noopener noreferrer">
View Billing Client
</a>
}
</div>
</p>
}
</div>
</td>
</tr>
}
}
</tbody>
</table>
</div>
<div class="table-responsive d-md-none">
<table class="table table-striped table-borderless table-hover">
<table class="table table-striped table-bordered table-hover">
<tbody>
@if (Model?.Orders is not null)
{
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Carriers/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@* <a asp-action="Create" class="btn btn-lg btn-success">Create New</a>
*@</div>
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Home/Coupons.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</form>
<br />
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Home/E911.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}
<h1 class="display-4 p-3">🚨 E911</h1>
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Home/Emails.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
}
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th>
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Home/Numbers.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@total
</div>
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Home/Products.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</form>
<br />
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Home/Shipments.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</form>
<br />
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Lookups/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
</div>
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion NumberSearch.Ops/Views/Messaging/Failed.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
}

<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
@* <th>Succeeded?</th> *@
Expand Down
11 changes: 7 additions & 4 deletions NumberSearch.Ops/Views/Messaging/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</form>
<h3 class="pt-3">Messaging Usage by Phone Number</h3>
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="table">
<table class="table table-striped table-bordered table-hover" id="table">
<thead>
<tr>
<th>Phone Number</th>
Expand All @@ -111,9 +111,12 @@
<td>@Carrier</td>
<td>@TrunkGroup</td>
<td>
<a class="btn btn-primary" href="/Messaging/RefreshStatus?dialedNumber=@result.AsDialed">Refresh Upstream</a>
<a class="btn btn-primary" href="/Messaging/Reregister?dialedNumber=@result.AsDialed">Reregister</a>
<a class="btn btn-primary" href="/Messaging/TwilioCarrier?dialedNumber=@result.AsDialed">Refresh Carrier</a>
<div class="btn-group">
<a class="btn btn-primary" href="/Messaging/RefreshStatus?dialedNumber=@result.AsDialed">Refresh Upstream</a>
<a class="btn btn-primary" href="/Messaging/Reregister?dialedNumber=@result.AsDialed">Reregister</a>
<a class="btn btn-primary" href="/Messaging/TwilioCarrier?dialedNumber=@result.AsDialed">Refresh Carrier</a>
</div>

</td>
</tr>
}
Expand Down
Loading

0 comments on commit 95652bf

Please sign in to comment.