Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -321,4 +321,4 @@ public void Test6()
Assert.AreEqual("Some text Intel some other text ASROCK other text", res);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ public enum ComparatorType
SMALLER,
ERROR
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ public enum BoolComparatorType
VALUE,
ERROR
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public object Handle(object value, string args, string stepName)
return value.AsList().Count;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public object Handle(object value, string args, string stepName)
return value.AsList().FirstOrDefault();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ public HandlerAttribute(string name)
Name = name;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public interface IHandler
{
object Handle(object value, string args, string stepName);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public object Handle(object value, string args, string stepName)
return value.GetType().GetProperty(stepName).GetValue(value);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public object Handle(object value, string args, string stepName)
return value.AsList().Where(v => Comparator.Evaluate(args, v));
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public static IHandler FindHandler(string name)
{
var res = typeof(IHandler).Assembly.GetTypes()
.FirstOrDefault(p => typeof(IHandler).IsAssignableFrom(p) && !p.IsAbstract && p.GetCustomAttribute<HandlerAttribute>().Name == name);
return res != null ? (IHandler)Activator.CreateInstance(res) : new ValueHandler();
return res != null ? (IHandler)Activator.CreateInstance(res) : new ValueHandler();
}

public static string GetArgs(this string value, out string name)
Expand All @@ -173,4 +173,4 @@ public static List<object> AsList(this object value)
return ((IEnumerable)value).Cast<object>().ToList();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ public object Handle(object value)
return handler.Handle(value, args, name);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public string Convert()
private string ConvertInter(string value)
{
var res = FindStartAndLen(value);
if(res == (0, 0))
if (res == (0, 0))
{
return value;
}
Expand All @@ -50,15 +50,15 @@ private static (int, int) FindStartAndLen(string value)
{
if (n == '{')
{
if(depth == 0)
if (depth == 0)
startIndex = index;
depth++;
}

if (n == '}')
{
depth--;
if(depth == 0)
if (depth == 0)
{
return (startIndex, index - startIndex + 1);
}
Expand All @@ -70,4 +70,4 @@ private static (int, int) FindStartAndLen(string value)
return (0, 0);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ private object EvaluateExp(List<Step> steps, object value)
return steps.Count == 0 ? step.Handle(value) : EvaluateExp(steps, step.Handle(value));
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using System;

namespace Wirtualnik.Data.Migrations
{
Expand Down Expand Up @@ -513,4 +513,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
name: "Categories");
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using System;

namespace Wirtualnik.Data.Migrations
{
Expand Down Expand Up @@ -35,4 +35,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
name: "CartValidators");
}
}
}
}
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Data/Models/Cart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ public class Cart : EntityBase
public ICollection<Product> Products { get; set; } = null!;
public ApplicationUser User { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Data/Models/CartProduct.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ public class CartProduct
public Product Product { get; set; } = null!;
public Cart Cart { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Data/Models/CartValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ public class CartValidator : EntityBase
public string Type { get; set; } = "";
public bool Enabled { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Maui/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected override async void OnStart()
{
string token = await SecureStorage.GetAsync("oauth_token").ConfigureAwait(false);

//new AppShellPage(); //new NavigationPage(new MainPage());
//new AppShellPage(); //new NavigationPage(new MainPage());

//if (string.IsNullOrEmpty(token))
//{
Expand Down
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Maui/Controls/BaseToolbarItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Wirtualnik.Maui.Controls;
public partial class BaseToolbarItem : ToolbarItem
{
private readonly FontImageSource fontImageSource = new();

public BaseToolbarItem()
{
fontImageSource.FontFamily = "la-solid";
Expand Down
4 changes: 2 additions & 2 deletions Wirtualnik.NET/Wirtualnik.Maui/Controls/CustomLazyView.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using CommunityToolkit.Maui.Views;
using CommunityToolkit.Maui.Views;
using CommunityToolkit.Mvvm.ComponentModel;
using System.Threading.Tasks;
using Xamarin.CommunityToolkit.UI.Views;

namespace Wirtualnik.Maui.Controls
Expand Down
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Maui/Controls/SheetContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public class SheetContainer : ContentView
public SheetContainer()
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private void BuildUI()
return;
}

Margin = new Thickness(0,8,0,0);
Margin = new Thickness(0, 8, 0, 0);
VerticalTextAlignment = TextAlignment.Center;
FontFamily = "PoppinsBold";
FontSize = 22;
Expand All @@ -24,4 +24,4 @@ private void BuildUI()
TextColor = (Color)accentColor;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
throw new NotImplementedException();
}
}
}
}
6 changes: 3 additions & 3 deletions Wirtualnik.NET/Wirtualnik.Maui/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
global using CommunityToolkit.Maui;
global using TinyMvvm;
global using TinyMvvm.Maui;
global using CommunityToolkit.Maui.Views;
global using CommunityToolkit.Mvvm.ComponentModel;
global using CommunityToolkit.Mvvm.Input;
global using CommunityToolkit.Mvvm.Input;
global using TinyMvvm;
global using TinyMvvm.Maui;
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Maui/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static MauiApp CreateMauiApp()
.UseMauiCommunityToolkit()
.UseTinyMvvm(currentAssembly, currentAssembly)
.UsePageResolver()

.ConfigureFonts(fonts =>
{
fonts.AddFont("icomoon.ttf", "FontIcons");
Expand Down
2 changes: 1 addition & 1 deletion Wirtualnik.NET/Wirtualnik.Maui/Pages/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Wirtualnik.Maui.Pages
public partial class MainPage : ContentPage
{
private bool isMenuOpened;

public MainPage()
{
InitializeComponent();
Expand Down
8 changes: 4 additions & 4 deletions Wirtualnik.NET/Wirtualnik.Maui/ViewModels/MainViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System;
using System.Threading.Tasks;
using Wirtualnik.Maui.Extensions;
using Wirtualnik.Maui.Controls;
using Wirtualnik.Maui.Extensions;
using Wirtualnik.Maui.Pages;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.ViewModels;
using Wirtualnik.Maui.Views;
using Xamarin.CommunityToolkit.UI.Views;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

namespace Wirtualnik.Maui.ViewModels;

Expand Down
4 changes: 2 additions & 2 deletions Wirtualnik.NET/Wirtualnik.Maui/ViewModels/ProductViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Wirtualnik.Maui.ViewModels.Base;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.ViewModels.Base;

namespace Wirtualnik.Maui.ViewModels;

Expand Down
4 changes: 2 additions & 2 deletions Wirtualnik.NET/Wirtualnik.Maui/ViewModels/SearchViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Wirtualnik.Maui.ViewModels.Base;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.ViewModels.Base;

namespace Wirtualnik.Maui.ViewModels;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Wirtualnik.Maui.ViewModels.Base;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.ViewModels.Base;

namespace Wirtualnik.Maui.ViewModels;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Threading.Tasks;
using Wirtualnik.Maui.ViewModels.Base;
using Wirtualnik.Maui.Pages;
using Wirtualnik.Maui.Services;
using Wirtualnik.Maui.ViewModels.Base;
using Xamarin.CommunityToolkit.ObjectModel;

namespace Wirtualnik.Maui.ViewModels;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Threading.Tasks;
using System.Windows.Input;
using Wirtualnik.Maui.Extensions;
using Wirtualnik.Maui.Services;
using Wirtualnik.Shared.Models.Base;
using Wirtualnik.Shared.Models.Product;
using Wirtualnik.Maui.Services;
using Xamarin.CommunityToolkit.ObjectModel;

namespace Wirtualnik.Maui.ViewModels;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task<ActionResult<DetailsModel>> FetchCart()

var res = _mapper.Map<DetailsModel>(model);

foreach(var prod in res.Products)
foreach (var prod in res.Products)
{
prod.Image = await _productService.GetProductListItemImage(prod.PublicId);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task<ActionResult<CartValidatorModel>> Fetch(int id)
public async Task<ActionResult> Create([FromBody] CartValidatorModel model)
{
var cartValidator = _mapper.Map<CartValidator>(model);
var result = await _cartValidatorService.CreateAsync(cartValidator);
var result = await _cartValidatorService.CreateAsync(cartValidator);

return CreatedAtAction(nameof(this.Fetch), this.GetType().Name.Replace("Controller", ""), new { id = result.Id }, _mapper.Map<CartValidatorModel>(result));
}
Expand Down Expand Up @@ -80,4 +80,4 @@ public async Task<ActionResult> Delete(int id)
return Accepted();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public async Task<ActionResult<Image>> FetchMany(List<int> ids)
{
var result = new List<Image>();

foreach(var id in ids)
foreach (var id in ids)
{
var image = await _filesService.FindAsync<Image>(id);
if (image == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ public async Task<ActionResult> ExcelImport(string productTypeId, [FromForm] Lis
return Ok();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ public static class CartExtensions
return controllerBase.HttpContext.Items["CartTempId"] as string;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public static IApplicationBuilder UseCart(this IApplicationBuilder app)
return app;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ public static IServiceCollection RegisterShopsSettings(this IServiceCollection s
return services;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public static class UserExtensions
return user.Claims.FirstOrDefault(c => c.Type == "id")?.Value;
}
}
}
}
Loading