shaba/QRBee
1
0
Fork 0
mirror of https://github.com/NecroticBamboo/QRBee.git synced 2025-12-21 12:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logging support added.

Browse Source
This commit is contained in:
Andrey Shabarshov 2022-02-02 17:25:54 +00:00
parent bde2f53f59
commit 55428f92f3
7 changed files with 71 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QRBee/QRBee.Android/Services/LocalSettings.cs
View File

@ -9,7 +9,7 @@ namespace QRBee.Droid.Services
{
internal class LocalSettings : ILocalSettings
{
public string QRBeeApiUrl => "https://localhost:5000";
public string QRBeeApiUrl => "https://192.169.0.12:5000";
public async Task SaveSettings(Settings settings)
{

21
QRBee/QRBee/ViewModels/RegisterViewModel.cs
View File

@ -16,6 +16,19 @@ namespace QRBee.ViewModels
public RegisterViewModel()
{
RegisterCommand = new Command(OnRegisterClicked);
var localSettings = DependencyService.Resolve<ILocalSettings>();
var settings = localSettings.LoadSettings();
Name = settings.Name;
Email = settings.Email;
DateOfBirth = settings.DateOfBirth;
CardNumber = settings.CardNumber;
ValidFrom = settings.ValidFrom;
ExpirationDate = settings.ExpirationDate;
CardHolderName = settings.CardHolderName;
CVC = settings.CVC;
IssueNo = settings.IssueNo;
}
public Command RegisterCommand
@ -102,12 +115,16 @@ namespace QRBee.ViewModels
RegisterAsMerchant = false
});
var page = Application.Current.MainPage.Navigation.NavigationStack.LastOrDefault();
await page.DisplayAlert("Success", "You have been registered successfully", "Ok");
await Shell.Current.GoToAsync($"//{nameof(MainPage)}");
}
catch (Exception)
catch (Exception e)
{
//TODO: delete exception message in error message
var page = Application.Current.MainPage.Navigation.NavigationStack.LastOrDefault();
await page.DisplayAlert("Error", "The Backend isn't working", "Ok");
await page.DisplayAlert("Error", $"The Backend isn't working: {e.Message}", "Ok");
}
}

5
QRBeeApi/Controllers/QRBeeController.cs
View File

@ -12,15 +12,18 @@ namespace QRBee.Api.Controllers
public class QRBeeController : ControllerBase
{
private readonly IQRBeeAPI _service;
private readonly ILogger<QRBeeController> _logger;
public QRBeeController(IQRBeeAPI service)
public QRBeeController(IQRBeeAPI service, ILogger<QRBeeController> logger)
{
_service = service;
_logger = logger;
}
[HttpPost("Register")]
public Task<RegistrationResponse> Register([FromBody] RegistrationRequest value)
{
_logger.LogDebug($"Trying to register user {value.Name}");
return _service.Register(value);
}

9
QRBeeApi/Program.cs
View File

@ -1,3 +1,4 @@
using log4net;
using Microsoft.Extensions.Options;
using MongoDB.Driver;
using QRBee.Api;
@ -6,6 +7,14 @@ using QRBee.Api.Services.Database;
var builder = WebApplication.CreateBuilder(args);
builder.Host.ConfigureLogging(logging =>
{
logging.ClearProviders();
GlobalContext.Properties["LOGS_ROOT"] = Environment.GetEnvironmentVariable("LOGS_ROOT") ?? "";
logging.AddLog4Net("log4net.config");
});
// Add services to the container.
builder.Services.AddControllers();

13
QRBeeApi/Properties/launchSettings.json
View File

@ -12,19 +12,12 @@
"QRBeeApi": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchBrowser": false,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7000;http://localhost:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"LOGS_ROOT": "C:\\Users\\andre\\logs"
}
}
}

1
QRBeeApi/QRBee.Api.csproj
View File

@ -8,6 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="MongoDB.Driver" Version="2.14.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
</ItemGroup>

34
QRBeeApi/log4net.config Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8" ?>
<log4net>
<appender name="DebugAppender" type="log4net.Appender.DebugAppender" >
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
</layout>
</appender>
<appender name="Console" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<!-- Pattern to output the caller's file name and line number -->
<conversionPattern value="%5level [%thread] (%file:%line) - %message%newline" />
</layout>
</appender>
<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
<file value="${LOGS_ROOT}\QRBeeAPI.log" />
<appendToFile value="false" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="10" />
<maximumFileSize value="50MB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %-5level[%logger]: %message%newline" />
</layout>
</appender>
<root>
<level value="ALL"/>
<appender-ref ref="DebugAppender" />
<appender-ref ref="Console" />
<appender-ref ref="RollingFile" />
</root>
</log4net>