signum 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b0e2cdc6b8936ceb9c1cb718ec2e78c53ef50fbb7cbad8b174b92f9b500a64
-  data.tar.gz: aac0042cb09a5df30ecc681a6b51da1427fd3120a20a11a8d8fce4ed39ccaeb7
+  metadata.gz: 65ddec675d519cebd682d685b2da8fece2db0b66d4e3dddaa130eb292f2b6e89
+  data.tar.gz: c02695a0e0b5978ff7e5b1595dcabcb034aace639682046899beb3fb34ec72a2
 SHA512:
-  metadata.gz: 42b34828f5bea2a46a40c52be15f5fa9bebd6904110820e301dded3fe3f8fcc065941e505c441ea60d43babe3e894655c504d6a4060eb130d373769cd3c7042b
-  data.tar.gz: 738bed62ed28d5ca6ae5f6013354374462f898f1a925dec27695a955bc5945e5e89fb2e90822f04d2fdecafb6c0a210bda71c43ce34615e5b99e17a3267cb7c0
+  metadata.gz: 96b4491e10ccc698f14b52a0b11a94476fc3cd4652e798a1b1b3e782227f1d636d8c676c4485e24bed6d35bbd991f42c5c74bfbe6b17bed8896e613800aea8bf
+  data.tar.gz: 0f826ed2651e4fce6a779fbefda95b6496b74416938deb2fdc271762ead8af55de799e6aa5abd0036912e936f90ad769579363d7dd126c87f8d574852c855275

data/Gemfile

@@ -19,5 +19,4 @@ gemspec
 
 gem 'auxilium', '~> 3', entdec: 'auxilium'
 
-gem "ruby-lsp", "~> 0.3.2", :group => :development
-gem "sprockets-rails"
+gem "sprockets-rails"

data/Gemfile.lock

@@ -13,12 +13,12 @@ GIT
 PATH
   remote: .
   specs:
-    signum (0.3.18)
+    signum (0.5.1)
       importmap-rails
       pg
       rails (> 6.0)
       slim-rails (~> 3)
-      state_machines-activemodel
+      state_machines-activerecord
       stimulus-rails
       tailwindcss-rails
       turbo-rails
@@ -122,7 +122,6 @@ GEM
     irb (1.11.2)
       rdoc
       reline (>= 0.4.2)
-    language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -143,14 +142,13 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
+    nio4r (2.7.1)
     nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pg (1.5.6)
-    prettier_print (1.2.1)
     psych (5.1.2)
       stringio
     pundit (2.3.1)
@@ -202,10 +200,6 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     rolify (6.0.1)
-    ruby-lsp (0.3.8)
-      language_server-protocol (~> 3.17.0)
-      sorbet-runtime
-      syntax_tree (>= 5.0.0, < 6)
     ruby2_keywords (0.0.5)
     slim (5.2.1)
       temple (~> 0.10.0)
@@ -214,7 +208,6 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       slim (>= 3.0, < 6.0, != 5.0.0)
-    sorbet-runtime (0.5.11276)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -228,11 +221,12 @@ GEM
     state_machines-activemodel (0.9.0)
       activemodel (>= 6.0)
       state_machines (>= 0.6.0)
+    state_machines-activerecord (0.9.0)
+      activerecord (>= 6.0)
+      state_machines-activemodel (>= 0.9.0)
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)
     stringio (3.1.0)
-    syntax_tree (5.3.0)
-      prettier_print (>= 1.2.0)
     tailwindcss-rails (2.3.0)
       railties (>= 6.0.0)
     temple (0.10.3)
@@ -256,7 +250,6 @@ PLATFORMS
 
 DEPENDENCIES
   auxilium (~> 3)!
-  ruby-lsp (~> 0.3.2)
   signum!
   sprockets-rails
   sqlite3

data/README.md

@@ -51,14 +51,14 @@ s = Signum.signal(Current.user, text: "Hello World New", title: "Icon", icon:'fa
 
 Buttons and links:
 ```ruby
-s = Signum.success(Current.user, text: "Hello World New", title: "Link1", metadata: {buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}]})
-s = Signum.signal(Current.user, text: "Hello World New", title: "Link2", metadata: {buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}]}, icon: 'fa-regular fa-t-rex')
-s = Signum.signal(Current.user, text: "Hello World New", title: "Link2", metadata: {buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"},{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"},{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}]})
+s = Signum.success(Current.user, text: "Hello World New", title: "Link1", buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}])
+s = Signum.signal(Current.user, text: "Hello World New", title: "Link2", buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}], icon: 'fa-regular fa-t-rex')
+s = Signum.signal(Current.user, text: "Hello World New", title: "Link2", buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"},{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"},{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}])
 ```
 
 You can also show a progressbar, this is based on count and total. Setting the count to total completes the progressbar.
 ```ruby
-s = Signum.success(Current.user, text: "Hello World New", title: "this is test title", metadata: {buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}]}, count: 75, total: 150)
+s = Signum.success(Current.user, text: "Hello World New", title: "this is test title", buttons:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}], links:[{title: "Google", url:"http://www.google.com"}, {title: "Apple", url: "http://www.apple.com"}, {title: "Amazon", url: "http://www.amazon.com"}], count: 75, total: 150)
 ```
 
 You can also attach attachments

data/app/components/signum/notification_body/component.html.slim

@@ -11,12 +11,13 @@
         - if signal.text.present?
           p.signum-notification-body__mb__bc__mc__tx
             = sanitize signal.text
-        - if signal.metadata.present? && signal.metadata["links"].present?
+        - if signal.links.present?
           .signum-notification-body__mb__bc__mc__lkc
-            - signal.metadata["links"].each do | link |
-              a.signum-notification-body__mb__bc__mc__lkc__lk href="#{link["url"]}" target=link.fetch("target", "_blank") *link["link_attributes"]
+            - signal.links.each do | link |
+              - next unless link.is_a?(Hash)
+              a.signum-notification-body__mb__bc__mc__lkc__lk*{href: link.fetch('url', '#'), target:link.fetch("target", "_blank"), 'data-action': button["close"] ? "click->signum-notification-body#close" : "" }.merge(link.fetch("link_attributes", {}))
                 i.fas.fa-link
-                =< link["title"]
+                =< link["title"] || link["url"] || '(...)'
         - if signal.attachments.attached?
           .signum-notification-body__mb__bc__mc__attc
             - signal.attachments.each do | attachment |
@@ -29,13 +30,14 @@
             | Close
           svg.h-5.w-5[xmlns="http://www.w3.org/2000/svg" viewbox="0 0 20 20" fill="currentColor" aria-hidden="true"]
             path[d="M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z"]
-    - if signal.metadata.present? && signal.metadata["buttons"].present?
+    - if signal.buttons.present?
       .signum-notification-body__mb__bmc
-        - signal.metadata["buttons"].each do | button |
+        - signal.buttons.each do | button |
+          - next unless button.is_a?(Hash)
           .signum-notification-body__mb__bmc__bc
-            a.signum-notification-body__mb__bmc__bc__b href="#{button["url"]}" target=button.fetch("target", "_blank") *button["link_attributes"]
+            a.signum-notification-body__mb__bmc__bc__b*{href: button.fetch('url', '#'), target: button.fetch("target", "_blank"), 'data-action': button["close"] ? "click->signum-notification-body#close" : "" }.merge(button.fetch("link_attributes", {}))
               = button["title"]
   - if signal.count.present?
     - percentage = signal.total.present? ? signal.count.fdiv(signal.total) * 100 : signal.count
     .signum-notification-body__pbc
-      = sts.progress_bar percentage, size: :small, label: false
+      = sts.progress_bar percentage, size: :small, label: false

data/app/components/signum/notification_drawer/component.html.slim

@@ -1,7 +1,8 @@
-div.text-left[data-controller="signum-notification-drawer" data-action="mouseover->signum-notification-drawer#show mouseleave->signum-notification-drawer#hide"]
+div.text-left[data-controller="signum-notification-drawer" data-action="mouseover->signum-notification-drawer#show mouseleave->signum-notification-drawer#hide click->signum-notification-drawer#closeNotifications"]
   button.signum-notification-drawer-button
-    = "<i class='hidden #{Signum.config.icons[:unread_main]}' data-signum-notification-drawer-target='alertbellicon'></i>".html_safe
-    = "<i class='#{Signum.config.icons[:read_main]}' data-signum-notification-drawer-target='bellicon'></i>".html_safe
+    i class="hidden #{Signum.config.icons[:unread_main]}" data-signum-notification-drawer-target='alertbellicon'
+    i class="#{Signum.config.icons[:read_main]}" data-signum-notification-drawer-target='bellicon'
+    i.hidden.fas.fa-times.cross-icon.text-xs.absolute.top-5.right-15#crossIcon data-signum-notification-drawer-target="crossicon"
 
     .signum-notification-drawer-tray.hidden[data-signum-notification-drawer-target="submenu" id="#{Signum.config.drawer_notifications_container_id.call}"]
-      = render(Signum::NotificationDrawerItem::Component.with_collection(signals))
+      = render(Signum::NotificationDrawerItem::Component.with_collection(signals))

data/app/components/signum/notification_drawer/component_controller.js

@@ -1,7 +1,8 @@
 import ApplicationController from "signum/controllers/application_controller"
 
 export default class extends ApplicationController {
-  static targets = ["alertbellicon", "bellicon", "submenu", "item"]
+
+  static targets = ["alertbellicon", "bellicon", "submenu", "item", "crossicon"]
 
   connect() {
     this.bounditemActivity = this.itemActivity.bind(this)
@@ -10,6 +11,7 @@ export default class extends ApplicationController {
     setTimeout(() => {
       this.manageBellIcon()
     }, 300)
+
   }
 
   disconnect() {
@@ -19,6 +21,11 @@ export default class extends ApplicationController {
   show(event) {
     if (this.submenuTarget.children.length > 0) {
       this.submenuTarget.classList.remove("hidden")
+      if (event.altKey) {
+        this.crossiconTarget.style.display = 'inline-block'
+      } else {
+        this.crossiconTarget.style.display = 'none'
+      }
     } else {
       this.submenuTarget.classList.add("hidden")
     }
@@ -26,6 +33,31 @@ export default class extends ApplicationController {
 
   hide(event) {
     this.submenuTarget.classList.add("hidden")
+    this.crossiconTarget.style.display = 'none'
+    if (this.submenuTarget.children.length < 0) {
+      this.alertbelliconTarget.classList.add("hidden")
+    }
+    if (event.altKey) {
+      this.crossiconTarget.style.display = 'none'
+    }
+  }
+
+  closeNotifications(event) {
+    if (event.altKey) {
+      fetch("/signal/close_all", {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      })
+        .then((res) => {})
+        .catch((err) => {
+          console.log(err)
+        })
+      this.crossiconTarget.style.display = 'none';
+      this.belliconTarget.style.display = 'inline-block'
+      this.alertbelliconTarget.style.display = 'none';
+    }
   }
 
   itemActivity(event) {

data/app/controllers/signum/signal_controller.rb

@@ -3,11 +3,19 @@ module Signum
     def show
       signal = Signum::Signal.find(signal_params[:id])
       signal.show! if signal.broadcasted?
+      head :ok
     end
 
     def close
       signal = Signum::Signal.find(signal_params[:id])
       signal.close!
+      head :ok
+    end
+
+    def close_all
+      signals = current_user.signals.where.not(state: 'closed')
+      signals.each(&:close!)
+      head :ok
     end
 
     private

data/config/routes.rb

@@ -1,5 +1,6 @@
 Signum::Engine.routes.draw do
   post 'signal/show', to: 'signal#show'
   post 'signal/close', to: 'signal#close'
+  get 'signal/close_all', to: 'signal#close_all'
   post 'signal/open_stickies', to: 'signal#open_stickies'
 end

data/db/migrate/20240405112807_add_links_and_buttons_to_signals.rb

@@ -0,0 +1,6 @@
+class AddLinksAndButtonsToSignals < ActiveRecord::Migration[7.1]
+  def change
+    add_column :signum_signals, :links, :jsonb
+    add_column :signum_signals, :buttons, :jsonb
+  end
+end

data/lib/signum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Signum
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signum
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -204,6 +204,7 @@ files:
 - db/migrate/20201125175035_create_signum_signals.rb
 - db/migrate/20230317123138_add_columns_to_signum_signal.rb
 - db/migrate/20231218095011_add_subject_to_signals.rb
+- db/migrate/20240405112807_add_links_and_buttons_to_signals.rb
 - lib/generators/signum/install_generator.rb
 - lib/generators/signum/tailwind_config_generator.rb
 - lib/generators/signum/templates/config/initializers/signum.rb
@@ -216,7 +217,6 @@ files:
 - package.json
 - signum.gemspec
 - vendor/javascript/@hotwired--stimulus.js
-- webpack.config.js
 - yarn.lock
 homepage: https://github.com/entdec/signum
 licenses:

data/webpack.config.js

@@ -1,126 +0,0 @@
-const path = require('path');
-const CleanWebpackPlugin = require('clean-webpack-plugin')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-
-module.exports = {
-  entry: './frontend/src/signum.js',
-  output: {
-    path: __dirname + '/frontend/dist',
-    filename: 'signum.js',
-    library: 'Signum',
-    libraryTarget: 'umd'
-  },
-  plugins: [
-    // new CleanWebpackPlugin(['frontend/dist'],  {}),
-    new MiniCssExtractPlugin({
-      filename: 'signum.css'
-    })
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: ['env'],
-            plugins: ["transform-class-properties"]
-          }
-        }
-      },
-      {
-        test: /\.(|ttf|eot|svg|woff2?)(\?[\s\S]+)?$/,
-        use: 'file-loader',
-      },
-      {
-        test: /\.(sass|scss|css)$/,
-        use: [
-          {
-            loader: MiniCssExtractPlugin.loader,
-          },
-          'css-loader?sourceMap=false',
-          'sass-loader?sourceMap=false'
-        ]
-      }
-    ]
-  },
-  resolve: {
-    modules: [path.resolve('./node_modules'), path.resolve('./src')],
-    extensions: ['.json', '.js']
-  }
-}
-
-
-
-// const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-// const path = require('path');
-
-// const devMode = process.env.NODE_ENV !== 'production'
-
-// module.exports = {
-//   mode: devMode ? "development" : "production",
-//   entry: {
-//     signum: ['./frontend/src/signum.js']
-//   },
-//   output: {
-//     path: __dirname + '/frontend/dist',
-//     filename: '[name].js',
-//   },
-
-//   module: {
-//     rules: [
-//       {
-//         test: /\.(c|sa|sc)ss$/,
-//         exclude: /(node_modules)/,
-//         // Use the following loaders from right-to-left, so it will
-//         // use sass-loader first and ending with MiniCssExtractPlugin
-//         use: [
-//           {
-//             // Extracts the CSS into a separate file and uses the
-//             // defined configurations in the 'plugins' section
-//             loader: MiniCssExtractPlugin.loader
-//           },
-//           {
-//             // Interprets CSS
-//             loader: "css-loader",
-//             options: {
-//               importLoaders: 2
-//             }
-//           },
-//           {
-//             // Adds support for Sass files, if using Less, then
-//             // use the less-loader
-//             loader: "sass-loader"
-//           }
-//         ]
-//       },
-//       {
-//         test: /\.js$/,
-//         exclude: /(node_moduldes)/,
-//         use: {
-//           loader: 'babel-loader',
-//           options: {
-//             presets: ['@babel/preset-env']
-//           }
-//         }
-//       },
-//       {
-//         test: /\.(ttf|eot|svg|woff2?)(\?[\s\S]+)?$/,
-//         use: 'file-loader',
-//       },
-//     ]
-//   },
-//   plugins: [
-//     // Configuration options for MiniCssExtractPlugin. Here I'm only
-//     // indicating what the CSS output file name should be and
-//     // the location
-//     new MiniCssExtractPlugin({
-//       filename: devMode ? "[name].css" : "[name].min.css"
-//     })
-//   ],
-//   resolve: {
-//     modules: [path.resolve('./node_modules'), path.resolve('./src')],
-//     extensions: ['.json', '.js']
-//   }
-// }