Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/ja 119 layout #113

Draft
wants to merge 31 commits into
base: develop
Choose a base branch
from
Draft

Feature/ja 119 layout #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fddff52
Style navbar
skrawus Jun 23, 2024
e7a0d01
Style buttons and list of ads
skrawus Jun 23, 2024
38e3053
Change padding and title
skrawus Jun 26, 2024
1e6f1bd
Merge develop into ja-119
skrawus Jun 26, 2024
96d17d6
Add padding on the top of messages
skrawus Jun 26, 2024
663ee8f
Correct AdDetails layout
skrawus Jun 26, 2024
2946127
Tutors schedule layout
skrawus Jun 26, 2024
fb70daa
Style Login view
skrawus Jun 26, 2024
5f8dc2c
Add logo versions
skrawus Jun 26, 2024
79baa7a
Style Register view
skrawus Jun 26, 2024
6afc33e
Change navbar button look
skrawus Jun 26, 2024
50da833
Style buttons and links
skrawus Jun 26, 2024
859c08f
Style buttons and ad titles
skrawus Jun 26, 2024
eddc5a1
Change register view buttons
skrawus Jun 26, 2024
b9d3210
Add banner to home page
skrawus Jun 27, 2024
637587b
Change previouse/next buttons in Ads
skrawus Jun 27, 2024
baff934
Unificate student's and tutor's indexes
skrawus Jun 27, 2024
7fad1e2
Unify CreateAd and CreateScheduleItem
skrawus Jun 27, 2024
c506ea4
AdRequests views adjustment
skrawus Jun 27, 2024
712fe2d
Student's adRequests view adjucement
skrawus Jun 27, 2024
8938c46
Unify student's views
skrawus Jun 27, 2024
d1ff022
Unify Tutor's functions views
skrawus Jun 27, 2024
e52f3b6
Delete a button from Tutor's Index and rearange btns
skrawus Jun 27, 2024
6ce689a
Schedule view
skrawus Jun 27, 2024
90de59d
Add dropdown menu
skrawus Jun 27, 2024
ffb5f2c
Merge develop into ja-119
skrawus Jul 4, 2024
97dee9b
Fix issues after merge
skrawus Jul 4, 2024
ca54929
add container-fluid to layout
skrawus Jul 4, 2024
43b22dc
Style Ads and ad search. Change pagee size
skrawus Jul 4, 2024
fe3c6ba
Fix gaps in login and register
skrawus Jul 4, 2024
8c7c53c
Search layout
skrawus Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TutorLizard.Web/Controllers/BrowseController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class BrowseController : Controller
_userAuthenticationService = userAuthenticationService;
_uiMessagesService = uiMessagesService;
_categoryService = categoryService;
_pageSize = 10;
_pageSize = 12;
}
public IActionResult Index()
{
Expand Down
31 changes: 15 additions & 16 deletions TutorLizard.Web/Views/Account/Login.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,41 @@
ViewData["Title"] = "Login";
}

<h1>Login</h1>
<h1 class="title">Zaloguj się</h1>

<h4>LoginModel</h4>
<hr />
<div class="row">
<div class="col-md-4">
<div class="row justify-content-center gap-4">
<div class="col-md-4 user-container">
<form asp-action="Login">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group">
<label asp-for="UserName" class="control-label"></label>
<label asp-for="UserName" class="control-label">Login</label>
<input asp-for="UserName" class="form-control" />
<span asp-validation-for="UserName" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Password" class="control-label"></label>
<label asp-for="Password" class="control-label">Hasło</label>
<input asp-for="Password" class="form-control" />
<span asp-validation-for="Password" class="text-danger"></span>
</div>
<div class="form-group my-2">
<input type="submit" value="Login" class="btn btn-primary" />
<input type="submit" value="Login" class="btn btn-dark" />
</div>
</form>
</div>
<div class="row">
<div>
<h2>Login using Google</h2>
</div>
<div>
<a asp-controller="Account" asp-action="GoogleLogin" class="btn btn-primary">Sign In with Google</a>
<div class="col-md-4 user-container">
<div>
<h2 class="title-3">Zaloguj się przez Google</h2>
</div>
<div>
<a asp-controller="Account" asp-action="GoogleLogin" class="btn btn-dark">Sign In with Google</a>
</div>
</div>
</div>
</div>

<div>
@* <div>
<a asp-action="Index" asp-controller="Home">Back</a>
</div>
</div> *@

@section Scripts {
@{
Expand Down
21 changes: 9 additions & 12 deletions TutorLizard.Web/Views/Account/Register.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
ViewData["Title"] = "Register";
}

<h1>Register</h1>
<h1 class="title">Zarejestruj się</h1>

<h4>RegisterUserModel</h4>
<hr />
<div class="row">
<div class="col-md-4">
<div class="login-grid row justify-content-center gap-4">
<div class="col-md-4 user-container">
<form asp-action="Register">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group">
Expand All @@ -28,23 +27,21 @@
<span asp-validation-for="Password" class="text-danger"></span>
</div>
<div class="form-group my-2">
<input type="submit" value="Register" class="btn btn-primary" />
<input type="submit" value="Register" class="btn btn-dark" />
</div>
</form>
</div>
<div class="row">
<div class="col-md-4 user-container">
<h2 class="title-3">Stwórz konto z Google</h2>
<div>
<h2>Register using Google</h2>
</div>
<div>
<a asp-controller="Account" asp-action="GoogleLogin" class="btn btn-primary">Sign In with Google</a>
<a asp-controller="Account" asp-action="GoogleLogin" class="btn btn-dark">Sign In with Google</a>
</div>
</div>
</div>

<div>
@* <div>
<a asp-action="Index">Back</a>
</div>
</div> *@

@section Scripts {
@{
Expand Down
10 changes: 5 additions & 5 deletions TutorLizard.Web/Views/Ad/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
ViewData["Title"] = "Ads - List";
}

<h1>Ads</h1>
<h1 class="ads-title">Ads</h1>

<p>
<a asp-action="Create">Create New</a>
<a asp-action="Create" class="btn btn-primary">Create New</a>
</p>
<table class="table">
<thead>
<table class="table table-striped table-hover">
<thead class="thead-dark">
<tr>
<th>
@Html.DisplayNameFor(model => model.Id)
Expand Down Expand Up @@ -64,7 +64,7 @@
@Html.DisplayFor(modelItem => item.CategoryId)
@if (ViewBag.CategoryName is not null)
{
<span> (@ViewBag.CategoryName)</span>
<span class="category-name"> (@ViewBag.CategoryName)</span>
}
</td>
<td>
Expand Down
107 changes: 58 additions & 49 deletions TutorLizard.Web/Views/Browse/AdDetails.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,70 @@
@using TutorLizard.Web.ViewComponents
@model GetAdDetailsResponse

<h1>Szczegóły ogłoszenia</h1>
<h1 class="title">Szczegóły ogłoszenia</h1>

<div>
<div><h2>@Model.Title</h2></div>
<div class="row">
<div class="col-6 col-sm-3">Kategoria przez:</div>
<div class="col-6 col-sm-9">@Model.CategoryName</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Tematyka:</div>
<div class="col-6 col-sm-9">@Model.Subject</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Lokalizacja:</div>
<div class="col-6 col-sm-9">@Model.Location</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Wystawione przez:</div>
<div class="col-6 col-sm-9">@Model.TutorName</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Cena:</div>
<div class="col-6 col-sm-9">@Model.Price zł/h</div>
<div class="row">
<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">
<div class="col-6 col-sm-3">Kategoria:</div>
<div class="col-6 col-sm-9">@Model.CategoryName</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Tematyka:</div>
<div class="col-6 col-sm-9">@Model.Subject</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Lokalizacja:</div>
<div class="col-6 col-sm-9">@Model.Location</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Tutor:</div>
<div class="col-6 col-sm-9">@Model.TutorName</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Cena:</div>
<div class="col-6 col-sm-9">@Model.Price zł/h</div>
</div>
<div class="row">
<div class="col-6 col-sm-9">
@if (Model.IsRemote)
{
<span>Nauczanie zdalnie</span>
}
else
{
<span>Nauczanie na miejscu</span>
}
</div>
</div>
</div>
<div class="row ad-details-description">
<div class="col">@Model.Description</div>
</div>
</div>
</div>
<div class="row">
<div class="col-6 col-sm-3">Nauczanie zdalne:</div>
<div class="col-6 col-sm-9">
@if (Model.IsRemote)

<div class="col-lg-6">
<div class="ad-details">
@if (Model.UserRelationship == AdToUserRelationship.Owner)
{
<span>Tak</span>
@await Component.InvokeAsync(nameof(TutorsScheduleForAd), new { adId = Model.AdId })
}
else
@if (Model.UserRelationship == AdToUserRelationship.AcceptedStudent)
{
<span>Nie</span>
@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 })
}
</div>
</div>
<div class="row">
<div class="col">@Model.Description</div>
</div>
</div>

@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 })
}
35 changes: 16 additions & 19 deletions TutorLizard.Web/Views/Browse/Ads.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
categories = ViewBag.Categories;
}
}
<head>
<link rel="stylesheet" href="~/css/tutorlizard.css" asp-append-version="true" />
</head>
<h1 class="title">Ogłoszenia</h1>

<h1>Ogłoszenia</h1>

<form asp-action="Search" method="post" class="d-flex flex-column p-2 border">
<h2 class="text-center">Wyszukiwanie ogłoszeń</h2>
<form asp-action="Search" method="post" class="d-flex flex-column p-2 search-container">
<component type="typeof(AdSearchForm)"
render-mode="WebAssemblyPrerendered"
param-SearchCriteriaJson="Model.SearchCriteria.ToViewModel().Serialize()"
param-CategoriesJson="@categories.Serialize()" />
<button type="submit" class="btn btn-primary m-2">Wyszukaj</button>
<button type="submit" class="btn btn-details m-2">Wyszukaj</button>
</form>


Expand All @@ -29,10 +30,13 @@
<div class="p-2">Liczba wyników wyszukiwania: @Model.TotalAds</div>
}

<div class="row">
@foreach (var ad in Model.Ads)
{
<partial name="@PartialNames.AdListItem" model="ad" />
}
<div class="col-12 col-md-6 col-xl-4 flex-row flex-column"><partial name="@PartialNames.AdListItem" model="ad" class="montserrat-lizardFont ad-row-height" /></div>
}
</div>


<div class="row text-center">

Expand All @@ -42,11 +46,7 @@
{
@if (Model.SearchCriteria.AnySearch)
{
<a asp-action="Ads" asp-route-id="@(Model.PageNumber - 1)" asp-route-search="@Model.SearchCriteria.ToBase64String()">Poprzednia strona</a>
}
else
{
<a asp-action="Ads" asp-route-id="@(Model.PageNumber - 1)">Poprzednia strona</a>
<a asp-action="Ads" class="btn btn-light" asp-route-id="@(Model.PageNumber - 1)" asp-route-search="@Model.SearchCriteria.ToBase64String()">Poprzednia strona</a>
}
}
</div>
Expand All @@ -55,18 +55,15 @@
Strona @Model.PageNumber z @Model.TotalPages
</div>

<div class="col-4">
<div class="col-4 btn btn-light">
@if(Model.TotalPages > Model.PageNumber)
{
<a asp-action="Ads" asp-route-id="@(Model.PageNumber + 1)" class="custom-link">Następna strona</a>
}
@if(Model.SearchCriteria.AnySearch)
{
<a asp-action="Ads" asp-route-id="@(Model.PageNumber + 1)" asp-route-search="@Model.SearchCriteria.ToBase64String()">Następna strona</a>
<a asp-action="Ads" class=" btn btn-light" asp-route-id="@(Model.PageNumber + 1)" asp-route-search="@Model.SearchCriteria.ToBase64String()">Następna strona</a>
}
else
{
<a asp-action="Ads" asp-route-id="@(Model.PageNumber + 1)">Następna strona</a>
}
}
</div>

</div>
Loading
Loading