trestle-auth 0.5.0.pre → 0.5.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf9bdc4d138b38fa4ad97bcfd868b5a10eded1259fc61d781f3c06ba5d0d442
-  data.tar.gz: 720f210a517b3cd1a90218fedc6c6a962ff92e39d683f6ed3f8f5e83b88a8958
+  metadata.gz: 144e61c6788c0348620a3eff6dbebfe6ceca99fe4f7ea25033ff6bdc63fcd948
+  data.tar.gz: 919a738389172b29a037ef7a3f981efd665f67a67ec22738cf625a49e6a14c48
 SHA512:
-  metadata.gz: d31ce0625a8e8f2ab7c0e2d4f3da94f7c4409efcb4e6b2ed34ff22db00cbd4e9e7a47f830e41dbfd1801412d0531015aebfc6d5d8975f78a0e589f643bf77373
-  data.tar.gz: e2f83f7ffa3652879224c87230a1fbfa9e6f6cf104f9607f8e606c2cc8e2b3d29560f46ec4811eeccb54d1de71c2a91d9941d676409ebb8102f7360e9fa29687
+  metadata.gz: 00a63d8741775dbf8a5a3ecbf5cb0ad1e44ea22a218db17fa83b0340ed5416e19943ff0b341af8dbb37ded9cbcc3a129b744546aa93e9c25cc0cf83a4f8f6653
+  data.tar.gz: c9c42bde70ebb2afd0194b42b34c416870f77b782c6ee95b467cdcd2ea5760a775180714888857a47a1fdecbaa741a58f6d1a3d378f4d14c91033a5d02d082c0

data/.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Publish gem
+
+on: workflow_dispatch
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    # If you configured a GitHub environment on RubyGems, you must use it here.
+    environment: release
+
+    steps:
+      # Set up
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1

data/.github/workflows/rspec.yml

@@ -7,17 +7,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [ rails-5.2, rails-6.0, rails-6.1 ]
-        ruby: [ '2.7' ]
         include:
+          - gemfile: rails-6.0
+            ruby: '2.6'
+          - gemfile: rails-6.1
+            ruby: '2.6'
           - gemfile: rails-6.1
             ruby: '3.0'
           - gemfile: rails-7.0
             ruby: '2.7'
           - gemfile: rails-7.0
             ruby: '3.0'
+          - gemfile: rails-7.0-propshaft
+            ruby: '3.0'
           - gemfile: rails-7.1
-            ruby: '3.2'
+            ruby: '3.3'
+          - gemfile: rails-7.1-propshaft
+            ruby: '3.3'
+          - gemfile: rails-7.2
+            ruby: '3.3'
+          - gemfile: rails-7.2-propshaft
+            ruby: '3.3'
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

data/Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in trestle-auth.gemspec
-gemspec
+group :development, :test do
+  gem "sprockets-rails"
+  # gem "propshaft"
+end
 
 group :test do
   gem "rspec-rails"
@@ -14,6 +16,7 @@ group :test do
 end
 
 gem "rails", "~> 7.1.0"
-gem "sprockets-rails"
-
 gem "trestle", github: "TrestleAdmin/trestle"
+
+# Specify your gem's dependencies in trestle-auth.gemspec
+gemspec

data/app/assets/bundle/trestle/auth/login.css

@@ -0,0 +1 @@
+.auth-body{color:#fff;display:flex}.auth-body .container{margin:auto;width:320px}.auth-header{margin-bottom:20px;text-align:center}.auth-header h1{align-items:center;display:flex;font-size:1.75rem;font-weight:500;justify-content:center;padding:.75rem 1rem;text-shadow:rgba(0,0,0,.5) 0 1px 1px}.auth-header img{max-height:100%;max-width:80%}.auth-header span{margin-left:10px}.login-form .input-group>*{background:hsla(0,0%,100%,.1);border:0;margin-left:0!important}.login-form .form-control{color:#fff;font-size:1rem;padding:.875rem .625rem}.login-form .form-control:focus{box-shadow:none;outline-color:transparent;outline-style:none}.login-form .form-control:-ms-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control::placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-webkit-autofill{-webkit-text-fill-color:#fff}.login-form .form-control:-webkit-autofill,.login-form .form-control:-webkit-autofill:active,.login-form .form-control:-webkit-autofill:focus,.login-form .form-control:-webkit-autofill:hover{-webkit-transition:background-color 9999999s ease-in-out 0s;transition:background-color 9999999s ease-in-out 0s}.login-form .input-group-text{color:hsla(0,0%,100%,.5);padding:.25rem .25rem .25rem .875rem}.login-form .btn-primary{box-shadow:0 0 2px rgba(0,0,0,.1);padding-bottom:.625rem;padding-top:.625rem}.login-form .alert-danger{background-color:hsla(2,62%,66%,.75)}.login-form .remember-me{font-size:.8125rem;line-height:1.5;padding-left:0}.login-form .remember-me .form-check-input{margin-left:1em;margin-top:.825em}.login-form .remember-me .form-check-label{background:rgba(0,0,0,.075);border-radius:.375rem;color:hsla(0,0%,100%,.75);cursor:pointer;display:block;padding:.75em 1.5em .75em 3.25em}.login-form .remember-me .form-check-label:hover{background:rgba(0,0,0,.125)}

data/app/assets/bundle/trestle/auth/userbox.css

@@ -1 +1 @@
-.userbox{align-items:center;display:flex;order:99;padding:2px 0}.userbox>a{color:#333;display:block;font-weight:400;line-height:40px;padding:2px 0}.userbox>a:focus,.userbox>a:hover{text-decoration:none}.userbox .avatar{margin-left:6px;vertical-align:top}.userbox .dropdown-toggle:after{vertical-align:middle}@media (max-width:767.98px){.userbox{display:block;position:relative;z-index:5}.userbox .name{display:none}.userbox .avatar{border:1px solid hsla(0,0%,100%,.25);margin-left:0}}
+.userbox{align-items:center;display:flex;order:99;padding:.125rem 0}.userbox>a{color:#333;display:block;font-weight:400;line-height:40px;padding:.125rem 0}.userbox>a:focus,.userbox>a:hover{text-decoration:none}.userbox .avatar{margin-left:.375rem;vertical-align:top}.userbox .dropdown-toggle:after{vertical-align:middle}@media(max-width:575.98px){.userbox{display:block;position:relative;z-index:5}.userbox .name{display:none}.userbox .avatar{border:1px solid hsla(0,0%,100%,.25);margin-left:0}}

data/app/assets/sprockets/trestle/auth/manifest.js

@@ -0,0 +1,3 @@
+//= link trestle/auth/login.css
+//= link trestle/auth/userbox.css
+//= link trestle/auth/custom.css

data/app/views/layouts/trestle/auth.html.erb

@@ -18,9 +18,10 @@
     <%= stylesheet_link_tag "trestle/admin", 'data-turbo-track': 'reload' %>
     <%= stylesheet_link_tag "trestle/icons/font-awesome", 'data-turbo-track': 'reload' if defined?(Sprockets) %>
 
-    <%= stylesheet_link_tag "trestle/custom", 'data-turbo-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/auth/login", 'data-turbo-track': 'reload' %>
 
-    <%= stylesheet_link_tag "trestle/auth", 'data-turbo-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/custom", 'data-turbo-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/auth/custom", 'data-turbo-track': 'reload' %>
 
     <%= render "trestle/theme" %>
 

data/frontend/_form.scss

@@ -7,9 +7,9 @@
 
   .form-control {
     color: $auth-form-control-color;
-    font-size: 1.1rem;
+    font-size: 1rem;
 
-    padding: 1rem 0.75rem;
+    padding: 0.875rem 0.625rem;
 
     &:focus {
       outline-color: transparent;
@@ -32,14 +32,14 @@
 
   .input-group-text {
     color: $auth-form-control-icon-color;
-    padding: 0.375rem 0.25rem 0.375rem 1rem;
+    padding: 0.25rem 0.25rem 0.25rem 0.875rem;
   }
 
   .btn-primary {
     box-shadow: rgba(black, 0.1) 0 0 2px;
 
-    padding-top: 0.75rem;
-    padding-bottom: 0.75rem;
+    padding-top: 0.625rem;
+    padding-bottom: 0.625rem;
   }
 
   .alert-danger {
@@ -47,7 +47,7 @@
   }
 
   .remember-me {
-    font-size: 0.95rem;
+    font-size: 0.8125rem;
     line-height: 1.5;
 
     padding-left: 0;

data/frontend/userbox.scss

@@ -2,7 +2,7 @@
 
 .userbox {
   order: 99;
-  padding: 2px 0;
+  padding: 0.125rem 0;
 
   display: flex;
   align-items: center;
@@ -11,7 +11,7 @@
     color: $body-color;
 
     display: block;
-    padding: 2px 0;
+    padding: 0.125rem 0;
 
     font-weight: normal;
     line-height: 40px;
@@ -23,7 +23,7 @@
 
   .avatar {
     vertical-align: top;
-    margin-left: 6px;
+    margin-left: 0.375rem;
   }
 
   .dropdown-toggle {

data/gemfiles/rails-7.0-propshaft.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.0.0"
+gem "propshaft"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-7.1-propshaft.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.1.0"
+gem "propshaft"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-7.2-propshaft.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.2.0.rc1"
+gem "propshaft"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/{rails-5.2.gemfile → rails-7.2.gemfile}

@@ -7,9 +7,9 @@ group :test do
   gem "capybara"
 end
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 7.2.0.rc1"
 gem "sprockets-rails"
-gem "sqlite3", "~> 1.3.13"
+gem "sqlite3", "~> 1.4"
 gem "devise"
 
 gem "trestle", github: "TrestleAdmin/trestle"

data/lib/trestle/auth/engine.rb

@@ -1,7 +1,14 @@
 module Trestle
   module Auth
     class Engine < ::Rails::Engine
-      config.assets.precompile << "trestle/auth.css" << "trestle/auth/userbox.css"
+      initializer "trestle.sprockets" do |app|
+        # Sprockets manifest
+        config.assets.precompile << "trestle/auth/manifest.js"
+      end if defined?(Sprockets)
+
+      initializer "trestle.propshaft" do |app|
+        app.config.assets.excluded_paths << root.join("app/assets/sprockets")
+      end if defined?(Propshaft)
 
       config.before_initialize do
         Trestle::Engine.paths["app/helpers"].concat(paths["app/helpers"].existent)

data/lib/trestle/auth/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Auth
-    VERSION = "0.5.0.pre"
+    VERSION = "0.5.0.pre2"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle-auth",
-  "version": "0.5.0.pre",
+  "version": "0.5.0-pre2",
   "description": "Authentication plugin for the Trestle admin framework",
   "repository": "https://github.com/TrestleAdmin/trestle-auth.git",
   "author": "Sam Pohlenz <sam@sampohlenz.com>",
@@ -19,8 +19,8 @@
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.2",
     "mini-css-extract-plugin": "^2.0.0",
-    "node-sass": "^7.0.0",
     "postcss-loader": "^6.1.1",
+    "sass": "^1.77.6",
     "sass-loader": "^12.1.0",
     "webpack": "^5.42.0",
     "webpack-cli": "^4.7.2",

data/trestle-auth.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/TrestleAdmin/trestle-auth"
 
-  spec.add_dependency "trestle", "~> 0.10.0.pre"
+  spec.add_dependency "trestle", "~> 0.10.0.pre2"
   spec.add_dependency "bcrypt",  "~> 3.1.7"
 
   spec.add_development_dependency "rspec-rails"

data/webpack.config.js

@@ -7,7 +7,7 @@ const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
 module.exports = {
   mode: 'production',
   entry: {
-    bundle: path.resolve(__dirname, 'frontend/index.scss'),
+    login: path.resolve(__dirname, 'frontend/index.scss'),
     userbox: path.resolve(__dirname, 'frontend/userbox.scss')
   },
   output: {
@@ -35,7 +35,14 @@ module.exports = {
               }
             }
           },
-          { loader: 'sass-loader' }
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                quietDeps: true
+              }
+            }
+          }
         ]
       }
     ]