Merge pull request #367 from dorthl/mian

fix profile
blogifierdotnet · Aug 16, 2023 · 4793d7c · 4793d7c
2 parents 50c8d81 + c25c8e2
commit 4793d7c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/.vscode/.gitignore b/.vscode/.gitignore
@@ -0,0 +1 @@
+settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/src/Blogifier.Admin/Shared/BlogsLayout.razor b/src/Blogifier.Admin/Shared/BlogsLayout.razor
@@ -18,8 +18,10 @@
         <NavLink class="sidebar-link" href="/admin/blogs/" Match="NavLinkMatch.All">@_localizer["posts"]</NavLink>
         <NavLink class="sidebar-link" href="/admin/blogs/category/">@_localizer["categories"]</NavLink>
         <NavLink class="sidebar-link" href="/admin/blogs/import/">@_localizer["import"]</NavLink>
-        <hr>
-        <NavLink class="sidebar-link" href="/admin/blogs/settings/">@_localizer["settings"]</NavLink>
+        <AuthorizeView Policy="@BlogifierSharedConstant.PolicyAdminName">
+          <hr>
+          <NavLink class="sidebar-link" href="/admin/blogs/settings/">@_localizer["settings"]</NavLink>
+        </AuthorizeView>
       </div>
     </div>
     <div class="page-content flex-grow-1">

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml
@@ -1,4 +1,8 @@
 @inject IStringLocalizer<Resource> _localizer
+@model AccountModel
+@{
+  var redirectUri = Model.RedirectUri ?? "/";
+}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -14,7 +18,7 @@
 
 <body>
   <main class="blogifier">
-    <a class="account-back link-secondary" href="/" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]" data-placement="right">
+    <a class="account-back link-secondary" href="@redirectUri" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]" data-placement="right">
       <svg width="24" height="24" class="bi bi-arrow-left">
         <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
       </svg>

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml
@@ -7,6 +7,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="~/_content/@ThemesStandardConstant.AssemblyName/css/blogifier.css">
   <link rel="stylesheet" href="~/_content/@ThemesStandardConstant.AssemblyName/css/account.css">
   @await RenderSectionAsync("HeaderScript",false)
 </head>

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/login.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/login.cshtml
@@ -1,6 +1,7 @@
 @model AccountLoginModel
 @{
   Layout = "layouts/_account.cshtml";
+  var redirectUri = Url.Content("~/account/login");
 }
 @inject IStringLocalizer<Resource> _localizer
 
@@ -25,5 +26,5 @@
     <span asp-validation-for="Password"></span>
   </div>
   <button type="submit" class="btn btn-blogifier btn-block btn-floating">@_localizer["login"]</button>
-  <a style="margin-top:8px" class="btn btn-default btn-block btn-floating" role="button" href="~/account/register">@_localizer["register"]</a>
+  <a style="margin-top:8px;" class="btn btn-default btn-block btn-floating btn-a" class="btn btn-default btn-block btn-floating" role="button" href="~/account/register?RedirectUri=@redirectUri">@_localizer["register"]</a>
 </form>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/register.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/register.cshtml
@@ -2,6 +2,7 @@
 @inject IStringLocalizer<Resource> _localizer
 @{
   Layout = "layouts/_account.cshtml";
+  var redirectUri = Url.Content("~/account/register");
 }
 
 @section HeaderScript{
@@ -44,5 +45,5 @@
     <span class="validation-message" asp-validation-for="PasswordConfirm"></span>
   </div>
   <button type="submit" class="btn btn-blogifier btn-block btn-floating">@_localizer["register"]</button>
-  <a style="margin-top:8px" class="btn btn-default btn-block btn-floating" role="button" href="~/account/login">@_localizer["cancel"]</a>
+  <a style="margin-top:8px;" class="btn btn-default btn-block btn-floating btn-a" role="button" href="~/account/login?RedirectUri=@redirectUri">@_localizer["cancel"]</a>
 </form>
diff --git a/src/Blogifier.Themes.Standard/assets/scss/include/_buttons.scss b/src/Blogifier.Themes.Standard/assets/scss/include/_buttons.scss
@@ -5,8 +5,7 @@
 .btn {
   text-transform: capitalize;
 
-  &-link {
-  }
+  &-link {}
 
   &-outline {
     &-default {
@@ -25,6 +24,7 @@
     font-size: 0.75rem;
     border-radius: 0.2rem;
   }
+
   &-block {
     width: 100%;
   }
@@ -33,4 +33,10 @@
     height: 3.125rem;
     font-size: 0.9375rem;
   }
+
+  &-a {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }