Merge pull request #12 from vegaitglobal/develop

bugs resolved
vegaitglobal · Oct 15, 2023 · 8fd3c46 · 8fd3c46
2 parents ed776b3 + e4a18cf
commit 8fd3c46
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 19 deletions.
diff --git a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivityPage.cshtml b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivityPage.cshtml
@@ -2,15 +2,30 @@
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.ActivityPage>
 @using ContentModels = Hakaton.SlobodaNemaCenu.Web.Models.Generated;
 @{
- Layout = "_Layout.cshtml";
+ Layout = "_Layout.cshtml";
+
+ string dayStr = @Model.Date.Day.ToString();
+ if (dayStr.Length == 1)
+ {
+ dayStr = "0" + dayStr;
+ }
+
+ string monthStr = @Model.Date.Month.ToString();
+ if (monthStr.Length == 1)
+ {
+ monthStr = "0" + monthStr;
+ }
+
+ string yearStr = @Model.Date.Year.ToString();
 }
 
 
+
 <main class="main blog">
  <section class="blog-tags">
  <div class="wrap">
  <div class="related-news__tags">
- <span class="related-news__tag date">@Model.Date.ToString("dd/MM/yyyy")</span>
+  <span class="related-news__tag date">@dayStr/@monthStr/@yearStr</span>
  <span class="related-news__tag place">@Model.Category</span>
  </div>
  </div>

diff --git a/...emaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/activities.cshtml b/...emaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/activities.cshtml
@@ -5,8 +5,7 @@
  var items = item.Items?.Any() ?? false ?
  item.Items.Cast<ContentModels.ActivityPage>() :
  Umbraco.ContentAtRoot().First().FirstChild<ContentModels.ActivitiesPage>()
- .Children<ContentModels.ActivityPage>().OrderByDescending(a => a.Date).Take(3)
- ;
+ .Children<ContentModels.ActivityPage>().OrderByDescending(a => a.Date).Take(3);
 }
 
 <section class="related-news">
@@ -20,11 +19,25 @@
  <div class="swiper-wrapper">
 
  @foreach(var activity in items){
+ string dayStr = @activity.Date.Day.ToString();
+ if (dayStr.Length == 1)
+ {
+ dayStr = "0" + dayStr;
+ }
+
+ string monthStr = @activity.Date.Month.ToString();
+ if (monthStr.Length == 1)
+ {
+ monthStr = "0" + monthStr;
+ }
+
+ string yearStr = @activity.Date.Year.ToString();
+
  <div class="swiper-slide related-news__card">
  <div class="rated-news__card-top">
  <img src="@activity.PreviewImage.GetCropUrl()" alt="Card img" />
  <div class="related-news__tags">
- <span class="related-news__tag date">@activity.Date.ToString("dd/mm/yyyy")</span>
+ <span class="related-news__tag date">@dayStr/@monthStr/@yearStr</span>
  <span class="related-news__tag place">@activity.Category</span>
  </div>
  </div>

diff --git a/...enu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageAndTextV2.cshtml b/...enu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageAndTextV2.cshtml
@@ -15,12 +15,15 @@
  <p class="text-small">
  @item.Description
  </p>
- <div class="image-box__comment">
- <span>@item.ShortText</span>
- <div class="triangle-comment">
- <span class="sr-only">Triangle shape</span>
+ @if (!string.IsNullOrWhiteSpace(@item.ShortText))
+ {
+ <div class="image-box__comment">
+ <span>@item.ShortText</span>
+ <div class="triangle-comment">
+ <span class="sr-only">Triangle shape</span>
+ </div>
  </div>
- </div>
+ }
  </div>
  </div>
  </div>

diff --git a/...NemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageGrid.cshtml b/...NemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageGrid.cshtml
@@ -7,7 +7,8 @@
  <div class="wrap">
  <div class="image-grid-wrap">
  <div class="background-text">
- <span class="background-text__content"><span>@item.Title</span></span>
+ <span class="background-text__content">@item.Title</span>
+ <span class="additional-text">@item.Title</span>
  </div>
  <div class="image-grid__content">
  <div class="image-grid__images">

diff --git a/...maCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageModule.cshtml b/...maCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageModule.cshtml
@@ -10,7 +10,7 @@
  <div class="image-box__img">
  @if(item.ClickableLink != null)
  {
- <a href="@item.ClickableLink.Url" class="image-box__link">
+  <a href="@item.ClickableLink.Url" class="image-box__link" target="@item.ClickableLink.Target">
  <img src="@item.Image.Url()" alt="Image exemple" />
  </a>
  }

diff --git a/...NemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/twoImages.cshtml b/...NemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/twoImages.cshtml
@@ -3,10 +3,11 @@
 @{
  var item = Model.Content as ContentModels.TwoImages;
 }
-
-<div class="wrap">
- <div class="two-images__wrap">
- <img src="@item.FirstImage?.GetCropUrl()" alt="" />
- <img src="@item.SecondImage?.GetCropUrl()" alt="" />
+<section class="two-images">
+ <div class="wrap">
+ <div class="two-images__wrap">
+ <img src="@item.FirstImage?.GetCropUrl()" alt="" />
+ <img src="@item.SecondImage?.GetCropUrl()" alt="" />
+ </div>
  </div>
-</div>
+</section>
diff --git a/frontend/src/scss/components/_image-text.scss b/frontend/src/scss/components/_image-text.scss
@@ -5,7 +5,6 @@
 
 .image-text {
  margin: 115px 0 64px;
- overflow: hidden;
  @include media-breakpoint-down(md) {
  margin: 90px 0 64px;
  }