Unify student's and tutor's views

infoshareacademy · Jul 5, 2024 · 3b87487 · 3b87487
1 parent a7c1d28
commit 3b87487
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 77 deletions.
diff --git a/TutorLizard.Web/Views/Browse/AdDetails.cshtml b/TutorLizard.Web/Views/Browse/AdDetails.cshtml
@@ -7,7 +7,7 @@
     <div class="col-lg-6">
         <div class="ad-details">
             <div class="title-2"><h2>@Model.Title</h2></div>
-            <div class="row ad-details-description">
+            <div class="row ad-list-item">
                 <div class="row">
                     <div class="col-6 col-sm-3">Kategoria:</div>
                     <div class="col-6 col-sm-9">@Model.CategoryName</div>
@@ -29,7 +29,7 @@
                     <div class="col-6 col-sm-9">@Model.Price zł/h</div>
                 </div>
                 <div class="row">
-                    <div class="col-6 col-sm-9">
+                    <div class="col-6 col-sm-9 text-green">
                         @if (Model.IsRemote)
                         {
                             <span>Nauczanie zdalnie</span>
@@ -41,7 +41,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row ad-details-description">
+            <div class="row ad-list-item margin-top-small">
                 <div class="col">@Model.Description</div>
             </div>
         </div>

diff --git a/TutorLizard.Web/Views/Home/Index.cshtml b/TutorLizard.Web/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-@{
+div
     ViewData["Title"] = "Home Page";
 }
 <div class="banner-container">
@@ -11,19 +11,13 @@
 
 <div class="col-lg-5 mx-auto">
     <div class="custom-padding">
-    <div class="list-group btn-light">
-        <li class="btn"><a asp-controller="Tutor" asp-action="Index" class="custom-link">Nauczyciel</a></li>
-    </div>
+        <a asp-controller="Tutor" asp-action="Index" class="custom-link btn btn-light col-12">Nauczyciel</a>
     </div>
     <div class="custom-padding">
-    <ul class="list-group btn-light">
-        <li class="btn"><a asp-controller="Student" asp-action="Index" class="custom-link">Uczeń</a></li>
-    </ul>
+        <a asp-controller="Student" asp-action="Index" class="custom-link btn btn-light col-12">Uczeń</a>
     </div>
     <div class="custom-padding">
-    <ul class="list-group btn-light">
-        <li class="btn"><a asp-controller="Browse" asp-action="Schedule" class="custom-link">Terminy</a></li>
-    </ul>
+        <a asp-controller="Browse" asp-action="Schedule" class="custom-link btn btn-light col-12">Terminy</a>
     </div>
 </div>
 

diff --git a/TutorLizard.Web/Views/Shared/Components/TutorsScheduleForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/TutorsScheduleForAd/Default.cshtml
@@ -6,12 +6,12 @@
         <div class="title"><h3>Terminy</h3></div>
         <div>
             <ul class="list-group col-xl-12">
-                <div class="mx-auto"><a href="@Url.Action("CreateScheduleItem", "Tutor", new { id = Model.AdId })" class="btn btn-success">Dodaj nowy termin</a></div>
+                <div class="mx-auto"><a href="@Url.Action("CreateScheduleItem", "Tutor", new { id = Model.AdId })" class="btn btn-dark">Dodaj nowy termin</a></div>
             </ul>
         </div>
         @foreach(var scheduleItem in Model.ScheduleItems)
         {
-            <div class="border-1 user-container-light">
+            <div class="border-1 ad-list-item my-3">
                 <div class="title-2 mx-auto"><h4>@scheduleItem.DateTime</h4></div>
                 <div class="row align-items-center col-lg-10 mx-auto">
                     @if(scheduleItem.Requests.Count == 0)

diff --git a/TutorLizard.Web/Views/Shared/_Layout.cshtml b/TutorLizard.Web/Views/Shared/_Layout.cshtml
@@ -37,42 +37,38 @@
                 </button>
                 <div class="navbar-collapse d-sm-inline-flex justify-content-between collapse">
                     <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
-                        </li>
-
-                        <li class="nav-item dropdown">
+                        <div class="nav-item dropdown">
                             <a class="nav-link dropbtn">Funkcje<i class="fa fa-caret-down"></i></a>
                             <div class="dropdown-content">
                                 <a asp-controller="Tutor" asp-action="Index">Nauczyciel</a>
                                 <a asp-controller="Student" asp-action="Index">Uczeń</a>
                                 <a asp-controller="Browse" asp-action="Schedule">Terminy</a>
                             </div>
-                        </li>
+                        </div>
 
-                        <li class="nav-item">
+                        <div class="nav-item">
                             <a class="nav-link" asp-area="" asp-controller="Browse" asp-action="Ads">Przeglądaj</a>
-                        </li>
+                        </div>
                         @if (userName is null)
                         {
-                            <li class="nav-item">
+                            <div class="nav-item">
                                 <a class="nav-link" asp-area="" asp-controller="Account" asp-action="Register">Zarejestruj się</a>
-                            </li>
-                            <li class="nav-item">
+                            </div>
+                            <div class="nav-item">
                                 <a class="nav-link" asp-area="" asp-controller="Account" asp-action="Login">Zaloguj się</a>
-                            </li>
+                            </div>
                         }
                         else
                         {
-                            <li class="nav-item">
+                            <div class="nav-item">
                                 <a class="nav-link" asp-area="" asp-controller="Account" asp-action="Logout">Wyloguj się</a>
-                            </li>
+                            </div>
                             @* <li class="nav-item">
                                 <a class="nav-link" asp-area="" asp-controller="Home" asp-action="Data">Panel admina</a>
                             </li> *@
-                            <li class="nav-item">
+                            <div class="nav-item">
                                 <span class="nav-link">@userName</span>
-                            </li>
+                            </div>
                         }
                     </ul>
                     @* <form class="d-flex">

diff --git a/TutorLizard.Web/Views/Student/AcceptedAds.cshtml b/TutorLizard.Web/Views/Student/AcceptedAds.cshtml
@@ -4,10 +4,12 @@
 }
 
 <h1 class="title">Zatwierdzone zgłoszenia</h1>
-<div class="ad-grid">
+<div class="row">
 @foreach(var ad in Model.Ads)
 {
-    <partial name="@PartialNames.AdListItem" model="ad" />
+        <div class="col-12 col-md-6 flex-row flex-column">
+            <partial name="@PartialNames.AdListItem" model="ad" />
+            </div>
     }
 </div>
 
diff --git a/TutorLizard.Web/Views/Student/AdRequests.cshtml b/TutorLizard.Web/Views/Student/AdRequests.cshtml
@@ -4,9 +4,11 @@
 }
 
 <h1 class="title">Oczekujące zgłoszenia</h1>
-<div class="ad-grid">
+<div class="row">
 @foreach(var adRequest in Model.AdRequests)
 {
-    <partial name="@PartialNames.AdRequest" model="adRequest" />
+        <div class="col-12 col-md-6 flex-row flex-column">
+            <partial name="@PartialNames.AdRequest" model="adRequest" />
+        </div>
     }
 </div>
diff --git a/TutorLizard.Web/Views/Student/Index.cshtml b/TutorLizard.Web/Views/Student/Index.cshtml
@@ -3,17 +3,12 @@
 <h1 class="title">Funkcjonalność ucznia</h1>
 
 <div class="col-lg-5 mx-auto">
-    <div class="custom-padding">
-        <div class="list-group btn-light">
-            <li class="btn"><a asp-action="AdRequests" class="custom-link">Oczekujące zgłoszenia</a></li>
-        </div>
+    <div class="list-group">
+        <div class="btn"><a asp-action="AdRequests" class="custom-link btn btn-light col-12">Oczekujące zgłoszenia</a></div>
     </div>
-</div>
-<div class="col-lg-5 mx-auto">
-    <div class="custom-padding">
-         <div class="list-group btn-light">
-            <li class="btn"><a asp-action="AcceptedAds" class="custom-link">Przyjęte zgłoszenia</a></li>
-         </div>
+
+    <div class="list-group">
+        <div class="btn"><a asp-action="AcceptedAds" class="custom-link btn btn-light col-12">Przyjęte zgłoszenia</a></div>
     </div>
 </div>
 
diff --git a/TutorLizard.Web/Views/Tutor/Index.cshtml b/TutorLizard.Web/Views/Tutor/Index.cshtml
@@ -1,35 +1,22 @@
 <h1 class="title">Funkcjonalność nauczyciela</h1>
 
 <div class="col-lg-5 mx-auto">
-    <div class="custom-padding">
-        <div class="list-group btn-light">
-            <li class="btn btn-list"><a asp-action="TutorsAdsList" class="custom-link">Twoje ogłoszenia</a></li>
-        </div>
+
+    <div class="list-group">
+        <div class="btn btn-list"><a asp-action="TutorsAdsList" class="custom-link btn btn-light col-12">Twoje ogłoszenia</a></div>
     </div>
-</div>
 
-<div class="col-lg-5 mx-auto">
-    <div class="custom-padding">
-        <div class="list-group btn-light">
-    <li class="btn"><a asp-action="CreateAd" class="custom-link">Dodaj ogłoszenie</a></li>
-        </div>
+    <div class="list-group">
+    <div class="btn"><a asp-action="CreateAd" class="custom-link btn btn-light col-12">Dodaj ogłoszenie</a></div>
     </div>
-</div>
 
-    <div class="col-lg-5 mx-auto">
-        <div class="custom-padding">
-            <div class="list-group btn-light">
-    <li class="btn"><a asp-action="ViewPendingAdRequests" class="custom-link">Oczekujące zgłoszenia</a></li>
-            </div>
+    <div class="list-group">
+        <div class="btn"><a asp-action="ViewPendingAdRequests" class="custom-link btn btn-light col-12">Oczekujące zgłoszenia</a></div>
         </div>
-    </div>
 
-        <div class="col-lg-5 mx-auto">
-            <div class="custom-padding">
-                <div class="list-group btn-light">
-        <li class="btn"><a asp-action="ViewAllAdRequests" class="custom-link">Wszystkie zgłoszenia</a></li>
-                </div>
+    <div class="list-group">
+            <div class="btn"><a asp-action="ViewAllAdRequests" class="custom-link btn btn-light col-12">Wszystkie zgłoszenia</a></div>
             </div>
-        </div>
+ </div>
 
 
diff --git a/TutorLizard.Web/Views/Tutor/TutorsAdsList.cshtml b/TutorLizard.Web/Views/Tutor/TutorsAdsList.cshtml
@@ -4,9 +4,9 @@
 }
 
 <h1 class="title">Twoje ogłoszenia</h1>
-<div class="ad-grid">
+<div class="row">
 @foreach(var adListItem in Model.AdList)
 {
-    <partial name="@PartialNames.AdListItem" model="adListItem" />
+    <div class="col-12 col-md-6 col-xl-4 flex-row flex-column"><partial name="@PartialNames.AdListItem" model="adListItem" /></div>
     }
 </div>
diff --git a/TutorLizard.Web/Views/Tutor/ViewAllAdRequests.cshtml b/TutorLizard.Web/Views/Tutor/ViewAllAdRequests.cshtml
@@ -5,8 +5,10 @@
 }
 
 <h1 class="title">Zgłoszenia</h1>
+<div class="row">
 @foreach (var adrequest in Model.AdRequests)
 {
-    <partial name="@PartialNames.TutorAllAdRequestsListItem" model="adrequest" />
-}
+    <div class="col-12 col-md-6 flex-row flex-column"><partial name="@PartialNames.TutorAllAdRequestsListItem" model="adrequest" /></div>
+    }
+</div>
 
diff --git a/TutorLizard.Web/Views/Tutor/ViewPendingAdRequests.cshtml b/TutorLizard.Web/Views/Tutor/ViewPendingAdRequests.cshtml
@@ -5,7 +5,11 @@
 }
 
 <h1 class="title">Oczekujące zgłoszenia</h1>
+<div class="row">
 @foreach (var adrequest in Model.AdRequests)
 {
-   <partial name="@PartialNames.PendingAdRequestsListItem" model="adrequest" />
-}
+        <div class="col-12 col-md-6 flex-row flex-column">
+            <partial name="@PartialNames.PendingAdRequestsListItem" model="adrequest" />
+            </div>
+    }
+</div>
diff --git a/TutorLizard.Web/wwwroot/css/tutorlizard.css b/TutorLizard.Web/wwwroot/css/tutorlizard.css
@@ -120,15 +120,15 @@ body {
     padding: 10px;
     background-color: #f9f9f9;
     border: 1px solid #dddddd;
-    border-radius: 5px;
+    border-radius: 0px;
 }
 
 .user-container-light {
     margin-top: 10px;
     padding: 10px;
     background-color: #ffffff;
     border: 1px solid #dddddd;
-    border-radius: 5px;
+    border-radius: 0px;
 }
 
 /*.ad-grid {
@@ -276,7 +276,7 @@ body {
 .search-container {
     border-top: 3px solid;
     border-bottom: 3px solid;
-    border-color: #2b4027;
+    border-color: #9db88c;
     background-color: #ffffff;
     padding: 20px;
     font-family: "Montserrat", sans-serif;