paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nav fixed

Browse Source
This commit is contained in:
Paul Schneider
2024-11-06 20:56:02 +00:00
parent 55623410ab
commit f14b44ecd0
7 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Yavsc.Server/Settings/GoogleAuthSettings.cs
View File

@ -4,11 +4,14 @@ namespace Yavsc
{
public class GoogleAuthSettings
{
public string ClientId { get; set; }
public string ClientSecret { get; set; }
public string ApiKey { get; set; }
public string BrowserApiKey { get; set; }
public string GoogleServiceAccountJson { get; set; }
public string GoogleWebClientJson { get; set; }
}
}

5
src/Yavsc/Extensions/HostingExtensions.cs
View File

@ -137,6 +137,8 @@ internal static class HostingExtensions
var siteSection = builder.Configuration.GetSection("Site");
var smtpSection = builder.Configuration.GetSection("Smtp");
var paypalSection = builder.Configuration.GetSection("Authentication:PayPal");
// OAuth2AppSettings
var googleAuthSettings = builder.Configuration.GetSection("Authentication:Google");
string? googleClientFile = builder.Configuration["Authentication:Google:GoogleWebClientJson"];
string? googleServiceAccountJsonFile = builder.Configuration["Authentication:Google:GoogleServiceAccountJson"];
@ -157,7 +159,8 @@ internal static class HostingExtensions
services.Configure<SiteSettings>(siteSection);
services.Configure<SmtpSettings>(smtpSection);
services.Configure<PayPalSettings>(paypalSection);
services.Configure<GoogleAuthSettings>(googleAuthSettings);
services.AddRazorPages();
services.AddSignalR(o =>
{

7
src/Yavsc/Services/GoogleApis/CalendarManager.cs
View File

@ -27,6 +27,7 @@ using Google.Apis.Auth.OAuth2.Responses;
namespace Yavsc.Services
{
using Microsoft.Extensions.Options;
using Yavsc.Models.Calendar;
using Yavsc.Server.Helpers;
using Yavsc.Server.Models.Calendar;
@ -46,10 +47,10 @@ namespace Yavsc.Services
readonly string _client_id;
readonly string _client_secret;
public CalendarManager(ILoggerFactory loggerFactory)
public CalendarManager(ILoggerFactory loggerFactory, IOptions<GoogleAuthSettings> googleAuthSettings)
{
_client_id = Config.GoogleWebClientConfiguration["web:cient_id"];
_client_secret = Config.GoogleWebClientConfiguration["web:cient_secret"];
_client_id = googleAuthSettings.Value.ClientId;
_client_secret = googleAuthSettings.Value.ClientSecret;
_logger = loggerFactory.CreateLogger<CalendarManager>();
}

20
src/Yavsc/Views/Home/Index.cshtml
View File

@ -105,26 +105,10 @@
}
<asciidoc>
Hello Forgejo !!!
Je sais que j'ai un mauvais à priori sur "go",
mais là, bon,
= Hey
le CI façon woodpecker, sous Debian, le serveur SEGFAULT,
dans la stack au "go" ... no comment.
donc pas de CI pour le moment,
mais je garde l'option Forgejo,
Le theme de couleur, il y est pas,
mais l'IHM, la fonction, l'´erogonomie y sont.
J'ai du ramer un peu pour installer ma version compilée, docker, j'en veux pas,
et sans lui, la procédure en place semble cassée.
À la place, j'ai identifié les dossiers à deployer, et tout semble ok :
https://forgejo.pschneider.fr/[Mon nouveau SI de tickets, je l´adopte, il fonctionne, les inscriptions sont ouvertes, et libres.]
Hello !!!
</asciidoc>

1
src/Yavsc/Views/Shared/_Layout.cshtml
View File

@ -38,7 +38,6 @@
&copy; 2024 - Yavsc - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div>
</footer>
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="~/lib/jquery/dist/jquery.slim.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>

4
src/Yavsc/Views/Shared/_LoginPartial.cshtml
View File

@ -24,10 +24,10 @@
</li>
@if (User.IsInRole(Constants.AdminGroupName)) {
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-bs-toggle="dropdown" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false">
Administration
</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu" aria-labelledby="dropdown05">
<li><a class="dropdown-item" asp-controller="Administration" asp-action="Index">Index</a></li>
<li><a class="dropdown-item" asp-controller="Activity" asp-action="Index">Activités</a></li>
<li><a class="dropdown-item" asp-controller="CommandForms" asp-action="Index">Formulaires</a></li>

20
src/Yavsc/Views/Shared/_Nav.cshtml
View File

@ -1,6 +1,6 @@
<nav class="navbar navbar-dark bg-dark" aria-label="Yavsc">
<div class="container-fluid">
<nav class="navbar navbar-expand-sm navbar-dark bg-dark" aria-label="Yavsc">
<a href="~/" class="navbar-brand"><img src="~/images/it/free-sofware.svg" class="icon-banner" alt="Lua"></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
@ -10,22 +10,16 @@
</button>
<div class="collapse navbar-collapse" id="navbar">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/">Home</a>
</li>
<li class="nav-item">
<a asp-controller="Blogspot" asp-action="Index" class="nav-link">@SR["Blogs"]</a>
</li>
<ul class="navbar-nav me-auto" >
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/">Home</a></li>
<li class="nav-item"><a asp-controller="Blogspot" asp-action="Index" class="nav-link">@SR["Blogs"]</a></li>
<li class="nav-item"><a asp-controller="Home" asp-action="Chat" class="nav-link">@SR["Chat"]</a></li>
<li class="nav-item"><a asp-controller="Home" asp-action="Contact" class="nav-link">@SR["Contact"]</a></li>
<li>
<a asp-controller="Home" asp-action="About" class="nav-link">@SR["About"]</a></li>
<li class="nav-item"><a asp-controller="Home" asp-action="About" class="nav-link">@SR["About"]</a></li>
<partial name="_LoginPartial" />
<partial name="_LoginPartial" />
</ul>
</div>
</div>
</nav>