trestle-auth 0.2.3 → 0.4.1

data/config/{locale → locales}/pt-BR.yml

@@ -6,3 +6,10 @@ pt-BR:
       logout: "Sair"
       error: "Email ou Senha incorretos."
       remember_me: "Lembrar-me"
+
+    auth/account:
+      titles:
+        edit: "Minha Conta"
+
+      breadcrumbs:
+        index: "Minha Conta"

data/config/locales/zh-CN.yml

@@ -0,0 +1,8 @@
+zh-CN:
+  admin:
+    auth:
+      my_account: "我的账号"
+      login: "登录"
+      logout: "退出登录"
+      error: "登录信息不正确。"
+      remember_me: "记住我"

data/config/routes.rb

@@ -1,7 +1,12 @@
 Trestle::Engine.routes.draw do
   controller "trestle/auth/sessions" do
-    get  'login'  => :new, as: :login
-    post 'login'  => :create
-    get  'logout' => :destroy, as: :logout
+    if Trestle.config.auth.enable_login
+      get  'login'  => :new, as: :login
+      post 'login'  => :create
+    end
+
+    if Trestle.config.auth.enable_logout
+      get 'logout' => :destroy, as: :logout
+    end
   end
 end

data/frontend/_form.scss

@@ -0,0 +1,79 @@
+.login-form {
+  .form-control, .input-group-text {
+    background: $auth-form-control-bg;
+    border: $auth-form-control-border;
+  }
+
+  .form-control {
+    color: $auth-form-control-color;
+    font-size: 1.1rem;
+
+    padding: 1.75rem 0.75rem;
+
+    &:focus {
+      outline-color: transparent;
+      outline-style: none;
+      box-shadow: none;
+    }
+
+    &::placeholder {
+      color: $auth-form-control-placeholder;
+    }
+
+    &:-webkit-autofill {
+      -webkit-text-fill-color: $auth-form-control-color;
+
+      &, &:hover, &:focus, &:active {
+        transition: background-color 9999999s ease-in-out 0s;
+      }
+    }
+  }
+
+  .input-group-prepend {
+    margin-right: 0;
+  }
+
+  .input-group-text {
+    color: $auth-form-control-icon-color;
+    padding: 0.375rem 0.25rem 0.375rem 1rem;
+  }
+
+  .btn-primary {
+    box-shadow: rgba(black, 0.1) 0 0 2px;
+
+    padding-top: 0.75rem;
+    padding-bottom: 0.75rem;
+  }
+
+  .alert-danger {
+    background-color: rgba($alert-danger-bg, 0.75);
+  }
+
+  .remember-me {
+    font-size: 0.95rem;
+    line-height: 1.5;
+
+    padding-left: 0;
+
+    .custom-control-label {
+      display: block;
+      cursor: pointer;
+
+      background: $auth-remember-me-bg;
+      color: $auth-remember-me-color;
+
+      border-radius: $border-radius;
+      padding: 0.75em 1.5em 0.75em 3.25em;
+
+      &:hover {
+        background: opacify($auth-remember-me-bg, 0.05);
+      }
+
+      &::before,
+      &::after {
+        top: 0.175em + 0.75em;
+        left: 1.1em;
+      }
+    }
+  }
+}

data/frontend/_layout.scss

@@ -0,0 +1,35 @@
+.auth-body {
+  display: flex;
+  color: white;
+
+  .container {
+    margin: auto;
+    width: 320px;
+  }
+}
+
+.auth-header {
+  text-align: center;
+  margin-bottom: 20px;
+
+  h1 {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 1.75rem;
+    font-weight: 500;
+    text-shadow: rgba(black, 0.5) 0 1px 1px;
+
+    padding: 0.75rem 1rem;
+  }
+
+  img {
+    max-width: 80%;
+    max-height: 100%;
+  }
+
+  span {
+    margin-left: 10px;
+  }
+}

data/{app/assets/stylesheets/trestle/auth/_defaults.scss → frontend/_variables.scss}

@@ -1,13 +1,9 @@
-$auth-bg: $theme-bg !default;
-
 $auth-form-control-color: white !default;
 $auth-form-control-placeholder: rgba(white, 0.5) !default;
 $auth-form-control-bg: rgba(white, 0.1) !default;
 $auth-form-control-border: 0 !default;
 
+$auth-form-control-icon-color: rgba(white, 0.5) !default;
+
 $auth-remember-me-color: rgba(white, 0.75) !default;
 $auth-remember-me-bg: rgba(black, 0.075) !default;
-
-$auth-login-btn-color: $btn-primary-color !default;
-$auth-login-btn-border: $btn-primary-border !default;
-$auth-login-btn-bg: $btn-primary-bg !default;

data/frontend/index.scss

@@ -0,0 +1,5 @@
+@import "~trestle/frontend/css/support";
+
+@import "variables";
+@import "layout";
+@import "form";

data/{app/assets/stylesheets/trestle/auth → frontend}/userbox.scss

@@ -1,16 +1,18 @@
-@import "trestle/support";
+@import "~trestle/frontend/css/support";
 
 .userbox {
-  margin-top: 2px;
-  margin-bottom: 2px;
+  order: 99;
+  padding: 2px 0;
+
+  display: flex;
+  align-items: center;
 
   > a {
-    color: $text-color;
+    color: $body-color;
 
     display: block;
     padding: 2px 0;
 
-    font-size: 14px;
     font-weight: normal;
     line-height: 40px;
 
@@ -24,26 +26,26 @@
     margin-left: 6px;
   }
 
-  .name {
-    color: $text-color;
+  .dropdown-toggle {
+    &::after {
+      vertical-align: middle;
+    }
   }
 }
 
-@include mobile {
+@include media-breakpoint-down(sm) {
   .userbox {
+    display: block;
     position: relative;
     z-index: 5;
 
-    > a, .name {
-      color: white;
-    }
-
     .name {
       display: none;
     }
 
     .avatar {
       border: 1px solid rgba(white, 0.25);
+      margin-left: 0;
     }
   }
 }

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 4.2.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 5.0.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.1.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 5.1.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.2.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 5.2.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-6.0.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+
+  gem "capybara"
+  gem "sqlite3", "~> 1.4"
+  gem "devise"
+end
+
+gem "rails", "~> 6.0.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/lib/generators/trestle/auth/account/account_generator.rb

@@ -0,0 +1,32 @@
+module Trestle
+  module Auth
+    module Generators
+      class AccountGenerator < ::Rails::Generators::Base
+        desc "Creates a Trestle admin for managing the logged in user"
+
+        argument :model, type: :string, default: "Administrator"
+
+        class_option :devise, type: :boolean, default: false, desc: "Create admin for a Devise user model"
+
+        source_root File.expand_path("../templates", __FILE__)
+
+        def create_admin
+          template "admin.rb.erb", "app/admin/auth/account_admin.rb"
+        end
+
+        def devise?
+          options[:devise]
+        end
+
+      protected
+        def parameter_name
+          singular_name
+        end
+
+        def singular_name
+          model.demodulize.underscore
+        end
+      end
+    end
+  end
+end

data/lib/generators/trestle/auth/account/templates/admin.rb.erb

@@ -0,0 +1,47 @@
+Trestle.resource(:account, model: <%= model %>, scope: Auth, singular: true) do
+  instance do
+    current_user
+  end
+
+  remove_action :new, :edit, :destroy
+
+  form do |<%= parameter_name %>|
+    text_field :email
+
+    <%- unless devise? -%>
+    row do
+      col(sm: 6) { text_field :first_name }
+      col(sm: 6) { text_field :last_name }
+    end
+
+    <%- end -%>
+    row do
+      col(sm: 6) { password_field :password }
+      col(sm: 6) { password_field :password_confirmation }
+    end
+  end
+  <%- if devise? -%>
+
+  # Ignore the password parameters if they are blank
+  update_instance do |instance, attrs|
+    if attrs[:password].blank?
+      attrs.delete(:password)
+      attrs.delete(:password_confirmation) if attrs[:password_confirmation].blank?
+    end
+
+    instance.assign_attributes(attrs)
+  end
+
+  # Log the current user back in if their password was changed
+  after_action on: :update do
+    if instance.encrypted_password_previously_changed?
+      login!(instance)
+    end
+  end if Devise.sign_in_after_reset_password
+  <%- end -%>
+
+  # Limit the parameters that are permitted to be updated by the user
+  params do |params|
+    params.require(:account).permit(:email, <% unless devise? %>:first_name, :last_name, <% end %>:password, :password_confirmation)
+  end
+end

data/lib/generators/trestle/auth/admin/admin_generator.rb

@@ -6,15 +6,29 @@ module Trestle
 
         argument :model, type: :string, default: "Administrator"
 
+        class_option :devise, type: :boolean, default: false, desc: "Create admin for a Devise user model"
+
         source_root File.expand_path("../templates", __FILE__)
 
         def create_admin
           template "admin.rb.erb", File.join('app/admin/auth', "#{model.underscore.pluralize}_admin.rb")
         end
 
+        def devise?
+          options[:devise]
+        end
+
       protected
+        def parameter_name
+          singular_name
+        end
+
         def plural_name
-          model.demodulize.underscore.pluralize
+          singular_name.pluralize
+        end
+
+        def singular_name
+          model.demodulize.underscore
         end
       end
     end