diff --git a/Diuna.sln b/Diuna.sln new file mode 100644 index 0000000..c233824 --- /dev/null +++ b/Diuna.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33110.190 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{EB898292-5370-45C7-85B7-FE24D110A8C6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EB898292-5370-45C7-85B7-FE24D110A8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB898292-5370-45C7-85B7-FE24D110A8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB898292-5370-45C7-85B7-FE24D110A8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB898292-5370-45C7-85B7-FE24D110A8C6}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C1F5C21F-B331-4C5D-BDFF-3FAC8116996F} + EndGlobalSection +EndGlobal diff --git a/Frontend/src/app/main-view/main-view.component.html b/Frontend/src/app/main-view/main-view.component.html index 34c8de1..77cf9af 100644 --- a/Frontend/src/app/main-view/main-view.component.html +++ b/Frontend/src/app/main-view/main-view.component.html @@ -42,6 +42,7 @@ +
© Bim-IT Michał Zieliński {{currentDate | date: 'yyyy'}} diff --git a/Frontend/src/app/main-view/main-view.component.ts b/Frontend/src/app/main-view/main-view.component.ts index e317e49..952cef1 100644 --- a/Frontend/src/app/main-view/main-view.component.ts +++ b/Frontend/src/app/main-view/main-view.component.ts @@ -1,3 +1,4 @@ +import { OnInit } from '@angular/core'; import { Component, ViewChild } from '@angular/core'; import { MatSidenav } from '@angular/material/sidenav'; import * as moment from 'moment'; @@ -10,7 +11,7 @@ import { DeviceService } from '../services/device.service'; templateUrl: './main-view.component.html', styleUrls: ['./main-view.component.scss'] }) -export class MainViewComponent { +export class MainViewComponent implements OnInit { @ViewChild('snav') snav?: MatSidenav; appVersion = packageInfo.version; @@ -24,7 +25,31 @@ export class MainViewComponent { constructor( public _data: DataService, public _device: DeviceService - ) {} + ) { } + + ngOnInit(): void { + // @ts-ignore + google.accounts.id.initialize({ + client_id: "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com", + callback: this.handleCredentialResponse.bind(this), + auto_select: false, + cancel_on_tap_outside: true, + + }); + // @ts-ignore + google.accounts.id.renderButton( + // @ts-ignore + document.getElementById("google-button"), + { theme: "outline", size: "large", width: "100%" } + ); + // @ts-ignore + google.accounts.id.prompt((notification: PromptMomentNotification) => { }); + } + + async handleCredentialResponse(response: any) { + // Here will be your response from Google. + console.log(response); + } reloadApp() { document.location.reload(); diff --git a/Frontend/src/index.html b/Frontend/src/index.html index 5895774..4e1df2f 100644 --- a/Frontend/src/index.html +++ b/Frontend/src/index.html @@ -9,6 +9,7 @@ + diff --git a/WebAPI/Controllers/WeatherForecastController.cs b/WebAPI/Controllers/WeatherForecastController.cs new file mode 100644 index 0000000..09f1727 --- /dev/null +++ b/WebAPI/Controllers/WeatherForecastController.cs @@ -0,0 +1,33 @@ +using Microsoft.AspNetCore.Mvc; + +namespace WebAPI.Controllers +{ + [ApiController] + [Route("[controller]")] + public class WeatherForecastController : ControllerBase + { + private static readonly string[] Summaries = new[] + { + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + }; + + private readonly ILogger _logger; + + public WeatherForecastController(ILogger logger) + { + _logger = logger; + } + + [HttpGet] + public IEnumerable Get() + { + return Enumerable.Range(1, 5).Select(index => new WeatherForecast + { + Date = DateTime.Now.AddDays(index), + TemperatureC = Random.Shared.Next(-20, 55), + Summary = Summaries[Random.Shared.Next(Summaries.Length)] + }) + .ToArray(); + } + } +} \ No newline at end of file diff --git a/WebAPI/Program.cs b/WebAPI/Program.cs new file mode 100644 index 0000000..ac7c10a --- /dev/null +++ b/WebAPI/Program.cs @@ -0,0 +1,17 @@ +var builder = WebApplication.CreateBuilder(args); + +// Add services to the container. + +builder.Services.AddControllers(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. + +app.UseHttpsRedirection(); + +app.UseAuthorization(); + +app.MapControllers(); + +app.Run(); diff --git a/WebAPI/Properties/launchSettings.json b/WebAPI/Properties/launchSettings.json new file mode 100644 index 0000000..612c11f --- /dev/null +++ b/WebAPI/Properties/launchSettings.json @@ -0,0 +1,31 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:1860", + "sslPort": 44315 + } + }, + "profiles": { + "WebAPI": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "weatherforecast", + "applicationUrl": "https://localhost:7170;http://localhost:5008", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "weatherforecast", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/WebAPI/WeatherForecast.cs b/WebAPI/WeatherForecast.cs new file mode 100644 index 0000000..f154876 --- /dev/null +++ b/WebAPI/WeatherForecast.cs @@ -0,0 +1,13 @@ +namespace WebAPI +{ + public class WeatherForecast + { + public DateTime Date { get; set; } + + public int TemperatureC { get; set; } + + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); + + public string? Summary { get; set; } + } +} \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj new file mode 100644 index 0000000..c78c9c7 --- /dev/null +++ b/WebAPI/WebAPI.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/WebAPI/appsettings.Development.json b/WebAPI/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/WebAPI/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/WebAPI/appsettings.json b/WebAPI/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/WebAPI/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +}