pages_core 3.13.0 → 3.15.0

data/app/assets/stylesheets/pages_core/admin/controllers/pages.css

@@ -24,42 +24,42 @@ td.drag-handle {
   margin-left: -8px;
   margin-top: 16px;
 
-  & .page-listing {
+  .page-listing {
     border: 1px solid transparent;
     padding: 3px 8px 2px 8px !important;
   }
 
-  & ul {
+  ul {
     border-left: 1px dotted #ccc !important;
     margin-left: 12px !important;
     padding-left: 8px !important;
   }
 
-  & ul li {
+  ul li {
     overflow: auto;
   }
 
-  & .page {
+  .page {
     padding: 4px 8px;
     line-height: 17px;
     float: left;
 
-    & .status {
+    .status {
       font-weight: normal;
     }
 
-    & a.page-name,
-    & a.page-name:visited {
+    a.page-name,
+    a.page-name:visited {
       text-decoration: none;
       color: #222;
     }
 
-    & a.page-name:hover {
+    a.page-name:hover {
       text-decoration: underline;
     }
 
     &.hidden {
-      & a.page-name {
+      a.page-name {
         color: #666;
       }
     }
@@ -68,30 +68,30 @@ td.drag-handle {
       background: #ffd;
       border: 1px solid #dda;
 
-      & .status {
+      .status {
         display: none;
       }
     }
   }
 
-  & .page-without-locale {
+  .page-without-locale {
     color: #888;
   }
 
-  & li {
-    font-weight: bold;
+  li {
+    font-weight: var(--bold-weight);
     margin: 0;
     padding: 0;
     clear: both;
   }
 
-  & li li {
+  li li {
     font-weight: normal;
     font-size: 12px;
     padding: 0;
   }
 
-  & ul {
+  ul {
     clear: both;
     list-style-type: none;
     border-left: 1px dashed #ccc;
@@ -99,11 +99,11 @@ td.drag-handle {
     padding: 0 0 0 12px;
   }
 
-  & .hover {
+  .hover {
     background: #cef;
   }
 
-  & .drag-handle {
+  .drag-handle {
     display: none;
   }
 
@@ -114,28 +114,28 @@ td.drag-handle {
 
 .news-item-list,
 .calendar-item-list {
-  & .name {
+  .name {
     line-height: 1.5;
 
-    & small {
+    small {
       font-weight: normal;
     }
   }
 
-  & .autopublish-notice {
+  .autopublish-notice {
     font-size: 0.75rem;
     font-weight: normal;
     color: var(--text-light-color);
   }
 
-  & .draft,
-  & .hidden,
-  & .autopublish,
-  & .reviewed {
+  .draft,
+  .hidden,
+  .autopublish,
+  .reviewed {
     background: var(--background-disabled-color);
   }
 
-  & .pinned .name {
+  .pinned .name {
     background: transparent
       radial-gradient(ellipse at center, #92b6c4 50%, transparent 50%) no-repeat
       left 12px top 50%;
@@ -146,32 +146,18 @@ td.drag-handle {
 .edit-page {
   width: auto;
 
-  & main div.content {
-    padding-top: 16px;
+  .advanced-options {
+    margin-top: 1.5rem;
   }
 
-  & .hidden-options {
-    display: none;
-  }
-
-  & .autopublish-notice,
-  & .published-date,
-  & .advanced-options {
-    display: none;
-
-    &.show {
-      display: block;
-    }
-  }
-
-  & main input[type="text"],
-  & main textarea {
+  main input[type="text"],
+  main textarea {
     width: 100%;
     max-width: 100%;
   }
 
-  & main input.page_title {
-    font-weight: bold;
+  main input.page_title {
+    font-weight: var(--bold-weight);
     font-size: 1.4em;
     color: var(--text-color);
   }
@@ -183,13 +169,13 @@ td.drag-handle {
   margin-right: 0;
   padding: 0;
 
-  & .embed-code {
+  .embed-code {
     display: inline-block;
     width: 60px;
     margin-right: 10px;
   }
 
-  & li {
+  li {
     line-height: 30px;
     border-top: 1px solid var(--border-color);
 
@@ -197,20 +183,20 @@ td.drag-handle {
       border-top: 0px;
     }
 
-    & .actions {
+    .actions {
       float: right;
     }
 
-    & .drag-handle {
+    .drag-handle {
       margin-right: 10px;
     }
   }
 
-  & .placeholder {
+  .placeholder {
     height: 30px;
   }
 
-  & .ui-sortable-helper {
+  .ui-sortable-helper {
     border: 1px solid var(--border-color) !important;
     background: rgba(250, 250, 250, 0.8);
   }

data/app/assets/stylesheets/pages_core/admin/global/fonts.css

@@ -0,0 +1,271 @@
+/* Inter */
+
+@font-face {
+  font-family: "InterVariable";
+  font-style: normal;
+  font-weight: 100 900;
+  font-display: swap;
+  src: url("InterVariable.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterVariable";
+  font-style: italic;
+  font-weight: 100 900;
+  font-display: swap;
+  src: url("InterVariable-Italic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 100;
+  src: url("Inter-Thin.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 100;
+  src: url("Inter-ThinItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 200;
+  src: url("Inter-ExtraLight.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 200;
+  src: url("Inter-ExtraLightItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 300;
+  src: url("Inter-Light.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 300;
+  src: url("Inter-LightItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 400;
+  src: url("Inter-Regular.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 400;
+  src: url("Inter-Italic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 500;
+  src: url("Inter-Medium.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 500;
+  src: url("Inter-MediumItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 600;
+  src: url("Inter-SemiBold.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 600;
+  src: url("Inter-SemiBoldItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 700;
+  src: url("Inter-Bold.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 700;
+  src: url("Inter-BoldItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 800;
+  src: url("Inter-ExtraBold.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 800;
+  src: url("Inter-ExtraBoldItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: normal;
+  font-weight: 900;
+  src: url("Inter-Black.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Inter";
+  font-style: italic;
+  font-weight: 900;
+  src: url("Inter-BlackItalic.woff2") format("woff2");
+}
+
+/* InterDisplay */
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 100;
+  src: url("InterDisplay-Thin.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 100;
+  src: url("InterDisplay-ThinItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 200;
+  src: url("InterDisplay-ExtraLight.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 200;
+  src: url("InterDisplay-ExtraLightItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 300;
+  src: url("InterDisplay-Light.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 300;
+  src: url("InterDisplay-LightItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 400;
+  src: url("InterDisplay-Regular.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 400;
+  src: url("InterDisplay-Italic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 500;
+  src: url("InterDisplay-Medium.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 500;
+  src: url("InterDisplay-MediumItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 600;
+  src: url("InterDisplay-SemiBold.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 600;
+  src: url("InterDisplay-SemiBoldItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 700;
+  src: url("InterDisplay-Bold.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 700;
+  src: url("InterDisplay-BoldItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 800;
+  src: url("InterDisplay-ExtraBold.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 800;
+  src: url("InterDisplay-ExtraBoldItalic.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: normal;
+  font-weight: 900;
+  src: url("InterDisplay-Black.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "InterDisplay";
+  font-style: italic;
+  font-weight: 900;
+  src: url("InterDisplay-BlackItalic.woff2") format("woff2");
+}

data/app/assets/stylesheets/pages_core/admin/global/typography.css

@@ -0,0 +1,109 @@
+@define-mixin child-margins {
+  &:first-child {
+    margin-top: 0px;
+  }
+  &:last-child {
+    margin-bottom: 0px;
+  }
+}
+
+:root {
+  --bold-weight: 600;
+
+  --font-os-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
+    Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
+  --font-sans: "Inter", var(--font-os-sans);
+
+  --font-heading-2: 600 1.4rem/1.2 var(--font-sans);
+  --font-heading-3: 600 1.2rem/1.4 var(--font-sans);
+
+  --font-large: 400 1.2rem/1.4 var(--font-sans);
+  --font-normal: 400 1rem/1.5 var(--font-sans);
+  --font-small: 400 0.875rem/1.33 var(--font-sans);
+}
+
+html {
+  font-size: 1rem;
+}
+
+body {
+  font: var(--font-normal);
+}
+
+b,
+strong {
+  font-weight: var(--bold-weight);
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  margin: 1.25rem 0;
+  @mixin child-margins;
+}
+
+h2 {
+  font: var(--font-heading-2);
+  margin-top: 3rem;
+  letter-spacing: -0.04rem;
+  @mixin child-margins;
+  form &:first-of-type {
+    margin-top: 0px;
+  }
+}
+
+h3,
+.sidebar h2 {
+  font: var(--font-heading-3);
+  margin-top: 2rem;
+  letter-spacing: -0.02rem;
+  @mixin child-margins;
+}
+
+table,
+small,
+.page-description,
+header,
+.sidebar,
+.pagination {
+  font: var(--font-small);
+}
+
+.page-tree {
+  .date,
+  .status-label,
+  .collapsed-label,
+  button {
+    font: var(--font-small);
+  }
+}
+
+.login-form,
+form .field {
+  label {
+    font-weight: var(--bold-weight);
+  }
+  label,
+  .description {
+    font: var(--font-small);
+  }
+}
+
+input,
+textarea {
+  font: var(--font-normal);
+}
+
+button,
+select {
+  font: var(--font-small);
+}
+
+input[type="text"].large,
+input[type="password"].large {
+  font: var(--font-large);
+}

data/app/assets/stylesheets/pages_core/admin/vars.css

@@ -2,9 +2,6 @@
 @custom-media --narrow screen and (max-width: 1150px);
 
 :root {
-  --font-os-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
-    Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
-
   --red: #c00007;
   --red-transparent: #c0000740;
   --red-hover: #8d0005;
@@ -21,6 +18,7 @@
   --background-invert-color: #000;
   --background-disabled-color: #f8f8f8;
   --background-warning-color: #ffdfa0;
+  --background-highlight-color: #e7f3f9;
   --text-color: #111;
   --text-light-color: #666;
   --text-lighter-color: #999;

data/app/assets/stylesheets/pages_core/admin.postcss.css

@@ -5,5 +5,6 @@
 @import "@fortawesome/fontawesome-free/css/regular";
 
 @import "admin/vars";
+@import-glob "admin/global/*.css";
 @import-glob "admin/components/*.css";
 @import-glob "admin/controllers/*.css";

data/app/controllers/admin/account_recoveries_controller.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Admin
+  class AccountRecoveriesController < Admin::AdminController
+    before_action :require_authentication, except: %i[new create show update]
+    before_action :find_by_token, only: %i[show update]
+    around_action :validate_otp, only: %i[update]
+
+    def show; end
+
+    def new; end
+
+    def create
+      @user = User.find_by(email: params[:email])
+      if @user
+        deliver_account_recovery(@user)
+        flash[:notice] = t("pages_core.account_recovery.sent")
+      else
+        flash[:notice] = t("pages_core.account_recovery.not_found")
+      end
+      redirect_to admin_login_url
+    end
+
+    def update
+      if user_params[:password].present? && @user.update(user_params)
+        authenticate!(@user)
+        flash[:notice] = t("pages_core.account_recovery.changed")
+        redirect_to admin_login_url
+      else
+        render action: :show
+      end
+    end
+
+    private
+
+    def deliver_account_recovery(user)
+      AdminMailer.account_recovery(
+        user,
+        admin_account_recovery_with_token_url(recovery_token(user))
+      ).deliver_later
+    end
+
+    def fail_recovery(message)
+      flash[:notice] = message
+      redirect_to new_admin_account_recovery_url
+    end
+
+    def find_by_token
+      @token = params[:token]
+      @user = User.find(message_verifier.verify(@token).symbolize_keys[:id])
+      return if @user
+
+      fail_recovery(t("pages_core.account_recovery.invalid_request"))
+    rescue ActiveSupport::MessageVerifier::InvalidSignature
+      fail_recovery(t("pages_core.account_recovery.invalid_request"))
+    end
+
+    def message_verifier
+      Rails.application.message_verifier(:account_recovery)
+    end
+
+    def recovery_token(user)
+      message_verifier.generate({ id: user.id }, expires_in: 24.hours)
+    end
+
+    def user_params
+      params.require(:user).permit(:password, :password_confirmation)
+    end
+
+    def validate_otp
+      User.transaction do
+        if valid_otp(@user, params[:otp])
+          yield
+        else
+          flash.now[:notice] = t("pages_core.otp.invalid_code")
+          render action: :show
+        end
+      end
+    end
+
+    def valid_otp(user, otp)
+      return true unless user.otp_enabled?
+
+      OtpSecret.new(user).validate_otp_or_recovery_code!(otp)
+    end
+  end
+end