diff --git a/TutorLizard.Blazor/Components/Calendar.razor.css b/TutorLizard.Blazor/Components/Calendar.razor.css index acaf605c..7ce94c4e 100644 --- a/TutorLizard.Blazor/Components/Calendar.razor.css +++ b/TutorLizard.Blazor/Components/Calendar.razor.css @@ -1,8 +1,8 @@ .calendar-container { display: flex; flex-direction: column; - background-color: darkgreen; - border-radius: 1rem; + background-color: #2b4027; + border-radius: 0px; padding: 1rem; } @@ -39,7 +39,7 @@ .calendar-main { border-radius: .5rem; overflow: hidden; - background-color: whitesmoke; + background-color: #2b4027; } .seven-column-section { @@ -55,7 +55,7 @@ .days-header div { padding: 1rem 0; - background-color: white; + background-color: #9db88c; text-align: center; font-weight: bold; } @@ -75,7 +75,7 @@ } .calendar-grid div:hover { - background-color: darkgreen; + background-color: #9db88c; transition: .35s; color: white; font-weight: bold; diff --git a/TutorLizard.Blazor/Components/ScheduleForDay.razor b/TutorLizard.Blazor/Components/ScheduleForDay.razor index 34a9766c..67acb67f 100644 --- a/TutorLizard.Blazor/Components/ScheduleForDay.razor +++ b/TutorLizard.Blazor/Components/ScheduleForDay.razor @@ -4,7 +4,7 @@
- @TutorLizard.Web.Resources.Ad.CreateNew + @TutorLizard.Web.Resources.Ad.CreateNew
-@Html.DisplayNameFor(model => model.Id) @@ -65,7 +65,7 @@ @Html.DisplayFor(modelItem => item.CategoryId) @if (ViewBag.CategoryName is not null) { - (@ViewBag.CategoryName) + (@ViewBag.CategoryName) } |
diff --git a/TutorLizard.Web/Views/Browse/AdDetails.cshtml b/TutorLizard.Web/Views/Browse/AdDetails.cshtml
index bd673349..7f26ef52 100644
--- a/TutorLizard.Web/Views/Browse/AdDetails.cshtml
+++ b/TutorLizard.Web/Views/Browse/AdDetails.cshtml
@@ -2,61 +2,71 @@
@using TutorLizard.Web.Resources
@model GetAdDetailsResponse
-@TutorLizard.Web.Resources.Browse.AdDetails+@TutorLizard.Web.Resources.Browse.AdDetails-
- @Model.Title
-
- @TutorLizard.Web.Resources.Browse.CategoryName :
- @Model.CategoryName
-
-
- @TutorLizard.Web.Resources.Browse.Subject :
- @Model.Subject
-
-
- @TutorLizard.Web.Resources.Browse.Localization :
- @Model.Location
-
-
- @TutorLizard.Web.Resources.Browse.PostedBy :
- @Model.TutorName
-
- @TutorLizard.Web.Resources.Browse.PostedBy :
- @Model.Price zł/h
+
+
+
-
+
@Model.Title+
+
+
+
+ @TutorLizard.Web.Resources.Browse.CategoryName:
+ @Model.CategoryName
+
+
+ @TutorLizard.Web.Resources.Browse.Subject:
+ @Model.Subject
+
+
+ @TutorLizard.Web.Resources.Browse.Localization:
+ @Model.Location
+
+
+ @TutorLizard.Web.Resources.Browse.PostedBy:
+ @Model.TutorName
+
+
+ @TutorLizard.Web.Resources.Browse.Price:
+ @Model.Price zł/h
+
+
+ @TutorLizard.Web.Resources.Browse.IsRemote:
+
+ @if (Model.IsRemote)
+ {
+ @TutorLizard.Web.Resources.Browse.Yes
+ }
+ else
+ {
+ @TutorLizard.Web.Resources.Browse.No
+ }
+
+
+
+ @Model.Description
+
- @TutorLizard.Web.Resources.Browse.IsRemote :
-
- @if (Model.IsRemote)
+
+
-
-@if(Model.UserRelationship == AdToUserRelationship.Owner)
-{
- @await Component.InvokeAsync(nameof(TutorsScheduleForAd), new { adId = Model.AdId })
-}
-@if(Model.UserRelationship == AdToUserRelationship.AcceptedStudent)
-{
- @await Component.InvokeAsync(nameof(AvailableScheduleForAd), new {adId = Model.AdId})
-}
-@if(Model.UserRelationship == AdToUserRelationship.PendingStudent)
-{
- @await Component.InvokeAsync(nameof(AdRequestStatusForAd), new {adId = Model.AdId})
-}
-@if(Model.UserRelationship == AdToUserRelationship.None)
-{
- @await Component.InvokeAsync(nameof(CreateRequestForAd), new { adId = Model.AdId })
-}
\ No newline at end of file
diff --git a/TutorLizard.Web/Views/Browse/Ads.cshtml b/TutorLizard.Web/Views/Browse/Ads.cshtml
index 73a86b12..f4fa7217 100644
--- a/TutorLizard.Web/Views/Browse/Ads.cshtml
+++ b/TutorLizard.Web/Views/Browse/Ads.cshtml
@@ -10,16 +10,18 @@
categories = ViewBag.Categories;
}
}
+
+
+
-
+
-
+ @if (Model.UserRelationship == AdToUserRelationship.Owner)
{
- @TutorLizard.Web.Resources.Browse.Yes
+ @await Component.InvokeAsync(nameof(TutorsScheduleForAd), new { adId = Model.AdId })
}
- else
+ @if (Model.UserRelationship == AdToUserRelationship.AcceptedStudent)
{
- @TutorLizard.Web.Resources.Browse.No
+ @await Component.InvokeAsync(nameof(AvailableScheduleForAd), new { adId = Model.AdId })
+ }
+ @if (Model.UserRelationship == AdToUserRelationship.PendingStudent)
+ {
+ @await Component.InvokeAsync(nameof(AdRequestStatusForAd), new { adId = Model.AdId })
+ }
+ @if (Model.UserRelationship == AdToUserRelationship.None)
+ {
+ @await Component.InvokeAsync(nameof(CreateRequestForAd), new { adId = Model.AdId })
}
-
@Model.Description
- @TutorLizard.Web.Resources.Browse.Ads+@TutorLizard.Web.Resources.Browse.Ads- @@ -29,24 +31,27 @@@TutorLizard.Web.Resources.Browse.NumberOfResults : @Model.TotalAds
}
+
@foreach (var ad in Model.Ads)
{
-
-
-
+
+
+
-
- @if(Model.PageNumber > 1)
+ @if (Model.PageNumber > 1)
{
@if (Model.SearchCriteria.AnySearch)
{
- @TutorLizard.Web.Resources.Browse.PreviousPage
+ @TutorLizard.Web.Resources.Browse.PreviousPage
}
else
{
- @TutorLizard.Web.Resources.Browse.PreviousPage
+ @TutorLizard.Web.Resources.Browse.PreviousPage
}
}
@@ -55,16 +60,16 @@
@TutorLizard.Web.Resources.Browse.Page @Model.PageNumber z @Model.TotalPages
- @if(Model.TotalPages > Model.PageNumber)
+
+ @if (Model.TotalPages > Model.PageNumber)
{
- @if(Model.SearchCriteria.AnySearch)
+ @if (Model.SearchCriteria.AnySearch)
{
- @TutorLizard.Web.Resources.Browse.NextPage
+ @TutorLizard.Web.Resources.Browse.NextPage
}
else
{
- @TutorLizard.Web.Resources.Browse.NextPage
+ @TutorLizard.Web.Resources.Browse.NextPage
}
}
diff --git a/TutorLizard.Web/Views/Browse/Schedule.cshtml b/TutorLizard.Web/Views/Browse/Schedule.cshtml
index 86e81622..380a86aa 100644
--- a/TutorLizard.Web/Views/Browse/Schedule.cshtml
+++ b/TutorLizard.Web/Views/Browse/Schedule.cshtml
@@ -1,7 +1,7 @@
@using TutorLizard.Web.Extensions
@model GetUsersScheduleResponse
-@TutorLizard.Web.Resources.Browse.YourSchedule+@TutorLizard.Web.Resources.Browse.YourSchedule@TutorLizard.Web.Resources.Home.HomePage- - - - + + + + +@TutorLizard.Web.Resources.Home.HomePage+ +
+
+
+
+
+
+
+
diff --git a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml
index 61c31468..fe5dd4ad 100644
--- a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml
+++ b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml
@@ -3,26 +3,27 @@
@if(Model is not null)
{
-
- @TutorLizard.Web.Resources.Shared.YourRequest
+
+
@TutorLizard.Web.Resources.Shared.YourRequest
@TutorLizard.Web.Resources.Shared.RequestStatus
@if(Model.Status == GetAdRequestStatusResponse.RequestStatus.Accepted)
{
- @TutorLizard.Web.Resources.Shared.RequestAccepted
+ @TutorLizard.Web.Resources.Shared.RequestAccepted
}
else if(Model.Status == GetAdRequestStatusResponse.RequestStatus.Pending)
{
- @TutorLizard.Web.Resources.Shared.RequestPending
+ @TutorLizard.Web.Resources.Shared.RequestPending
}
else if (Model.Status == GetAdRequestStatusResponse.RequestStatus.Rejected)
{
- @TutorLizard.Web.Resources.Shared.RequestRejected
+ @TutorLizard.Web.Resources.Shared.RequestRejected
}
-
+
Data wysłania: @Model.DateCreated
+
-
@if(Model.ReplyMessage is not null)
diff --git a/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml
index 38ef0c59..c15f2dc9 100644
--- a/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml
+++ b/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml
@@ -4,53 +4,56 @@
@if (Model is not null)
{
- @TutorLizard.Web.Resources.Shared.RequestMessage
+ @TutorLizard.Web.Resources.Shared.RequestMessage
@Model.Message
@TutorLizard.Web.Resources.Shared.AvailableDates-
+ @TutorLizard.Web.Resources.Shared.AvailableDates+
@if (Model.IsAccepted == true)
{
-
+
@foreach (var item in Model.Items)
{
- @item.DateTime
-
- @TutorLizard.Web.Resources.Shared.RequestStatus
- @if (item.Status == ScheduleItemRequestStatus.Accepted)
- {
- @TutorLizard.Web.Resources.Shared.RequestAccepted
- }
- else if (item.Status == ScheduleItemRequestStatus.Pending)
- {
- @TutorLizard.Web.Resources.Shared.RequestPending
- }
- else if (item.Status == ScheduleItemRequestStatus.Rejected)
- {
- @TutorLizard.Web.Resources.Shared.RequestRejected
- }
- else if (item.Status == ScheduleItemRequestStatus.RequestNotSent)
- {
- @TutorLizard.Web.Resources.Shared.RequestNotSent
-
}
@@ -59,3 +62,4 @@
+
diff --git a/TutorLizard.Web/Views/Shared/Components/CreateRequestForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/CreateRequestForAd/Default.cshtml
index a31b9103..a7c1ced7 100644
--- a/TutorLizard.Web/Views/Shared/Components/CreateRequestForAd/Default.cshtml
+++ b/TutorLizard.Web/Views/Shared/Components/CreateRequestForAd/Default.cshtml
@@ -2,15 +2,15 @@
@if(Model is not null)
{
+
-
+
- }
+ }
+
}
+
@item.DateTime
+
+ @if (item.Status == ScheduleItemRequestStatus.Accepted)
+ {
+ @TutorLizard.Web.Resources.Shared.RequestAccepted
+ }
+ else if (item.Status == ScheduleItemRequestStatus.Pending)
+ {
+ @TutorLizard.Web.Resources.Shared.RequestPending
+ }
+ else if (item.Status == ScheduleItemRequestStatus.Rejected)
+ {
+ @TutorLizard.Web.Resources.Shared.RequestRejected
+ }
+ else if (item.Status == ScheduleItemRequestStatus.RequestNotSent)
+ {
+ @TutorLizard.Web.Resources.Shared.RequestNotSent
+
- }
+
+
+
+ }
@TutorLizard.Web.Resources.Shared.SignUp
-
+ |
---|