diff --git a/.gitignore b/.gitignore index cb00ca7..169fb4b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ wwwroot/lib/ appsettings.Development.json *.user *.db -node_modules/ \ No newline at end of file +node_modules/ +*.vs \ No newline at end of file diff --git a/Controllers/LoginController.cs b/Controllers/LoginController.cs index f10c0e3..e69de29 100644 --- a/Controllers/LoginController.cs +++ b/Controllers/LoginController.cs @@ -1,23 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - - -namespace eSPJ.Controllers -{ - [Route("login")] - public class LoginController : Controller - { - private readonly IConfiguration _configuration; - - public LoginController(IConfiguration configuration) - { - _configuration = configuration; - } - - [HttpGet("")] - public IActionResult Index() - { - ViewBag.SSOLoginUrl = _configuration["SSO:LoginUrl"]; - return View(); - } - } -} diff --git a/Controllers/DetailController.cs b/Controllers/SpjDriverController/DetailController.cs similarity index 56% rename from Controllers/DetailController.cs rename to Controllers/SpjDriverController/DetailController.cs index 818b465..af0edd4 100644 --- a/Controllers/DetailController.cs +++ b/Controllers/SpjDriverController/DetailController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace eSPJ.Controllers +namespace eSPJ.Controllers.SpjDriverController { [Route("detail-penjemputan")] public class DetailPenjemputanController : Controller @@ -9,13 +9,13 @@ namespace eSPJ.Controllers [HttpGet("")] public IActionResult Index() { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/DetailPenjemputan/Index.cshtml"); } [HttpGet("batal")] public IActionResult Batal() { - return View("~/Views/DetailPenjemputan/Batal.cshtml"); + return View("~/Views/Admin/Transport/SpjDriver/DetailPenjemputan/Batal.cshtml"); } } diff --git a/Controllers/HistoryController.cs b/Controllers/SpjDriverController/HistoryController.cs similarity index 60% rename from Controllers/HistoryController.cs rename to Controllers/SpjDriverController/HistoryController.cs index 89b85de..f25be77 100644 --- a/Controllers/HistoryController.cs +++ b/Controllers/SpjDriverController/HistoryController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace eSPJ.Controllers +namespace eSPJ.Controllers.SpjDriverController { [Route("history")] public class HistoryController : Controller @@ -9,14 +9,14 @@ namespace eSPJ.Controllers [HttpGet("")] public IActionResult Index() { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/History/Index.cshtml"); } [HttpGet("details/{id}")] public IActionResult Details(int id) { ViewData["Id"] = id; - return View(); + return View("~/Views/Admin/Transport/SpjDriver/History/Details.cshtml"); } } } diff --git a/Controllers/HomeController.cs b/Controllers/SpjDriverController/HomeController.cs similarity index 75% rename from Controllers/HomeController.cs rename to Controllers/SpjDriverController/HomeController.cs index dbe457d..f210047 100644 --- a/Controllers/HomeController.cs +++ b/Controllers/SpjDriverController/HomeController.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using Microsoft.AspNetCore.Mvc; using eSPJ.Models; -namespace eSPJ.Controllers; +namespace eSPJ.Controllers.SpjDriverController; public class HomeController : Controller { @@ -16,17 +16,12 @@ public class HomeController : Controller public IActionResult Index() { - return View(); - } - - public IActionResult Batal() - { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/Home/Index.cshtml"); } public IActionResult Privacy() { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/Home/Privacy.cshtml"); } [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] diff --git a/Controllers/SpjDriverController/LoginController.cs b/Controllers/SpjDriverController/LoginController.cs new file mode 100644 index 0000000..93bccd5 --- /dev/null +++ b/Controllers/SpjDriverController/LoginController.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Mvc; + + +namespace eSPJ.Controllers.SpjDriverController +{ + [Route("login")] + public class LoginController : Controller + { + private readonly IConfiguration _configuration; + + public LoginController(IConfiguration configuration) + { + _configuration = configuration; + } + + [HttpGet("")] + public IActionResult Index() + { + ViewBag.SSOLoginUrl = _configuration["SSO:LoginUrl"]; + return View("~/Views/Admin/Transport/SpjDriver/Login/Index.cshtml"); + } + } +} diff --git a/Controllers/ProfilController.cs b/Controllers/SpjDriverController/ProfilController.cs similarity index 60% rename from Controllers/ProfilController.cs rename to Controllers/SpjDriverController/ProfilController.cs index 9f6b540..455cea4 100644 --- a/Controllers/ProfilController.cs +++ b/Controllers/SpjDriverController/ProfilController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace eSPJ.Controllers +namespace eSPJ.Controllers.SpjDriverController { [Route("profil")] public class ProfilController : Controller @@ -9,7 +9,7 @@ namespace eSPJ.Controllers [HttpGet("")] public IActionResult Index() { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/Profil/Index.cshtml"); } } } diff --git a/Controllers/SubmitController.cs b/Controllers/SpjDriverController/SubmitController.cs similarity index 58% rename from Controllers/SubmitController.cs rename to Controllers/SpjDriverController/SubmitController.cs index e343da5..1dac2d0 100644 --- a/Controllers/SubmitController.cs +++ b/Controllers/SpjDriverController/SubmitController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace eSPJ.Controllers +namespace eSPJ.Controllers.SpjDriverController { [Route("submit")] public class SubmitController : Controller @@ -9,14 +9,14 @@ namespace eSPJ.Controllers [HttpGet("")] public IActionResult Index() { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/Submit/Index.cshtml"); } [HttpGet("struk")] public IActionResult Struk() { - return View(); + return View("~/Views/Admin/Transport/SpjDriver/Submit/Struk.cshtml"); } } } diff --git a/Views/DetailPenjemputan/Batal.cshtml b/Views/Admin/Transport/SpjDriver/DetailPenjemputan/Batal.cshtml similarity index 95% rename from Views/DetailPenjemputan/Batal.cshtml rename to Views/Admin/Transport/SpjDriver/DetailPenjemputan/Batal.cshtml index a2c784e..6222c9b 100644 --- a/Views/DetailPenjemputan/Batal.cshtml +++ b/Views/Admin/Transport/SpjDriver/DetailPenjemputan/Batal.cshtml @@ -1,4 +1,5 @@ @{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; ViewData["Title"] = "Detail Batal Penjemputan"; } @@ -69,8 +70,9 @@ - - + + + diff --git a/Views/DetailPenjemputan/Index.cshtml b/Views/Admin/Transport/SpjDriver/DetailPenjemputan/Index.cshtml similarity index 91% rename from Views/DetailPenjemputan/Index.cshtml rename to Views/Admin/Transport/SpjDriver/DetailPenjemputan/Index.cshtml index 533d93f..706ff9c 100644 --- a/Views/DetailPenjemputan/Index.cshtml +++ b/Views/Admin/Transport/SpjDriver/DetailPenjemputan/Index.cshtml @@ -1,4 +1,5 @@ @{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; ViewData["Title"] = "Detail Penjemputan"; } @@ -49,7 +50,7 @@ Masukkan Odometer - + @@ -66,8 +67,9 @@ - - + + + diff --git a/Views/History/Details.cshtml b/Views/Admin/Transport/SpjDriver/History/Details.cshtml similarity index 98% rename from Views/History/Details.cshtml rename to Views/Admin/Transport/SpjDriver/History/Details.cshtml index 4de71e6..7cf4bff 100644 --- a/Views/History/Details.cshtml +++ b/Views/Admin/Transport/SpjDriver/History/Details.cshtml @@ -1,4 +1,5 @@ @{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; ViewData["Title"] = "Detail Perjalanan - DLH"; } @@ -157,6 +158,7 @@ + - + \ No newline at end of file diff --git a/Views/History/Index.cshtml b/Views/Admin/Transport/SpjDriver/History/Index.cshtml similarity index 96% rename from Views/History/Index.cshtml rename to Views/Admin/Transport/SpjDriver/History/Index.cshtml index 339294c..c156df3 100644 --- a/Views/History/Index.cshtml +++ b/Views/Admin/Transport/SpjDriver/History/Index.cshtml @@ -1,4 +1,5 @@ @{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; ViewData["Title"] = "History - DLH"; } @@ -137,8 +138,9 @@ } - - + + + diff --git a/Views/Home/Index.cshtml b/Views/Admin/Transport/SpjDriver/Home/Index.cshtml similarity index 96% rename from Views/Home/Index.cshtml rename to Views/Admin/Transport/SpjDriver/Home/Index.cshtml index e66f8d8..dfdd1b1 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Admin/Transport/SpjDriver/Home/Index.cshtml @@ -1,4 +1,5 @@ @{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; ViewData["Title"] = "Home Page"; } @@ -28,7 +29,7 @@ - + @@ -48,7 +49,7 @@ - + @@ -131,7 +132,7 @@ - + diff --git a/Views/Home/Privacy.cshtml b/Views/Admin/Transport/SpjDriver/Home/Privacy.cshtml similarity index 100% rename from Views/Home/Privacy.cshtml rename to Views/Admin/Transport/SpjDriver/Home/Privacy.cshtml diff --git a/Views/Admin/Transport/SpjDriver/Login/Index.cshtml b/Views/Admin/Transport/SpjDriver/Login/Index.cshtml new file mode 100644 index 0000000..6590c66 --- /dev/null +++ b/Views/Admin/Transport/SpjDriver/Login/Index.cshtml @@ -0,0 +1,880 @@ +@{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; + ViewData["Title"] = "Login eSPJ"; +} + + + + + + + + + + + @* + + + + *@ + + Selamat Datang di eSPJ + Aplikasi modern untuk pengelolaan Surat Perintah Jalan Driver yang efisien dan terintegrasi. + + + + + + + + + + Monitoring Real-Time + Pantau status SPJ driver, kondisi kendaraan, dan muatan di setiap lokasi secara langsung. + + + + + + + + + + + + Integrasi Lengkap + Sistem terhubung antara admin, driver, dan manajemen untuk pengelolaan SPJ yang efisien. + + + + + + + + + + + + + + + Masuk ke eSPJ + Gunakan Single Sign-On untuk akses yang aman + + + + + + + Masuk dengan SSO + + + + + + + + + + + + + + + + + + + Lewati + Selanjutnya + + + + + + + + Single Sign-On + + + + + + + + + + + + + + + + + + + + + + + Update tersedia + Versi baru aplikasi sudah tersedia + + Update + + + + + + @* Display any server-side validation errors *@ + @if (ViewData.ModelState.ErrorCount > 0) + { + + + @foreach (var error in ViewData.ModelState.Values.SelectMany(v => v.Errors)) + { + @error.ErrorMessage + } + + + } + + +@section Styles { + +} + +@section Scripts { + +} \ No newline at end of file diff --git a/Views/Profil/Index.cshtml b/Views/Admin/Transport/SpjDriver/Profil/Index.cshtml similarity index 95% rename from Views/Profil/Index.cshtml rename to Views/Admin/Transport/SpjDriver/Profil/Index.cshtml index b30b78c..2651dec 100644 --- a/Views/Profil/Index.cshtml +++ b/Views/Admin/Transport/SpjDriver/Profil/Index.cshtml @@ -1,4 +1,5 @@ @{ + Layout = "~/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml"; ViewData["Title"] = "Profil Page"; } @@ -99,7 +100,8 @@ - - + + + \ No newline at end of file diff --git a/Views/Shared/Components/_Navigation.cshtml b/Views/Admin/Transport/SpjDriver/Shared/Components/_Navigation.cshtml similarity index 83% rename from Views/Shared/Components/_Navigation.cshtml rename to Views/Admin/Transport/SpjDriver/Shared/Components/_Navigation.cshtml index cdacdc2..c283b6f 100644 --- a/Views/Shared/Components/_Navigation.cshtml +++ b/Views/Admin/Transport/SpjDriver/Shared/Components/_Navigation.cshtml @@ -34,9 +34,14 @@ - + + + @* + + + *@ diff --git a/Views/Shared/Error.cshtml b/Views/Admin/Transport/SpjDriver/Shared/Error.cshtml similarity index 100% rename from Views/Shared/Error.cshtml rename to Views/Admin/Transport/SpjDriver/Shared/Error.cshtml diff --git a/Views/Shared/_Layout.cshtml b/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml similarity index 65% rename from Views/Shared/_Layout.cshtml rename to Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml index 566ee18..2542ef6 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Admin/Transport/SpjDriver/Shared/_Layout.cshtml @@ -25,42 +25,31 @@ - + @* *@ - - - - @await RenderSectionAsync("Styles", required: false) + + + + @await RenderSectionAsync("Styles", required: false) + - @RenderBody() + @RenderBody() - - - - - - - + + + @await RenderSectionAsync("Scripts", required: false) - - - - +
Aplikasi modern untuk pengelolaan Surat Perintah Jalan Driver yang efisien dan terintegrasi.
Pantau status SPJ driver, kondisi kendaraan, dan muatan di setiap lokasi secara langsung.
Sistem terhubung antara admin, driver, dan manajemen untuk pengelolaan SPJ yang efisien.
Gunakan Single Sign-On untuk akses yang aman
Update tersedia
@error.ErrorMessage