Merge pull request #129 from infoshareacademy/fix/paulina-wudarska

Fix layout
infoshareacademy · Jul 7, 2024 · ec85b90 · ec85b90
2 parents 05aa4c6 + 9be7e16
commit ec85b90
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 18 deletions.
diff --git a/TutorLizard.Web/Resources/Home.Designer.cs b/TutorLizard.Web/Resources/Home.Designer.cs
diff --git a/TutorLizard.Web/Resources/Home.en.resx b/TutorLizard.Web/Resources/Home.en.resx
@@ -132,6 +132,9 @@
   <data name="Data" xml:space="preserve">
     <value>Data</value>
   </data>
+  <data name="Functions" xml:space="preserve">
+    <value>Functions</value>
+  </data>
   <data name="HomePage" xml:space="preserve">
     <value>Home</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="ScheduleItems" xml:space="preserve">
     <value>Schedule Items</value>
   </data>
+  <data name="Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
   <data name="StudentFunction" xml:space="preserve">
     <value>Student</value>
   </data>

diff --git a/TutorLizard.Web/Resources/Home.resx b/TutorLizard.Web/Resources/Home.resx
@@ -132,6 +132,9 @@
   <data name="Data" xml:space="preserve">
     <value>Dane</value>
   </data>
+  <data name="Functions" xml:space="preserve">
+    <value>Funkcje</value>
+  </data>
   <data name="HomePage" xml:space="preserve">
     <value>Strona startowa</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="ScheduleItems" xml:space="preserve">
     <value>Terminy</value>
   </data>
+  <data name="Search" xml:space="preserve">
+    <value>Przeglądaj</value>
+  </data>
   <data name="StudentFunction" xml:space="preserve">
     <value>Uczeń</value>
   </data>

diff --git a/TutorLizard.Web/Resources/Student.Designer.cs b/TutorLizard.Web/Resources/Student.Designer.cs
diff --git a/TutorLizard.Web/Resources/Student.resx b/TutorLizard.Web/Resources/Student.resx
@@ -130,6 +130,6 @@
     <value>Student</value>
   </data>
   <data name="YourAdRequests" xml:space="preserve">
-    <value>Przyjęte zgłoszenia</value>
+    <value>Twoje zgłoszenia</value>
   </data>
 </root>
diff --git a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml
@@ -3,8 +3,8 @@
 
 @if(Model is not null)
 {
-    <div class="row">
-        <div class="title-2"><h3>@TutorLizard.Web.Resources.Shared.YourRequest</h3></div>
+    <div class="row w-100">
+        <div class="title-2 margin-bottom"><h3>@TutorLizard.Web.Resources.Shared.YourRequest</h3></div>
         <div class="col-md-11 row ad-list-item">
             <span>@TutorLizard.Web.Resources.Shared.RequestStatus </span>
             @if(Model.Status == GetAdRequestStatusResponse.RequestStatus.Accepted)
@@ -20,19 +20,24 @@
                 <span class="status-rejected">@TutorLizard.Web.Resources.Shared.RequestRejected</span>
             }
 
-        <div>Data wysłania: @Model.DateCreated</div>
+            <div>Data wysłania: @Model.DateCreated</div>
         </div>
-        <div>
-            <div class="col-md-11 row ad-list-item">@TutorLizard.Web.Resources.Shared.RequestMessage</div>
-            <div>@Model.Message</div>
-        </div>
-        @if(Model.ReplyMessage is not null)
-        {
-            <div>
-                <div class="h5 mt-3">@TutorLizard.Web.Resources.Shared.RequestTutorResponse</div>
-                <div>@Model.ReplyMessage</div>
-            </div>
-        }
+
+            <div class="col-md-11 row ad-list-item my-3">
+                    <div>
+                        <div class="text-bold">@TutorLizard.Web.Resources.Shared.RequestMessage</div>
+                        <div>@Model.Message</div>
+
+
+
+                        @if(Model.ReplyMessage is not null)
+                        {
+                                <div>@TutorLizard.Web.Resources.Shared.RequestTutorResponse
+                                        <div>@Model.ReplyMessage</div>
+                                </div>
+                        }
+                    </div>
+                </div>
     </div>
     @* if (Model.Status == AdRequestStatusResponse.RequestStatus.Pending)
     {

diff --git a/TutorLizard.Web/Views/Shared/_Layout.cshtml b/TutorLizard.Web/Views/Shared/_Layout.cshtml
@@ -39,7 +39,7 @@
                 <div class="navbar-collapse d-sm-inline-flex justify-content-between collapse">
                     <ul class="navbar-nav flex-grow-1">
                         <div class="nav-item dropdown">
-                            <a class="nav-link dropbtn">Funkcje<i class="fa fa-caret-down"></i></a>
+                            <a class="nav-link dropbtn">@TutorLizard.Web.Resources.Home.Functions<i class="fa fa-caret-down"></i></a>
                             <div class="dropdown-content">
                                 <a asp-controller="Tutor" asp-action="Index">@TutorLizard.Web.Resources.Home.TutorFunction</a>
                                 <a asp-controller="Student" asp-action="Index">@TutorLizard.Web.Resources.Home.StudentFunction</a>
@@ -48,7 +48,7 @@
                         </div>
 
                         <div class="nav-item">
-                            <a class="nav-link" asp-area="" asp-controller="Browse" asp-action="Ads">Przeglądaj</a>
+                            <a class="nav-link" asp-area="" asp-controller="Browse" asp-action="Ads">@TutorLizard.Web.Resources.Home.Search</a>
                         </div>
                         <ul class="navbar-nav ms-auto">
                             <div class="btn-group">