diff --git a/Areas/Admin/Views/_ViewStart.cshtml b/Areas/Admin/Views/_ViewStart.cshtml deleted file mode 100644 index 4cf0c1a..0000000 --- a/Areas/Admin/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "/Areas/Shared/Layouts/App/_Layout.cshtml"; -} diff --git a/Areas/Shared/Layouts/App/_Sidebar.cshtml b/Areas/Shared/Layouts/App/_Sidebar.cshtml deleted file mode 100644 index 7d183ed..0000000 --- a/Areas/Shared/Layouts/App/_Sidebar.cshtml +++ /dev/null @@ -1,147 +0,0 @@ - - - \ No newline at end of file diff --git a/Areas/Shared/Layouts/App/_ViewImports.cshtml b/Areas/Shared/Layouts/App/_ViewImports.cshtml deleted file mode 100644 index 3cb67cc..0000000 --- a/Areas/Shared/Layouts/App/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using BpsRwApp -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/Controllers/AppControllerBase.cs b/Controllers/AppControllerBase.cs new file mode 100644 index 0000000..accb57b --- /dev/null +++ b/Controllers/AppControllerBase.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; + +namespace BpsRwApp.Controllers +{ + public abstract class AppControllerBase : Controller + { + public override void OnActionExecuting(ActionExecutingContext context) + { + ViewData["Layout"] = "~/Views/Shared/Layouts/App/_Layout.cshtml"; + base.OnActionExecuting(context); + } + } +} diff --git a/Areas/Admin/Controllers/DashboardController.cs b/Controllers/DashboardController.cs similarity index 52% rename from Areas/Admin/Controllers/DashboardController.cs rename to Controllers/DashboardController.cs index 16f66dc..efc17c8 100644 --- a/Areas/Admin/Controllers/DashboardController.cs +++ b/Controllers/DashboardController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DashboardController : Controller + [Route("[controller]/[action]")] + public class DashboardController : AppControllerBase { public IActionResult Index() { diff --git a/Controllers/DataBankSampahController.cs b/Controllers/DataBankSampahController.cs new file mode 100644 index 0000000..f772c0e --- /dev/null +++ b/Controllers/DataBankSampahController.cs @@ -0,0 +1,128 @@ +using Microsoft.AspNetCore.Mvc; + +namespace BpsRwApp.Controllers +{ + [Route("[controller]/[action]")] + public class DataBankSampahController : AppControllerBase + { + public IActionResult Index() + { + return View(); + } + + [HttpGet] + public IActionResult Table() + { + var data = new[] + { + new { + nama = "Risky Adi Putra", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Jenderal Sudirman No. 10, Kel. Setiabudi, Kec. Setiabudi, Jakarta Selatan 12910", + jumlah_nasabah = 581, + jumlah_potensi_nasabah = 581, + status = "
Aktif
", + }, + new { + nama = "Sulaiman", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. HR Rasuna Said No. 27, Kel. Guntur, Kec. Setiabudi, Jakarta Selatan 12980", + jumlah_nasabah = 889, + jumlah_potensi_nasabah = 889, + status = "
Aktif
", + }, + new { + nama = "Siti Nurhaliza", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Prof. DR. Satrio No. 45, Kel. Kuningan Timur, Kec. Setiabudi, Jakarta Selatan 12950", + jumlah_nasabah = 673, + jumlah_potensi_nasabah = 673, + status = "
Aktif
", + }, + new { + nama = "Budi Santoso", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Casablanca No. 12, Kel. Karet Semanggi, Kec. Setiabudi, Jakarta Selatan 12930", + jumlah_nasabah = 790, + jumlah_potensi_nasabah = 790, + status = "
Aktif
", + }, + new { + nama = "Dewi Lestari", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Gatot Subroto Kav. 33, Kel. Karet Kuningan, Kec. Setiabudi, Jakarta Selatan 12940", + jumlah_nasabah = 750, + jumlah_potensi_nasabah = 750, + status = "
Aktif
", + }, + new { + nama = "Andi Prabowo", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Galunggung No. 8, Kel. Pasar Manggis, Kec. Setiabudi, Jakarta Selatan 12970", + jumlah_nasabah = 780, + jumlah_potensi_nasabah = 780, + status = "
Aktif
", + }, + new { + nama = "Nina Sari", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Mega Kuningan Barat No. 5, Kel. Karet, Kec. Setiabudi, Jakarta Selatan 12920", + jumlah_nasabah = 552, + jumlah_potensi_nasabah = 552, + status = "
Aktif
", + }, + new { + nama = "Hendra Wijaya", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Denpasar No. 17, Kel. Guntur, Kec. Setiabudi, Jakarta Selatan 12980", + jumlah_nasabah = 582, + jumlah_potensi_nasabah = 582, + status = "
Aktif
", + }, + new { + nama = "Lina Marlina", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Teknika No. 29, Kel. Setiabudi, Kec. Setiabudi, Jakarta Selatan 12910", + jumlah_nasabah = 935, + jumlah_potensi_nasabah = 935, + status = "
Aktif
", + }, + new { + nama = "Yudi Hartono", + kelurahan = "Kebon Jeruk", + rt = "093", + rw = "003", + alamat = "Jl. Kuningan Timur Raya No. 3, Kel. Kuningan Timur, Kec. Setiabudi, Jakarta Selatan 12950 Kec. Setiabudi, Jakarta Selatan 12950", + jumlah_nasabah = 593, + jumlah_potensi_nasabah = 593, + status = "
Aktif
", + }, + }; + + var response = new + { + data = data + }; + + return Json(response); + } + } +} diff --git a/Controllers/DataBeratSampahController.cs b/Controllers/DataBeratSampahController.cs new file mode 100644 index 0000000..e0c2831 --- /dev/null +++ b/Controllers/DataBeratSampahController.cs @@ -0,0 +1,138 @@ +using Microsoft.AspNetCore.Mvc; + +namespace BpsRwApp.Controllers +{ + [Route("[controller]/[action]")] + public class DataBeratSampahController : AppControllerBase + { + public IActionResult Index() + { + return View(); + } + + [HttpGet] + public IActionResult Table() + { + var data = new[] + { + new { + tanggal = "22 Nov 2025", + kelurahan = "Kebon Jeruk", + rw = "04", + berat_mudah_terurai = 104, + berat_material_daur_ulang = 104, + berat_b3 = 104, + timbulan = 104, + total_pengurangan_sampah = 104, + neraca_sampah = 104, + }, + new { + tanggal = "15 Sep 2023", + kelurahan = "Pancoran", + rw = "01", + berat_mudah_terurai = 67, + berat_material_daur_ulang = 67, + berat_b3 = 67, + timbulan = 67, + total_pengurangan_sampah = 67, + neraca_sampah = 67, + }, + new { + tanggal = "5 Mei 2022", + kelurahan = "Kembangan", + rw = "04", + berat_mudah_terurai = 110, + berat_material_daur_ulang = 110, + berat_b3 = 110, + timbulan = 110, + total_pengurangan_sampah = 110, + neraca_sampah = 110, + }, + new { + tanggal = "12 Des 2023", + kelurahan = "Senen", + rw = "04", + berat_mudah_terurai = 88, + berat_material_daur_ulang = 88, + berat_b3 = 88, + timbulan = 88, + total_pengurangan_sampah = 88, + neraca_sampah = 88, + }, + new { + tanggal = "18 Mar 2025", + kelurahan = "Kebayoran Baru", + rw = "04", + berat_mudah_terurai = 90, + berat_material_daur_ulang = 90, + berat_b3 = 90, + timbulan = 90, + total_pengurangan_sampah = 90, + neraca_sampah = 90, + }, + new { + tanggal = "21 Apr 2026", + kelurahan = "Menteng", + rw = "04", + berat_mudah_terurai = 72, + berat_material_daur_ulang = 72, + berat_b3 = 72, + timbulan = 72, + total_pengurangan_sampah = 72, + neraca_sampah = 72, + }, + new { + tanggal = "27 Jul 2024", + kelurahan = "Cilandak", + rw = "04", + berat_mudah_terurai = 81, + berat_material_daur_ulang = 81, + berat_b3 = 81, + timbulan = 81, + total_pengurangan_sampah = 81, + neraca_sampah = 81, + }, + new { + tanggal = "10 Okt 2023", + kelurahan = "Cakung", + rw = "04", + berat_mudah_terurai = 65, + berat_material_daur_ulang = 65, + berat_b3 = 65, + timbulan = 65, + total_pengurangan_sampah = 65, + neraca_sampah = 65, + }, + new { + tanggal = "03 Feb 2025", + kelurahan = "Grogol Petamburan", + rw = "09", + berat_mudah_terurai = 78, + berat_material_daur_ulang = 78, + berat_b3 = 78, + timbulan = 78, + total_pengurangan_sampah = 78, + neraca_sampah = 78, + }, + new { + tanggal = "30 Jan 2026", + kelurahan = "Tanah Abang", + rw = "10", + berat_mudah_terurai = 95, + berat_material_daur_ulang = 95, + berat_b3 = 95, + timbulan = 95, + total_pengurangan_sampah = 95, + neraca_sampah = 95, + }, + }; + + var response = new + { + data = data + }; + + return Json(response); + } + } +} diff --git a/Areas/Admin/Controllers/DataKecamatanChecklistHarianController.cs b/Controllers/DataKecamatanChecklistHarianController.cs similarity index 94% rename from Areas/Admin/Controllers/DataKecamatanChecklistHarianController.cs rename to Controllers/DataKecamatanChecklistHarianController.cs index 1c3702b..3dcee80 100644 --- a/Areas/Admin/Controllers/DataKecamatanChecklistHarianController.cs +++ b/Controllers/DataKecamatanChecklistHarianController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DataKecamatanChecklistHarianController : Controller + [Route("[controller]/[action]")] + public class DataKecamatanChecklistHarianController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataKecamatanController.cs b/Controllers/DataKecamatanController.cs similarity index 97% rename from Areas/Admin/Controllers/DataKecamatanController.cs rename to Controllers/DataKecamatanController.cs index 5505e46..8af88e0 100644 --- a/Areas/Admin/Controllers/DataKecamatanController.cs +++ b/Controllers/DataKecamatanController.cs @@ -1,10 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - [Route("Admin/[controller]/[action]")] - public class DataKecamatanController : Controller + [Route("[controller]/[action]")] + public class DataKecamatanController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataKecamatanRumahMemilahController.cs b/Controllers/DataKecamatanRumahMemilahController.cs similarity index 95% rename from Areas/Admin/Controllers/DataKecamatanRumahMemilahController.cs rename to Controllers/DataKecamatanRumahMemilahController.cs index 19f75d9..edf6af9 100644 --- a/Areas/Admin/Controllers/DataKecamatanRumahMemilahController.cs +++ b/Controllers/DataKecamatanRumahMemilahController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DataKecamatanRumahMemilahController : Controller + [Route("[controller]/[action]")] + public class DataKecamatanRumahMemilahController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataPendampingRwController.cs b/Controllers/DataPendampingRwController.cs similarity index 99% rename from Areas/Admin/Controllers/DataPendampingRwController.cs rename to Controllers/DataPendampingRwController.cs index 7419b15..cc840f8 100644 --- a/Areas/Admin/Controllers/DataPendampingRwController.cs +++ b/Controllers/DataPendampingRwController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DataPendampingRwController : Controller + [Route("[controller]/[action]")] + public class DataPendampingRwController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataRtController.cs b/Controllers/DataRtController.cs similarity index 93% rename from Areas/Admin/Controllers/DataRtController.cs rename to Controllers/DataRtController.cs index 92e182b..fa6f135 100644 --- a/Areas/Admin/Controllers/DataRtController.cs +++ b/Controllers/DataRtController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DataRtController : Controller + [Route("[controller]/[action]")] + public class DataRtController : AppControllerBase { public IActionResult Index() { diff --git a/Controllers/DataRumahPotensiRumahController.cs b/Controllers/DataRumahPotensiRumahController.cs new file mode 100644 index 0000000..7d44d4b --- /dev/null +++ b/Controllers/DataRumahPotensiRumahController.cs @@ -0,0 +1,148 @@ +using Microsoft.AspNetCore.Mvc; + +namespace BpsRwApp.Controllers +{ + [Route("[controller]/[action]")] + public class DataRumahPotensiRumahController : AppControllerBase + { + public IActionResult Index() + { + return View(); + } + + [HttpGet] + public IActionResult Table() + { + var data = new[] + { + new { + rt = "001", + rw = "001", + alamat = "Jl. Jenderal Sudirman No. 10, Kel. Setiabudi, Kec. Setiabudi, Jakarta Selatan 12910", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Rizky Adi", + id_bangunan = "BGN4455", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "002", + rw = "001", + alamat = "Jl. HR Rasuna Said No. 27, Kel. Guntur, Kec. Setiabudi, Jakarta Selatan 12980", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Dewi Lestari", + id_bangunan = "BGN9202", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "003", + rw = "001", + alamat = "Jl. Prof. DR. Satrio No. 45, Kel. Kuningan Timur, Kec. Setiabudi, Jakarta Selatan 12950", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Fajar Setiawan", + id_bangunan = "BGN5161", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "004", + rw = "001", + alamat = "Jl. Casablanca No. 12, Kel. Karet Semanggi, Kec. Setiabudi, Jakarta Selatan 12930", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Budi Santoso", + id_bangunan = "BGN7181", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "005", + rw = "001", + alamat = "Jl. Gatot Subroto Kav. 33, Kel. Karet Kuningan, Kec. Setiabudi, Jakarta Selatan 12940", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Siti Nurhaliza", + id_bangunan = "BGN2233", + potensi = "Tidak Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "006", + rw = "001", + alamat = "Jl. Galunggung No. 8, Kel. Pasar Manggis, Kec. Setiabudi, Jakarta Selatan 12970", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Andi Prabowo", + id_bangunan = "BGN9101", + potensi = "Tidak Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "007", + rw = "001", + alamat = "Jl. Mega Kuningan Barat No. 5, Kel. Karet, Kec. Setiabudi, Jakarta Selatan 12920", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Tina Sari", + id_bangunan = "BGN3141", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "008", + rw = "001", + alamat = "Jl. Denpasar No. 17, Kel. Guntur, Kec. Setiabudi, Jakarta Selatan 12980", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Hendra Wijaya", + id_bangunan = "BGN1121", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "009", + rw = "001", + alamat = "Jl. Teknika No. 29, Kel. Setiabudi, Kec. Setiabudi, Jakarta Selatan 12910", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Lina Anggraini", + id_bangunan = "BGN1234", + potensi = "Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + new { + rt = "010", + rw = "001", + alamat = "Jl. Kuningan Timur Raya No. 3, Kel. Kuningan Timur, Kec. Setiabudi, Jakarta Selatan 12950 Kec. Setiabudi, Jakarta Selatan 12950", + kota = "Setiabudi, Jakarta Selatan", + pemilik_rumah = "Nina Kurniawati", + id_bangunan = "BGN5678", + potensi = "Tidak Potensi", + aksi = "
" + + "more_horiz" + + "
", + }, + }; + + var response = new + { + data = data + }; + + return Json(response); + } + } +} diff --git a/Areas/Admin/Controllers/DataRumahRumahController.cs b/Controllers/DataRumahRumahController.cs similarity index 98% rename from Areas/Admin/Controllers/DataRumahRumahController.cs rename to Controllers/DataRumahRumahController.cs index 49d1961..7060f28 100644 --- a/Areas/Admin/Controllers/DataRumahRumahController.cs +++ b/Controllers/DataRumahRumahController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DataRumahRumahController : Controller + [Route("[controller]/[action]")] + public class DataRumahRumahController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataRwController.cs b/Controllers/DataRwController.cs similarity index 97% rename from Areas/Admin/Controllers/DataRwController.cs rename to Controllers/DataRwController.cs index 417166f..2531899 100644 --- a/Areas/Admin/Controllers/DataRwController.cs +++ b/Controllers/DataRwController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class DataRwController : Controller + [Route("/[controller]/[action]")] + public class DataRwController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataSudinChecklistHarianController.cs b/Controllers/DataSudinChecklistHarianController.cs similarity index 93% rename from Areas/Admin/Controllers/DataSudinChecklistHarianController.cs rename to Controllers/DataSudinChecklistHarianController.cs index a1f7e9a..16cb82b 100644 --- a/Areas/Admin/Controllers/DataSudinChecklistHarianController.cs +++ b/Controllers/DataSudinChecklistHarianController.cs @@ -1,10 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - [Route("Admin/[controller]/[action]")] - public class DataSudinChecklistHarianController : Controller + [Route("[controller]/[action]")] + public class DataSudinChecklistHarianController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/DataVerifikasiChecklistHarianController.cs b/Controllers/DataVerifikasiChecklistHarianController.cs similarity index 97% rename from Areas/Admin/Controllers/DataVerifikasiChecklistHarianController.cs rename to Controllers/DataVerifikasiChecklistHarianController.cs index a0d47ce..7ea981a 100644 --- a/Areas/Admin/Controllers/DataVerifikasiChecklistHarianController.cs +++ b/Controllers/DataVerifikasiChecklistHarianController.cs @@ -1,10 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - [Route("Admin/[controller]/[action]")] - public class DataVerifikasiChecklistHarianController : Controller + [Route("[controller]/[action]")] + public class DataVerifikasiChecklistHarianController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/LaporanRwController.cs b/Controllers/LaporanRwController.cs similarity index 97% rename from Areas/Admin/Controllers/LaporanRwController.cs rename to Controllers/LaporanRwController.cs index 1722cba..38fff25 100644 --- a/Areas/Admin/Controllers/LaporanRwController.cs +++ b/Controllers/LaporanRwController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class LaporanRwController : Controller + [Route("[controller]/[action]")] + public class LaporanRwController : AppControllerBase { public IActionResult Index() { diff --git a/Areas/Admin/Controllers/RumahMemilahController.cs b/Controllers/RumahMemilahController.cs similarity index 96% rename from Areas/Admin/Controllers/RumahMemilahController.cs rename to Controllers/RumahMemilahController.cs index 2928bfa..027cabd 100644 --- a/Areas/Admin/Controllers/RumahMemilahController.cs +++ b/Controllers/RumahMemilahController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -namespace BpsRwApp.Areas.Admin.Controllers +namespace BpsRwApp.Controllers { - [Area("Admin")] - public class RumahMemilahController : Controller + [Route("[controller]/[action]")] + public class RumahMemilahController : AppControllerBase { public IActionResult Index() { diff --git a/Program.cs b/Program.cs index d8e9f83..e8983c1 100644 --- a/Program.cs +++ b/Program.cs @@ -115,10 +115,6 @@ app.UseAntiforgery(); app.UseAuthorization(); // Map routes with .NET 9 improvements -app.MapControllerRoute( - name: "areas", - pattern: "{area:exists}/{controller=Home}/{action=Index}/{id?}"); - app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json index 02e72de..1d84af2 100644 --- a/Properties/launchSettings.json +++ b/Properties/launchSettings.json @@ -1,12 +1,7 @@ { "profiles": { "BpsRwApp": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:51154;http://localhost:51155" + "commandName": "Project" } } } \ No newline at end of file diff --git a/Areas/Admin/Views/Dashboard/Index.cshtml b/Views/Dashboard/Index.cshtml similarity index 100% rename from Areas/Admin/Views/Dashboard/Index.cshtml rename to Views/Dashboard/Index.cshtml diff --git a/Views/DataBankSampah/Index.cshtml b/Views/DataBankSampah/Index.cshtml new file mode 100644 index 0000000..dcf29e3 --- /dev/null +++ b/Views/DataBankSampah/Index.cshtml @@ -0,0 +1,77 @@ +@{ + ViewData["Title"] = "Data Bank Sampah"; +} + +
+ +
+ + +
+
+

Data Bank Sampah

+
+
+ + filter_list + Filter + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + +
NoNamaKelurahanRTRWAlamatJumlah NasabahJumlah Potensi NasabahStatus
+
+
+ + + + + diff --git a/Views/DataBeratSampah/Index.cshtml b/Views/DataBeratSampah/Index.cshtml new file mode 100644 index 0000000..6a05421 --- /dev/null +++ b/Views/DataBeratSampah/Index.cshtml @@ -0,0 +1,76 @@ +@{ + ViewData["Title"] = "Data Berat Sampah"; +} + +
+ +
+ + +
+
+

Data Berat Sampah

+
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + +
NoTanggalKelurahanRWBerat Mudah Terurai
(Kg)		Berat Material Daur Ulang
(Kg)		Berat B3
(Kg)		Timbulan
(Kg)		Total Pengurangan Sampah
(Kg)		Neraca Sampah
(Kg)
+
+
+ + + + + diff --git a/Areas/Admin/Views/DataKecamatan/Index.cshtml b/Views/DataKecamatan/Index.cshtml similarity index 96% rename from Areas/Admin/Views/DataKecamatan/Index.cshtml rename to Views/DataKecamatan/Index.cshtml index e05df06..e2a398b 100644 --- a/Areas/Admin/Views/DataKecamatan/Index.cshtml +++ b/Views/DataKecamatan/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Data Kecamatan"; + ViewData["Title"] = "Data Kecamatan"; }
@@ -52,7 +52,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataKecamatan/Table', + ajax: '@Url.Action("Table", "DataKecamatan")', scrollX: true, autoWidth: false, initComplete: function () { @@ -88,4 +88,4 @@ }); }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/DataKecamatanChecklistHarian/Index.cshtml b/Views/DataKecamatanChecklistHarian/Index.cshtml similarity index 93% rename from Areas/Admin/Views/DataKecamatanChecklistHarian/Index.cshtml rename to Views/DataKecamatanChecklistHarian/Index.cshtml index b3435e8..7bdfe4c 100644 --- a/Areas/Admin/Views/DataKecamatanChecklistHarian/Index.cshtml +++ b/Views/DataKecamatanChecklistHarian/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Checklist Harian"; + ViewData["Title"] = "Checklist Harian"; }
@@ -43,13 +43,13 @@ -s + \ No newline at end of file + diff --git a/Areas/Admin/Views/DataKecamatanRumahMemilah/Index.cshtml b/Views/DataKecamatanRumahMemilah/Index.cshtml similarity index 94% rename from Areas/Admin/Views/DataKecamatanRumahMemilah/Index.cshtml rename to Views/DataKecamatanRumahMemilah/Index.cshtml index cf2ec07..b4d96d3 100644 --- a/Areas/Admin/Views/DataKecamatanRumahMemilah/Index.cshtml +++ b/Views/DataKecamatanRumahMemilah/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Rumah Memilah"; + ViewData["Title"] = "Rumah Memilah"; }
@@ -51,7 +51,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataKecamatanRumahMemilah/Table', + ajax: '@Url.Action("Table", "DataKecamatanRumahMemilah")', scrollX: true, autoWidth: false, initComplete: function () { @@ -68,4 +68,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/DataPendampingRw/Index.cshtml b/Views/DataPendampingRw/Index.cshtml similarity index 96% rename from Areas/Admin/Views/DataPendampingRw/Index.cshtml rename to Views/DataPendampingRw/Index.cshtml index cef776a..9894893 100644 --- a/Areas/Admin/Views/DataPendampingRw/Index.cshtml +++ b/Views/DataPendampingRw/Index.cshtml @@ -96,7 +96,7 @@ $(document).ready(function () { tableRapot = new DataTable('#tableRapot', { - ajax: '/Admin/DataPendampingRw/TableRapot', + ajax: '@Url.Action("TableRapot", "DataPendampingRw")', scrollX: true, initComplete: function () { $('div.dt-scroll-body thead').css('visibility', 'collapse'); @@ -113,7 +113,7 @@ }); tableChecklist = new DataTable('#tableChecklist', { - ajax: '/Admin/DataPendampingRw/TableChecklist', + ajax: '@Url.Action("TableChecklist", "DataPendampingRw")', scrollX: true, initComplete: function () { $('div.dt-scroll-body thead').css('visibility', 'collapse'); @@ -129,7 +129,7 @@ }); tableBeratSampah = new DataTable('#tableBeratSampah', { - ajax: '/Admin/DataPendampingRw/TableBeratSampah', + ajax: '@Url.Action("TableBeratSampah", "DataPendampingRw")', scrollX: true, initComplete: function () { $('div.dt-scroll-body thead').css('visibility', 'collapse'); @@ -145,4 +145,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/DataRt/Index.cshtml b/Views/DataRt/Index.cshtml similarity index 94% rename from Areas/Admin/Views/DataRt/Index.cshtml rename to Views/DataRt/Index.cshtml index 2af236f..c6e2e10 100644 --- a/Areas/Admin/Views/DataRt/Index.cshtml +++ b/Views/DataRt/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Data RT"; + ViewData["Title"] = "Data RT"; }
@@ -47,7 +47,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataRt/Table', + ajax: '@Url.Action("Table", "DataRt")', scrollX: true, autoWidth: false, initComplete: function () { @@ -61,4 +61,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Views/DataRumahPotensiRumah/Index.cshtml b/Views/DataRumahPotensiRumah/Index.cshtml new file mode 100644 index 0000000..cdc8ed9 --- /dev/null +++ b/Views/DataRumahPotensiRumah/Index.cshtml @@ -0,0 +1,78 @@ +@{ + ViewData["Title"] = "Potensi Rumah"; +} + +
+ +
+ + +
+
+

Potensi Rumah

+
+
+ + filter_list + Filter + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + +
NoRTRWAlamatKotaPemilik RumahID BangunanPotensiAksi
+
+
+ + + + + diff --git a/Areas/Admin/Views/DataRumahRumah/Index.cshtml b/Views/DataRumahRumah/Index.cshtml similarity index 95% rename from Areas/Admin/Views/DataRumahRumah/Index.cshtml rename to Views/DataRumahRumah/Index.cshtml index 5bb46fd..9828c1f 100644 --- a/Areas/Admin/Views/DataRumahRumah/Index.cshtml +++ b/Views/DataRumahRumah/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Data Rumah"; + ViewData["Title"] = "Data Rumah"; }
@@ -53,7 +53,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataRumahRumah/Table', + ajax: '@Url.Action("Table", "DataRumahRumah")', scrollX: true, autoWidth: true, initComplete: function () { @@ -75,4 +75,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/DataRw/Index.cshtml b/Views/DataRw/Index.cshtml similarity index 95% rename from Areas/Admin/Views/DataRw/Index.cshtml rename to Views/DataRw/Index.cshtml index 9f9228a..edc8ad1 100644 --- a/Areas/Admin/Views/DataRw/Index.cshtml +++ b/Views/DataRw/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Data RW"; + ViewData["Title"] = "Data RW"; }
@@ -50,7 +50,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataRw/Table', + ajax: '@Url.Action("Table", "DataRw")', scrollX: true, autoWidth: false, initComplete: function () { @@ -67,4 +67,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/DataSudinChecklistHarian/Index.cshtml b/Views/DataSudinChecklistHarian/Index.cshtml similarity index 94% rename from Areas/Admin/Views/DataSudinChecklistHarian/Index.cshtml rename to Views/DataSudinChecklistHarian/Index.cshtml index c86a03f..8c43b22 100644 --- a/Areas/Admin/Views/DataSudinChecklistHarian/Index.cshtml +++ b/Views/DataSudinChecklistHarian/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Checklist Harian"; + ViewData["Title"] = "Checklist Harian"; }
@@ -49,7 +49,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataSudinChecklistHarian/Table', + ajax: '@Url.Action("Table", "DataSudinChecklistHarian")', scrollX: true, autoWidth: false, initComplete: function () { @@ -64,4 +64,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/DataVerifikasiChecklistHarian/Index.cshtml b/Views/DataVerifikasiChecklistHarian/Index.cshtml similarity index 98% rename from Areas/Admin/Views/DataVerifikasiChecklistHarian/Index.cshtml rename to Views/DataVerifikasiChecklistHarian/Index.cshtml index 22a54da..fd9319e 100644 --- a/Areas/Admin/Views/DataVerifikasiChecklistHarian/Index.cshtml +++ b/Views/DataVerifikasiChecklistHarian/Index.cshtml @@ -101,7 +101,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/DataVerifikasiChecklistHarian/Table', + ajax: '@Url.Action("Table", "DataVerifikasiChecklistHarian")', scrollX: true, autoWidth: false, initComplete: function () { @@ -121,4 +121,4 @@ ] }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/LaporanRw/Index.cshtml b/Views/LaporanRw/Index.cshtml similarity index 98% rename from Areas/Admin/Views/LaporanRw/Index.cshtml rename to Views/LaporanRw/Index.cshtml index 32ca50d..af7a6f0 100644 --- a/Areas/Admin/Views/LaporanRw/Index.cshtml +++ b/Views/LaporanRw/Index.cshtml @@ -103,7 +103,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/LaporanRw/Table', + ajax: '@Url.Action("Table", "LaporanRw")', scrollX: true, autoWidth: false, initComplete: function () { @@ -139,4 +139,4 @@ }); }); }); - \ No newline at end of file + diff --git a/Areas/Admin/Views/RumahMemilah/Index.cshtml b/Views/RumahMemilah/Index.cshtml similarity index 96% rename from Areas/Admin/Views/RumahMemilah/Index.cshtml rename to Views/RumahMemilah/Index.cshtml index bac2600..1e6d03e 100644 --- a/Areas/Admin/Views/RumahMemilah/Index.cshtml +++ b/Views/RumahMemilah/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Rumah Memilah"; + ViewData["Title"] = "Rumah Memilah"; }
@@ -52,7 +52,7 @@ $(document).ready(function () { table = new DataTable('#example', { - ajax: '/Admin/RumahMemilah/Table', + ajax: '@Url.Action("Table", "RumahMemilah")', scrollX: true, autoWidth: false, initComplete: function () { @@ -88,4 +88,4 @@ }); }); }); - \ No newline at end of file + diff --git a/Areas/Shared/Layouts/App/_Layout.cshtml b/Views/Shared/Layouts/App/_Layout.cshtml similarity index 91% rename from Areas/Shared/Layouts/App/_Layout.cshtml rename to Views/Shared/Layouts/App/_Layout.cshtml index cd896ba..949040f 100644 --- a/Areas/Shared/Layouts/App/_Layout.cshtml +++ b/Views/Shared/Layouts/App/_Layout.cshtml @@ -12,7 +12,7 @@ - + @@ -42,7 +42,7 @@
- +
@RenderBody() @@ -50,7 +50,7 @@
- +
@@ -59,4 +59,4 @@ @await RenderSectionAsync("Scripts", required: false) - \ No newline at end of file + diff --git a/Areas/Shared/Layouts/App/_Navbar.cshtml b/Views/Shared/Layouts/App/_Navbar.cshtml similarity index 100% rename from Areas/Shared/Layouts/App/_Navbar.cshtml rename to Views/Shared/Layouts/App/_Navbar.cshtml diff --git a/Views/Shared/Layouts/App/_Sidebar.cshtml b/Views/Shared/Layouts/App/_Sidebar.cshtml new file mode 100644 index 0000000..559e3bd --- /dev/null +++ b/Views/Shared/Layouts/App/_Sidebar.cshtml @@ -0,0 +1,147 @@ + + + diff --git a/Areas/Admin/Views/_ViewImports.cshtml b/Views/Shared/Layouts/App/_ViewImports.cshtml similarity index 100% rename from Areas/Admin/Views/_ViewImports.cshtml rename to Views/Shared/Layouts/App/_ViewImports.cshtml diff --git a/Views/Shared/Layouts/Landing/_Footer.cshtml b/Views/Shared/Layouts/Landing/_Footer.cshtml new file mode 100644 index 0000000..b70b836 --- /dev/null +++ b/Views/Shared/Layouts/Landing/_Footer.cshtml @@ -0,0 +1,47 @@ + diff --git a/Views/Shared/Layouts/Landing/_Layout.cshtml b/Views/Shared/Layouts/Landing/_Layout.cshtml new file mode 100644 index 0000000..7c37c92 --- /dev/null +++ b/Views/Shared/Layouts/Landing/_Layout.cshtml @@ -0,0 +1,49 @@ + + + + + + @ViewData["Title"] - Bank Sampah Digital + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @RenderBody() +
+ + + + + + + @await RenderSectionAsync("Scripts", required: false) + + diff --git a/Views/Shared/Layouts/Landing/_Navbar.cshtml b/Views/Shared/Layouts/Landing/_Navbar.cshtml new file mode 100644 index 0000000..ff6bf92 --- /dev/null +++ b/Views/Shared/Layouts/Landing/_Navbar.cshtml @@ -0,0 +1,46 @@ +
+
+ +
+ Logo +
+ + + + + +
+ + Login + +
+ + +
+
+ + + +
+ +
+
+
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml deleted file mode 100644 index 876cf07..0000000 --- a/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - @ViewData["Title"] - Bank Sampah Digital - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- Logo -
- - - - - -
- - Login - -
- - -
-
- - - -
- -
-
-
- - -
- @RenderBody() -
- - - - - - - @await RenderSectionAsync("Scripts", required: false) - - \ No newline at end of file diff --git a/Views/_ViewImports.cshtml b/Views/_ViewImports.cshtml index f7f8e2b..08a72d1 100644 --- a/Views/_ViewImports.cshtml +++ b/Views/_ViewImports.cshtml @@ -1,3 +1,4 @@ @using BpsRwApp @using BpsRwApp.Models -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file +@using System.Linq +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Views/_ViewStart.cshtml b/Views/_ViewStart.cshtml index d641c67..c22bdad 100644 --- a/Views/_ViewStart.cshtml +++ b/Views/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ - Layout = "_Layout"; -} \ No newline at end of file + Layout = ViewData["Layout"] as string ?? "~/Views/Shared/Layouts/Landing/_Layout.cshtml"; +}