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.

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

Develop #5

Merged
merged 22 commits into from
Oct 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
19c900c
New fronted.
nsobo Oct 14, 2023
d5d9493
Push missing files
nsobo Oct 14, 2023
fe202a2
Implemented image box
nsobo Oct 14, 2023
565f328
Implement image box
nsobo Oct 14, 2023
279732c
Image And Text Module
Buki98 Oct 14, 2023
dd61876
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
Buki98 Oct 14, 2023
90b4c0e
Implement education
nsobo Oct 14, 2023
c933102
navigation minor modifications
aleksamarinkovic142 Oct 14, 2023
52f62cb
resolved conflicts
aleksamarinkovic142 Oct 14, 2023
3f520c3
Image and Text V2 implemented.
CubrakS Oct 14, 2023
5954a96
Minor change to Image and text module
Buki98 Oct 14, 2023
9872a1c
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
Buki98 Oct 14, 2023
f3ea0d9
minor mods
aleksamarinkovic142 Oct 14, 2023
b161e12
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
CubrakS Oct 14, 2023
97ed846
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
CubrakS Oct 14, 2023
ddb814e
Minor change
Buki98 Oct 14, 2023
8325038
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
Buki98 Oct 14, 2023
5e4319a
implement rest of about us
Jovan98 Oct 14, 2023
79e2893
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
Jovan98 Oct 14, 2023
7da57a5
Implement education items
nsobo Oct 14, 2023
8b3029a
Merge branch 'develop' of https://github.com/vegaitglobal/sloboda-nem…
nsobo Oct 14, 2023
4880d71
Implement education pages
nsobo Oct 14, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,25 @@
<Folder Include="Models\Generated\" />
</ItemGroup>

<ItemGroup>
<None Include="wwwroot\assets\fonts\Montserrat-Bold.woff2" />
<None Include="wwwroot\assets\fonts\Montserrat-Light.woff2" />
<None Include="wwwroot\assets\fonts\Montserrat-Medium.woff2" />
<None Include="wwwroot\assets\fonts\Montserrat-Regular.woff2" />
<None Include="wwwroot\assets\fonts\Montserrat-SemiBold.woff2" />
<None Include="wwwroot\assets\fonts\svgicons.svg" />
<None Include="wwwroot\assets\fonts\svgicons.woff2" />
<None Include="wwwroot\assets\fonts\transfonter.org-20231006-200412.zip" />
<None Include="wwwroot\assets\images\shape-2.svg" />
<None Include="wwwroot\assets\images\star-shape.svg" />
<None Include="wwwroot\assets\svg\arrow.svg" />
<None Include="wwwroot\assets\svg\facebook.svg" />
<None Include="wwwroot\assets\svg\instagram.svg" />
<None Include="wwwroot\assets\svg\linkedin.svg" />
<None Include="wwwroot\assets\svg\twitter.svg" />
<None Include="wwwroot\js\script.js" />
</ItemGroup>

<PropertyGroup>
<!-- Razor files are needed for the backoffice to work correctly -->
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v10.2.1+25a20cf
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Linq.Expressions;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Infrastructure.ModelsBuilder;
using Umbraco.Cms.Core;
using Umbraco.Extensions;

namespace Hakaton.SlobodaNemaCenu.Web.Models.Generated
{
/// <summary>Country Dropdown Item</summary>
[PublishedModel("countryDropdownItem")]
public partial class CountryDropdownItem : PublishedElementModel
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const string ModelTypeAlias = "countryDropdownItem";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<CountryDropdownItem, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
#pragma warning restore 0109

private IPublishedValueFallback _publishedValueFallback;

// ctor
public CountryDropdownItem(IPublishedElement content, IPublishedValueFallback publishedValueFallback)
: base(content, publishedValueFallback)
{
_publishedValueFallback = publishedValueFallback;
}

// properties

///<summary>
/// Country Flag
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("countryFlag")]
public virtual global::Umbraco.Cms.Core.Models.MediaWithCrops CountryFlag => this.Value<global::Umbraco.Cms.Core.Models.MediaWithCrops>(_publishedValueFallback, "countryFlag");

///<summary>
/// Country Key
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("countryKey")]
public virtual string CountryKey => this.Value<string>(_publishedValueFallback, "countryKey");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v10.2.1+25a20cf
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Linq.Expressions;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Infrastructure.ModelsBuilder;
using Umbraco.Cms.Core;
using Umbraco.Extensions;

namespace Hakaton.SlobodaNemaCenu.Web.Models.Generated
{
/// <summary>Education Category</summary>
[PublishedModel("educationCategory")]
public partial class EducationCategory : PublishedContentModel
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const string ModelTypeAlias = "educationCategory";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<EducationCategory, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
#pragma warning restore 0109

private IPublishedValueFallback _publishedValueFallback;

// ctor
public EducationCategory(IPublishedContent content, IPublishedValueFallback publishedValueFallback)
: base(content, publishedValueFallback)
{
_publishedValueFallback = publishedValueFallback;
}

// properties

///<summary>
/// Color
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("color")]
public virtual string Color => this.Value<string>(_publishedValueFallback, "color");

///<summary>
/// Title
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("title")]
public virtual string Title => this.Value<string>(_publishedValueFallback, "title");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v10.2.1+25a20cf
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Linq.Expressions;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Infrastructure.ModelsBuilder;
using Umbraco.Cms.Core;
using Umbraco.Extensions;

namespace Hakaton.SlobodaNemaCenu.Web.Models.Generated
{
/// <summary>Education Item</summary>
[PublishedModel("educationItem")]
public partial class EducationItem : PublishedElementModel
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const string ModelTypeAlias = "educationItem";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<EducationItem, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
#pragma warning restore 0109

private IPublishedValueFallback _publishedValueFallback;

// ctor
public EducationItem(IPublishedElement content, IPublishedValueFallback publishedValueFallback)
: base(content, publishedValueFallback)
{
_publishedValueFallback = publishedValueFallback;
}

// properties

///<summary>
/// Category
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("category")]
public virtual global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent Category => this.Value<global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent>(_publishedValueFallback, "category");

///<summary>
/// Download
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("download")]
public virtual global::Umbraco.Cms.Core.Models.MediaWithCrops Download => this.Value<global::Umbraco.Cms.Core.Models.MediaWithCrops>(_publishedValueFallback, "download");

///<summary>
/// Image
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("image")]
public virtual global::Umbraco.Cms.Core.Models.MediaWithCrops Image => this.Value<global::Umbraco.Cms.Core.Models.MediaWithCrops>(_publishedValueFallback, "image");

///<summary>
/// Title
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("title")]
public virtual string Title => this.Value<string>(_publishedValueFallback, "title");

///<summary>
/// Url
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("url")]
public virtual global::Umbraco.Cms.Core.Models.Link Url => this.Value<global::Umbraco.Cms.Core.Models.Link>(_publishedValueFallback, "url");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v10.2.1+25a20cf
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Linq.Expressions;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Infrastructure.ModelsBuilder;
using Umbraco.Cms.Core;
using Umbraco.Extensions;

namespace Hakaton.SlobodaNemaCenu.Web.Models.Generated
{
/// <summary>Education Page</summary>
[PublishedModel("educationPage")]
public partial class EducationPage : PublishedContentModel, IPageBase
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const string ModelTypeAlias = "educationPage";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<EducationPage, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
#pragma warning restore 0109

private IPublishedValueFallback _publishedValueFallback;

// ctor
public EducationPage(IPublishedContent content, IPublishedValueFallback publishedValueFallback)
: base(content, publishedValueFallback)
{
_publishedValueFallback = publishedValueFallback;
}

// properties

///<summary>
/// Banner Image
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("bannerImage")]
public virtual global::Umbraco.Cms.Core.Models.MediaWithCrops BannerImage => this.Value<global::Umbraco.Cms.Core.Models.MediaWithCrops>(_publishedValueFallback, "bannerImage");

///<summary>
/// Categories Container
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("categoriesContainer")]
public virtual global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent CategoriesContainer => this.Value<global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent>(_publishedValueFallback, "categoriesContainer");

///<summary>
/// Education Items
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("educationItems")]
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockListModel EducationItems => this.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockListModel>(_publishedValueFallback, "educationItems");

///<summary>
/// Text
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("text")]
public virtual string Text => this.Value<string>(_publishedValueFallback, "text");

///<summary>
/// SEO Title
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("sEOTitle")]
public virtual string SEotitle => global::Hakaton.SlobodaNemaCenu.Web.Models.Generated.PageBase.GetSEotitle(this, _publishedValueFallback);

///<summary>
/// Title
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("title")]
public virtual string Title => global::Hakaton.SlobodaNemaCenu.Web.Models.Generated.PageBase.GetTitle(this, _publishedValueFallback);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ public Home(IPublishedContent content, IPublishedValueFallback publishedValueFal
[ImplementPropertyType("navigationButtonLink")]
public virtual global::Umbraco.Cms.Core.Models.Link NavigationButtonLink => this.Value<global::Umbraco.Cms.Core.Models.Link>(_publishedValueFallback, "navigationButtonLink");

///<summary>
/// Navigation Flags
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.2.1+25a20cf")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("navigationFlags")]
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockListModel NavigationFlags => this.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockListModel>(_publishedValueFallback, "navigationFlags");

///<summary>
/// Navigation Logo
///</summary>
Expand Down
Loading