Skip to content

Commit 81e50ba

Browse files
khojianvarkhojianvar
committed
Merge branch 'integration' of https://github.com/DiyorMarket/CheckDrive.Web into integration
2 parents 10ce1cf + efee2f6 commit 81e50ba

File tree

10 files changed

+234
-5
lines changed

10 files changed

+234
-5
lines changed

‎.github/workflows/integration_checkdriver.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
2+
# More GitHub Actions for Azure: https://github.com/Azure/actions
3+
4+
name: Build and deploy ASP.Net Core app to Azure Web App - CheckDriver
5+
6+
on:
7+
push:
8+
branches:
9+
- integration
10+
workflow_dispatch:
11+
12+
jobs:
13+
build:
14+
runs-on: windows-latest
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Set up .NET Core
20+
uses: actions/setup-dotnet@v1
21+
with:
22+
dotnet-version: '8.x'
23+
include-prerelease: true
24+
25+
- name: Build with dotnet
26+
run: dotnet build --configuration Release
27+
28+
- name: dotnet publish
29+
run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
30+
31+
- name: Upload artifact for deployment job
32+
uses: actions/upload-artifact@v3
33+
with:
34+
name: .net-app
35+
path: ${{env.DOTNET_ROOT}}/myapp
36+
37+
deploy:
38+
runs-on: windows-latest
39+
needs: build
40+
environment:
41+
name: 'Production'
42+
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
43+
permissions:
44+
id-token: write #This is required for requesting the JWT
45+
46+
steps:
47+
- name: Download artifact from build job
48+
uses: actions/download-artifact@v3
49+
with:
50+
name: .net-app
51+
52+
- name: Login to Azure
53+
uses: azure/login@v1
54+
with:
55+
client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_E9AF348E5C5C43AA8D4DC6D5D7832550 }}
56+
tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_C81C36AF407F47E0841F8C513B2E4689 }}
57+
subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_548C4B80BB1545B19DFB28DE2B816ED6 }}
58+
59+
- name: Deploy to Azure Web App
60+
id: deploy-to-webapp
61+
uses: azure/webapps-deploy@v2
62+
with:
63+
app-name: 'CheckDriver'
64+
slot-name: 'Production'
65+
package: .
66+

‎CheckDrive.Web/CheckDrive.Web/Controllers/DispatcherReviewsController.cs

+7
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ public async Task<IActionResult> PersonalIndex(int? pagenumber)
7575
{
7676
var reviewsResponse = await _dispatcherReviewDataStore.GetDispatcherReviews(pagenumber, null, null, 5);
7777

78+
ViewBag.PageSize = reviewsResponse.PageSize;
79+
ViewBag.PageCount = reviewsResponse.TotalPages;
80+
ViewBag.TotalCount = reviewsResponse.TotalCount;
81+
ViewBag.CurrentPage = reviewsResponse.PageNumber;
82+
ViewBag.HasPreviousPage = reviewsResponse.HasPreviousPage;
83+
ViewBag.HasNextPage = reviewsResponse.HasNextPage;
84+
7885
return View(reviewsResponse.Data);
7986
}
8087

‎CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,15 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
7171

7272
public async Task<IActionResult> PersonalIndex(string? searchString, int? pageNumber)
7373
{
74-
7574
var response = await _mechanicAcceptanceDataStore.GetMechanicAcceptancesAsync(pageNumber, searchString, null, 6);
7675

76+
ViewBag.PageSize = response.PageSize;
77+
ViewBag.PageCount = response.TotalPages;
78+
ViewBag.TotalCount = response.TotalCount;
79+
ViewBag.CurrentPage = response.PageNumber;
80+
ViewBag.HasPreviousPage = response.HasPreviousPage;
81+
ViewBag.HasNextPage = response.HasNextPage;
82+
7783
return View(response.Data);
7884
}
7985
public async Task<IActionResult> Create(int? driverId, int? carId)

‎CheckDrive.Web/CheckDrive.Web/Controllers/MechanicHandoversController.cs

+7
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ public async Task<IActionResult> PersonalIndex(string? searchString, int? pageNu
6868
{
6969
var response = await _mechanicHandoverDataStore.GetMechanicHandoversAsync(pageNumber, searchString, null, 6);
7070

71+
ViewBag.PageSize = response.PageSize;
72+
ViewBag.PageCount = response.TotalPages;
73+
ViewBag.TotalCount = response.TotalCount;
74+
ViewBag.CurrentPage = response.PageNumber;
75+
ViewBag.HasPreviousPage = response.HasPreviousPage;
76+
ViewBag.HasNextPage = response.HasNextPage;
77+
7178
return View(response.Data);
7279
}
7380

‎CheckDrive.Web/CheckDrive.Web/Controllers/OperatorReviewsController.cs

+7
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ public async Task<IActionResult> PersonalIndex(int? pageNumber, string? searchSt
6565
{
6666
var reviewsResponse = await _operatorReviewDataStore.GetOperatorReviews(pageNumber, searchString, null, 4);
6767

68+
ViewBag.PageSize = reviewsResponse.PageSize;
69+
ViewBag.PageCount = reviewsResponse.TotalPages;
70+
ViewBag.TotalCount = reviewsResponse.TotalCount;
71+
ViewBag.CurrentPage = reviewsResponse.PageNumber;
72+
ViewBag.HasPreviousPage = reviewsResponse.HasPreviousPage;
73+
ViewBag.HasNextPage = reviewsResponse.HasNextPage;
74+
6875
return View(reviewsResponse.Data);
6976
}
7077

‎CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/PersonalIndex.cshtml

+34
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,40 @@
7777
}
7878
</tbody>
7979
</table>
80+
<div class="d-flex justify-content-between align-items-center my-2">
81+
<nav aria-label="Page navigation">
82+
<ul class="pagination">
83+
@if (ViewBag.HasPreviousPage)
84+
{
85+
<li class="page-item">
86+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = 1 })" aria-label="First">
87+
<span aria-hidden="true">&laquo;</span>
88+
</a>
89+
</li>
90+
<li class="page-item">
91+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage - 1 })">@(@ViewBag.CurrentPage - 1)</a>
92+
</li>
93+
}
94+
@if (ViewBag.HasNextPage)
95+
{
96+
<li class="page-item active">
97+
<span class="page-link">@ViewBag.CurrentPage</span>
98+
</li>
99+
<li class="page-item">
100+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage + 1 })">@(@ViewBag.CurrentPage + 1)</a>
101+
</li>
102+
<li class="page-item">
103+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.PageCount })" aria-label="Last">
104+
<span aria-hidden="true">&raquo;</span>
105+
</a>
106+
</li>
107+
}
108+
</ul>
109+
</nav>
110+
<div class="p-2">
111+
<p class="h6 mb-0">@ViewBag.PageCount sahifadan @ViewBag.CurrentPage tasi ( umumiy ishchilar soni: @ViewBag.TotalCount)</p>
112+
</div>
113+
</div>
80114
</div>
81115
</div>
82116

‎CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/PersonalIndex.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<input type="text" class="form-control rounded-left" placeholder="Haydovchini kiriting ..." name="searchString" value="@ViewBag.SearchString">
2929
<div class="input-group-append">
3030
<button type="submit" class="btn btn-primary">
31-
<i class="fa fa-search"></i>
31+
<i class="fa fa-search"></i> Qidirish
3232
</button>
3333
</div>
3434
</div>

‎CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/PersonalIndex.cshtml

+35-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<input type="text" class="form-control rounded-left" placeholder="Haydovchini kiriting ..." name="searchString" value="@ViewBag.SearchString">
3030
<div class="input-group-append">
3131
<button type="submit" class="btn btn-primary">
32-
<i class="fa fa-search"></i>
32+
<i class="fa fa-search"></i> Qidirish
3333
</button>
3434
</div>
3535
</div>
@@ -102,6 +102,40 @@
102102
}
103103
</tbody>
104104
</table>
105+
<div class="d-flex justify-content-between align-items-center my-2">
106+
<nav aria-label="Page navigation">
107+
<ul class="pagination">
108+
@if (ViewBag.HasPreviousPage)
109+
{
110+
<li class="page-item">
111+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = 1 })" aria-label="First">
112+
<span aria-hidden="true">&laquo;</span>
113+
</a>
114+
</li>
115+
<li class="page-item">
116+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage - 1 })">@(@ViewBag.CurrentPage - 1)</a>
117+
</li>
118+
}
119+
@if (ViewBag.HasNextPage)
120+
{
121+
<li class="page-item active">
122+
<span class="page-link">@ViewBag.CurrentPage</span>
123+
</li>
124+
<li class="page-item">
125+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage + 1 })">@(@ViewBag.CurrentPage + 1)</a>
126+
</li>
127+
<li class="page-item">
128+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.PageCount })" aria-label="Last">
129+
<span aria-hidden="true">&raquo;</span>
130+
</a>
131+
</li>
132+
}
133+
</ul>
134+
</nav>
135+
<div class="p-2">
136+
<p class="h6 mb-0">@ViewBag.PageCount sahifadan @ViewBag.CurrentPage tasi ( umumiy ishchilar soni: @ViewBag.TotalCount)</p>
137+
</div>
138+
</div>
105139
</div>
106140
</div>
107141
</form>

‎CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/PersonalIndex.cshtml

+35-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<input type="text" class="form-control rounded-left" placeholder="Haydovchini kiriting ..." name="searchString" value="@ViewBag.SearchString">
3131
<div class="input-group-append">
3232
<button type="submit" class="btn btn-primary">
33-
<i class="fa fa-search"></i>
33+
<i class="fa fa-search"></i> Qidirish
3434
</button>
3535
</div>
3636
</div>
@@ -102,6 +102,40 @@
102102
}
103103
</tbody>
104104
</table>
105+
<div class="d-flex justify-content-between align-items-center my-2">
106+
<nav aria-label="Page navigation">
107+
<ul class="pagination">
108+
@if (ViewBag.HasPreviousPage)
109+
{
110+
<li class="page-item">
111+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = 1 })" aria-label="First">
112+
<span aria-hidden="true">&laquo;</span>
113+
</a>
114+
</li>
115+
<li class="page-item">
116+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage - 1 })">@(@ViewBag.CurrentPage - 1)</a>
117+
</li>
118+
}
119+
@if (ViewBag.HasNextPage)
120+
{
121+
<li class="page-item active">
122+
<span class="page-link">@ViewBag.CurrentPage</span>
123+
</li>
124+
<li class="page-item">
125+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage + 1 })">@(@ViewBag.CurrentPage + 1)</a>
126+
</li>
127+
<li class="page-item">
128+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.PageCount })" aria-label="Last">
129+
<span aria-hidden="true">&raquo;</span>
130+
</a>
131+
</li>
132+
}
133+
</ul>
134+
</nav>
135+
<div class="p-2">
136+
<p class="h6 mb-0">@ViewBag.PageCount sahifadan @ViewBag.CurrentPage tasi ( umumiy ishchilar soni: @ViewBag.TotalCount)</p>
137+
</div>
138+
</div>
105139
</div>
106140
</div>
107141
</form>

‎CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/PersonalIndex.cshtml

+35-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<input type="text" class="form-control rounded-left" placeholder="Haydovchini kiriting ..." name="searchString" value="@ViewBag.SearchString">
2929
<div class="input-group-append">
3030
<button type="submit" class="btn btn-primary">
31-
<i class="fa fa-search"></i>
31+
<i class="fa fa-search"></i> Qidirish
3232
</button>
3333
</div>
3434
</div>
@@ -107,6 +107,40 @@
107107
}
108108
</tbody>
109109
</table>
110+
<div class="d-flex justify-content-between align-items-center my-2">
111+
<nav aria-label="Page navigation">
112+
<ul class="pagination">
113+
@if (ViewBag.HasPreviousPage)
114+
{
115+
<li class="page-item">
116+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = 1 })" aria-label="First">
117+
<span aria-hidden="true">&laquo;</span>
118+
</a>
119+
</li>
120+
<li class="page-item">
121+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage - 1 })">@(@ViewBag.CurrentPage - 1)</a>
122+
</li>
123+
}
124+
@if (ViewBag.HasNextPage)
125+
{
126+
<li class="page-item active">
127+
<span class="page-link">@ViewBag.CurrentPage</span>
128+
</li>
129+
<li class="page-item">
130+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.CurrentPage + 1 })">@(@ViewBag.CurrentPage + 1)</a>
131+
</li>
132+
<li class="page-item">
133+
<a class="page-link" href="@Url.Action("PersonalIndex", new { pageNumber = ViewBag.PageCount })" aria-label="Last">
134+
<span aria-hidden="true">&raquo;</span>
135+
</a>
136+
</li>
137+
}
138+
</ul>
139+
</nav>
140+
<div class="p-2">
141+
<p class="h6 mb-0">@ViewBag.PageCount sahifadan @ViewBag.CurrentPage tasi ( umumiy ishchilar soni: @ViewBag.TotalCount)</p>
142+
</div>
143+
</div>
110144
</div>
111145
</div>
112146
</div>

0 commit comments

Comments
 (0)