Skip to content

Commit

Permalink
migrated to bs5
Browse files Browse the repository at this point in the history
  • Loading branch information
@stamepicmorg
stamepicmorg committed Sep 23, 2024
1 parent a2d5bf7 commit 4db00e9
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 82 deletions.
12 changes: 6 additions & 6 deletions src/Views/Home/Check.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@model CheckRequest
<form asp-action="Check" id="form" asp-all-route-data="new Dictionary<string, string>()">
<div class="mb-3">
<div class="form-group">
<div class="">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<label asp-for="Issue"><i class="fas fa-keyboard"></i> <span data-localize="label-enter-issue-key">Enter issue key</span>:</label>
<input type="text" asp-for="Issue" class="form-control" placeholder="ABC-123" value="" required>
Expand All @@ -11,20 +11,20 @@
</div>

<div class="mb-3">
<div class="form-group">
<div class="">
<div class="g-recaptcha" data-sitekey="@captchaConfig.Value.Key" data-callback="recaptchaCallback"></div>
</div>
<span asp-validation-for="Captcha" class="text-danger"></span>
</div>

<div class="form-group">
<button class="btn btn-primary btn-lg btn-block" type="submit"><span data-localize="label-check">Check</span> <i class="fas fa-hand-pointer"></i></button>
<div class="">
<button class="btn btn-primary btn-lg w-100" type="submit"><span data-localize="label-check">Check</span> <i class="fas fa-hand-pointer"></i></button>
</div>
</form>

@section Head {
<script src='https://www.google.com/recaptcha/api.js'></script>
}
@section Scripts{
@section Scripts {
@{await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
}
}
22 changes: 9 additions & 13 deletions src/Views/Home/CheckResult.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,42 @@
@model CheckResponse

<div class="mb-3">
<div class="form-group">
<div class="">
<label for="disabled-ui-text"><i class="fas fa-keyboard"></i> <span data-localize="label-issue-key">Issue key</span>:</label>

</div>
</div>



@if (!Model.Success) {
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<strong><i class="fas fa-exclamation-triangle"></i> <span data-localize="message-error">Error!</span></strong> <span data-localize="message-something-wrong-2">Something went wrong. Failed to create request.</span> @Model.Message
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
} else {
<div class="mb-3">
<div class="card">
<h5 class="card-header"><input asp-for="Issue" id="disabled-ui-text" class="form-control" readonly></h5>
<h5 class="card-header">
<input asp-for="Issue" id="disabled-ui-text" class="form-control" readonly>
</h5>
<div class="card-body">
@if (Model.Status != null) {
<p class="card-text"><span data-localize="message-status">Status</span>: <span class="badge badge-info">@Model.Status</span></p>

<p class="card-text"><span data-localize="message-status">Status</span>: <span class="badge bg-info">@Model.Status</span></p>
}
@if (Model.Resolution != null) {
<p class="card-text"><span data-localize="message-resolution">Resolution</span>: <span class="text-muted">@Model.Resolution</span></p>
}
</div>
</div>
</div>

}

<div class="row">
<div class="col-sm-6 padding-fix">
<a class="btn btn-primary btn-lg btn-block" asp-action="Create">
<a class="btn btn-primary btn-lg w-100" asp-action="Create">
<i class="fas fa-bug"></i> <span data-localize="label-submit-another">Submit Another Issue</span>
</a>
</div>
<div class="col-sm-6 padding-fix">
<a class="btn btn-primary btn-lg btn-block" asp-action="Check">
<a class="btn btn-primary btn-lg w-100" asp-action="Check">
<i class="fas fa-search"></i> <span data-localize="label-check-another">Check Another Report</span>
</a>
</div>
Expand Down
69 changes: 27 additions & 42 deletions src/Views/Home/Create.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,31 @@
<form asp-action="Create" enctype="multipart/form-data" id="form">
<div asp-validation-summary="ModelOnly" class="alert alert-danger alert-dismissible fade show" role="alert">
<strong><i class="fas fa-exclamation-triangle"></i> <span data-localize="message-error">Error!</span></strong> <span data-localize="message-something-wrong">Something went wrong.</span>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>

<div class="row">
<div class="col-md-6 mb-3">
<div class="form-group">
<label asp-for="Name" class="control-label"><i class="fas fa-user"></i> <span data-localize="label-fn">First name</span>:</label>
<input asp-for="Name" type="text" class="form-control" id="firstName" placeholder="" value="" required>
<span asp-validation-for="Name" class="text-danger"></span>
</div>
<label asp-for="Name" class="form-label"><i class="fas fa-user"></i> <span data-localize="label-fn">First name</span>:</label>
<input asp-for="Name" type="text" class="form-control" id="firstName" placeholder="" value="" required>
<span asp-validation-for="Name" class="text-danger"></span>
</div>
<div class="col-md-6 mb-3">
<div class="form-group">
<label asp-for="Email" class="control-label"><i class="far fa-envelope"></i> Email:</label>
<input asp-for="Email" type="email" class="form-control" id="email" placeholder="[email protected]">
<span asp-validation-for="Email" class="text-danger"></span>
</div>
<label asp-for="Email" class="form-label"><i class="far fa-envelope"></i> Email:</label>
<input asp-for="Email" type="email" class="form-control" id="email" placeholder="[email protected]">
<span asp-validation-for="Email" class="text-danger"></span>
</div>
</div>

<div class="row">
@if (Model.IssueTypes?.Count() > 1)
{
<div class="col-md-6 mb-3">
<div class="form-group">
<label asp-for="IssueType" class="control-label"><i class="fas fa-list"></i> <span data-localize="label-rep-type">Report type</span>:</label>
<select asp-for="IssueType" asp-items="@Model.IssueTypes" class="form-control custom-select d-block w-100" required>
<option disabled selected data-localize="label-select">--- SELECT ---</option>
</select>
<span asp-validation-for="IssueType" class="text-danger"></span>
</div>
<label asp-for="IssueType" class="form-label"><i class="fas fa-list"></i> <span data-localize="label-rep-type">Report type</span>:</label>
<select asp-for="IssueType" asp-items="@Model.IssueTypes" class="form-select d-block w-100" required>
<option disabled selected data-localize="label-select">--- SELECT ---</option>
</select>
<span asp-validation-for="IssueType" class="text-danger"></span>
</div>
}
else
Expand All @@ -48,13 +40,11 @@
@if (Model.Projects?.Count() > 1)
{
<div class="col-md-6 mb-3">
<div class="form-group">
<label asp-for="Project" class="control-label"><i class="fas fa-list"></i> <span data-localize="label-project">Select project</span>:</label>
<select class="custom-select d-block w-100 form-control" asp-for="Project" asp-items="@Model.Projects" required>
<option disabled selected data-localize="label-select">--- SELECT ---</option>
</select>
<span asp-validation-for="Project" class="text-danger"></span>
</div>
<label asp-for="Project" class="form-label"><i class="fas fa-list"></i> <span data-localize="label-project">Select project</span>:</label>
<select class="form-select d-block w-100" asp-for="Project" asp-items="@Model.Projects" required>
<option disabled selected data-localize="label-select">--- SELECT ---</option>
</select>
<span asp-validation-for="Project" class="text-danger"></span>
</div>
}
else
Expand All @@ -64,35 +54,30 @@
</div>

<div class="mb-3">
<div class="form-group">
<label asp-for="Description" class="control-label"><i class="fas fa-keyboard"></i> <span data-localize="label-description">Your description</span>:</label>
<textarea asp-for="Description" class="form-control" rows="3"></textarea>
<span asp-validation-for="Description" class="text-danger"></span>
</div>
<label asp-for="Description" class="form-label"><i class="fas fa-keyboard"></i> <span data-localize="label-description">Your description</span>:</label>
<textarea asp-for="Description" class="form-control" rows="3"></textarea>
<span asp-validation-for="Description" class="text-danger"></span>
</div>

<div class="row">
<div class="col-md-6 mb-3">
<div class="form-group">
<label asp-for="Files" class="control-label"><i class="fas fa-file-upload"></i> <span data-localize="label-attach-file">Attach file</span>:</label>
<input asp-for="Files" typeclass="form-control" multiple type="file" class="form-control-file">
<span asp-validation-for="Files" class="text-danger"></span>
</div>
<label asp-for="Files" class="form-label"><i class="fas fa-file-upload"></i> <span data-localize="label-attach-file">Attach file</span>:</label>
<input asp-for="Files" multiple type="file" class="form-control-file">
<span asp-validation-for="Files" class="text-danger"></span>
</div>
<div class="form-group col-md-6 mb-3">
<div class="col-md-6 mb-3">
<div class="g-recaptcha" data-sitekey="@captchaConfig.Value.Key"></div>
<span asp-validation-for="Captcha" class="text-danger"></span>
</div>
</div>
<button class="btn btn-primary btn-lg btn-block" type="submit"><span data-localize="label-submit">Submit report</span> <i class="fas fa-paper-plane"></i></button>
<button class="btn btn-primary btn-lg w-100" type="submit"><span data-localize="label-submit">Submit report</span> <i class="fas fa-paper-plane"></i></button>
</form>
</div>
</div>


@section Head {
<script src='https://www.google.com/recaptcha/api.js'></script>
}
@section Scripts{
@section Scripts {
@{await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
}
}
14 changes: 5 additions & 9 deletions src/Views/Home/Created.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,29 @@
<strong>
<i class="fas fa-hands-helping"></i> <span data-localize="message-awesome">Awesome!</span>
</strong>
<span data-localize="message-reported-ok">You successfully send your report. Your issue-key is</span>:
<span data-localize="message-reported-ok">You successfully sent your report. Your issue-key is</span>:
<strong>
<a asp-action="Check" asp-route-id="@Model.IssueKey">@Model.IssueKey</a>
</strong>.
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
}
else
{
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<strong><i class="fas fa-exclamation-triangle"></i> <span data-localize="message-error">Error!</span></strong> <span data-localize="message-something-wrong">Something went wrong.</span> @Model.Message
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
}

<div class="row">
<div class="col-sm-6 padding-fix">
<a class="btn btn-primary btn-lg btn-block" asp-action="Create">
<a class="btn btn-primary btn-lg w-100" asp-action="Create">
<i class="fas fa-bug"></i> <span data-localize="label-submit-another">Submit Another Issue</span>
</a>
</div>
<div class="col-sm-6 padding-fix">
<a class="btn btn-primary btn-lg btn-block" asp-action="Check">
<a class="btn btn-primary btn-lg w-100" asp-action="Check">
<i class="fas fa-search"></i> <span data-localize="label-check-another">Check Another Report</span>
</a>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

<div class="row">
<div class="col-sm-6 padding-fix">
<div class="card border-secondary ">
<div class="card border-secondary">
<div class="card-body">
<a class="btn btn-link btn-lg btn-block text-muted" asp-action="Create">
<a class="btn btn-link btn-lg w-100 text-muted" asp-action="Create">
<i class="fas fa-bug"></i> <span data-localize="btn-submit-new-issue">Submit New Issue</span>
</a>
</div>
</div>
</div>
<div class="col-sm-6 padding-fix">
<div class="card border-secondary ">
<div class="card border-secondary">
<div class="card-body">
<a class="btn btn-link btn-lg btn-block text-muted" asp-action="Check">
<a class="btn btn-link btn-lg w-100 text-muted" asp-action="Check">
<i class="fas fa-search"></i> <span data-localize="btn-check-report">Check Report</span>
</a>
</div>
Expand Down
12 changes: 4 additions & 8 deletions src/Views/Shared/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>
<div class="col-sm">
<p class="mb-1">
<i class="fas fa-key"></i> <span data-localize="label-licensed-to">Liceensed to</span>: @uiConfig.Value.LicensedTo
<i class="fas fa-key"></i> <span data-localize="label-licensed-to">Licensed to</span>: @uiConfig.Value.LicensedTo
</p>
</div>
</div>
Expand All @@ -60,28 +60,24 @@
</li>
<li class="list-inline-item">
<div class="dropdown dropup">
<a class="dropdown-toggle" href="#" role="button" id="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="dropdown-toggle" href="#" role="button" id="" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-language"></i> <span data-localize="lang-language">Language</span>
</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
<a class="dropdown-item" href="#" id="lang_en_btn">
<img height="16" src="~/lib/flags/png/260-united-kingdom.png" alt="" class="mr-2">
<img height="16" src="~/lib/flags/png/260-united-kingdom.png" alt="" class="me-2">
<span data-localize="lang-english">English</span>
</a>
<a class="dropdown-item" href="#" id="lang_ru_btn">
<img height="16" src="~/lib/flags/png/248-russia.png" alt="" class="mr-2">
<img height="16" src="~/lib/flags/png/248-russia.png" alt="" class="me-2">
<span data-localize="lang-rusian">Russian</span>
</a>
</div>
</div>

</li>
</ul>


</footer>


<script src="~/lib/jquery/3.7.1/jquery-3.7.1.min.js"></script>
<script src="~/lib/jquery-localize/0.2.0/jquery.localize.min.js"></script>
<script src="~/lib/bootstrap/5.3.3/dist/js/bootstrap.bundle.min.js"></script>
Expand Down

0 comments on commit 4db00e9

Please sign in to comment.