redis_dashboard 0.2.0 → 0.3.0

data/lib/redis_dashboard/views/slowlog.erb

@@ -1,30 +1,31 @@
-<p>
-  List up to <%= client.config["slowlog-max-len"] %> commands slower than <%== format_usec client.config["slowlog-log-slower-than"] %>.
-  It is defined in your config by <em>slowlog-max-len</em> and <em>slowlog-log-slower-than</em>.
-</p>
-
-<div class="table">
+<div class="card">
+  <p>
+    List up to <%= client.config["slowlog-max-len"] %> commands slower than <%== format_usec client.config["slowlog-log-slower-than"] %>.
+    It is defined in your config by <em>slowlog-max-len</em> and <em>slowlog-log-slower-than</em>.
+  </p>
   <table>
     <thead>
-      <th>ID</th>
-      <th>At</th>
-      <th>Duration</th>
-      <th>Command</th>
-    </thead>
-
-    <% for cmd in commands %>
       <tr>
-        <td><%= cmd.id %></td>
-        <td class="date"><%= epoch_to_short_date_time cmd.timestamp %></td>
-        <td class="number"><%== format_usec cmd.microseconds %></td>
-        <td><%= cmd.command.join(" ") %></td>
+        <th>Command</th>
+        <th class="is-right">ID</th>
+        <th class="is-right">At</th>
+        <th class="is-right">Duration</th>
       </tr>
-    <% end %>
+    </thead>
+    <tbody>
+      <% for cmd in commands %>
+        <tr>
+          <td class="wrap"><%= cmd.command.join(" ") %></td>
+          <td class="is-right"><%= cmd.id %></td>
+          <td class="is-right date"><%= epoch_to_short_date_time cmd.timestamp %></td>
+          <td class="is-right"><%== format_usec cmd.microseconds %></td>
+        </tr>
+      <% end %>
+    </tbody>
   </table>
 </div>
-
-<a href="https://redis.io/commands/slowlog">
-  <svg viewBox="0 0 24 24">
-    <path d="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z" />
-  </svg> Redis slowlog documentation
-</a>
+<div role="alert">
+  <a href="https://redis.io/commands/slowlog" target="_blank" rel="noopener nofollower">
+    Redis slowlog documentation
+  </a>
+</div>

data/lib/redis_dashboard/views/stats.erb

@@ -1,20 +1,24 @@
-<div class="table">
+<div class="card">
   <table>
-    <tr>
-      <th>Command</th>
-      <th>Total time</th>
-      <th>Calls</th>
-      <th>AVG time</th>
-      <th>Impact</th>
-    </tr>
-    <% for (key,hash) in stats %>
+    <thead>
       <tr>
-        <td class="key"><%= key %></td>
-        <td class="number"><%== format_usec hash["usec"] %></td>
-        <td class="number"><%= hash["calls"] %></td>
-        <td class="number"><%== format_usec hash["usec_per_call"] %></td>
-        <td class="number"><%== format_impact_percentage hash["impact"] %></td>
+        <th>Command</th>
+        <th class="is-right">Calls</th>
+        <th class="is-right">AVG time</th>
+        <th class="is-right">Total time</th>
+        <th class="is-right">Impact</th>
       </tr>
-    <% end %>
+    </thead>
+    <tbody>
+      <% for (key,hash) in stats %>
+        <tr>
+          <td class="wrap"><%= key %></td>
+          <td class="is-right"><%= hash["calls"] %></td>
+          <td class="is-right"><%== format_usec hash["usec_per_call"] %></td>
+          <td class="is-right"><%== format_usec hash["usec"] %></td>
+          <td class="is-right"><%== format_impact_percentage hash["impact"] %></td>
+        </tr>
+      <% end %>
+    </tbody>
   </table>
 </div>

data/lib/redis_dashboard.rb

@@ -4,7 +4,7 @@ module RedisDashboard
   end
 
   def self.urls
-    @urls ||= ["redis://localhost"]
+    @urls ||= [ENV["REDIS_URL"] ||"redis://localhost"]
   end
 end
 

data/redis_dashboard.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "redis_dashboard"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Alexis Bernard"]
   spec.email         = ["alexis@bernard.io"]
   spec.summary       = "Sinatra app to monitor Redis servers."
@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "erubi"
   spec.add_runtime_dependency "redis"
-  spec.add_runtime_dependency "sassc"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_dashboard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Sinatra app to monitor Redis servers
 email:
 - alexis@bernard.io
@@ -74,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -82,22 +69,27 @@ files:
 - lib/redis_dashboard/application.rb
 - lib/redis_dashboard/client.rb
 - lib/redis_dashboard/command.rb
+- lib/redis_dashboard/public/ariato.css
+- lib/redis_dashboard/public/style.css
 - lib/redis_dashboard/views/application.scss
 - lib/redis_dashboard/views/clients.erb
 - lib/redis_dashboard/views/config.erb
 - lib/redis_dashboard/views/index.erb
 - lib/redis_dashboard/views/info.erb
+- lib/redis_dashboard/views/key.erb
+- lib/redis_dashboard/views/key/hash.erb
+- lib/redis_dashboard/views/key/list.erb
+- lib/redis_dashboard/views/key/metadata.erb
+- lib/redis_dashboard/views/key/set.erb
+- lib/redis_dashboard/views/key/string.erb
+- lib/redis_dashboard/views/key/unsupported.erb
+- lib/redis_dashboard/views/key/zset.erb
+- lib/redis_dashboard/views/keys.erb
+- lib/redis_dashboard/views/keyspace.erb
 - lib/redis_dashboard/views/layout.erb
 - lib/redis_dashboard/views/memory.erb
 - lib/redis_dashboard/views/slowlog.erb
 - lib/redis_dashboard/views/stats.erb
-- lib/redis_dashboard/views/stylesheets/base.scss
-- lib/redis_dashboard/views/stylesheets/colors.scss
-- lib/redis_dashboard/views/stylesheets/link.scss
-- lib/redis_dashboard/views/stylesheets/page.scss
-- lib/redis_dashboard/views/stylesheets/server-card.scss
-- lib/redis_dashboard/views/stylesheets/table.scss
-- lib/redis_dashboard/views/stylesheets/typography.scss
 - redis_dashboard.gemspec
 - screenshot.jpg
 - start.rb
@@ -120,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Sinatra app to monitor Redis servers.

data/lib/redis_dashboard/views/stylesheets/base.scss

@@ -1,17 +0,0 @@
-html,
-body {
-  box-sizing: border-box;
-  font-size: 15px;
-  overflow-x: hidden;
-  width: 100%;
-}
-body {
-  background: $color-lighter;
-  color: $color-dark;
-  font-family: 'Menlo', monospace;
-  font-weight: 400;
-  letter-spacing: 0;
-  line-height: 24px;
-  padding:0;
-  margin:0;
-}

data/lib/redis_dashboard/views/stylesheets/colors.scss

@@ -1,6 +0,0 @@
-$color-redis: #d82c20;
-$color-redis-dark: #a41e11;
-$color-dark: #574f4e;
-$color-light: #f2f1f0;
-$color-lighter: #f7f6f6;
-$color-white: #fff;

data/lib/redis_dashboard/views/stylesheets/link.scss

@@ -1,20 +0,0 @@
-a {
-  color: $color-redis;
-  text-decoration: none;
-}
-a:focus,
-a:hover {
-    color: $color-redis-dark;
-}
-
-a svg {
-  width:15px;
-  height:15px;
-  fill: $color-redis;
-  position:
-  relative;
-  top: 3px;
-}
-a:hover svg {
-  fill: $color-redis-dark;
-}

data/lib/redis_dashboard/views/stylesheets/page.scss

@@ -1,69 +0,0 @@
-.page {
-  margin: 0px auto;
-  overflow-x: hidden;
-  max-width: 1480px;
-  padding: 0 24px;
-}
-
-.page-header {
-  display: flex;
-  flex-wrap: wrap;
-}
-.page-header a {
-  font-family: sans-serif;
-  font-size: .694rem;
-  font-weight: 400;
-  text-transform: uppercase;
-  letter-spacing: 2px;
-  padding: 0 12px;
-  background: $color-redis;
-  color: $color-white;
-  border-bottom: 1px solid $color-light;
-}
-.page-header a:hover {
-  background: $color-redis-dark;
-}
-.page-header a.active {
-  color: $color-redis;
-  background: $color-white;
-  font-weight: 700;
-}
-
-.page-title {
-  font-size: 1rem;
-  font-weight: 400;
-  margin: 0 auto 24px 0;
-  line-height: 48px;
-  padding: 0;
-  display: flex;
-  flex-wrap: wrap;
-  margin-right: auto;
-  box-shadow: 0 4px 12px 0px $color-light;
-}
-.page-title span {
-  display: inline-block;
-  background-color: $color-white;
-  padding: 0 12px;
-  border-bottom: 1px solid $color-light;
-}
-
-.page-menu {
-  display: flex;
-  flex-wrap: nowrap;
-  line-height: 48px;
-  margin-bottom: 24px;
-  box-shadow: 0 4px 12px 0px $color-light;
-}
-
-div.table {
-  width: 100%;
-  background: $color-white;
-  overflow-x: scroll;
-  margin-bottom: 24px;
-  box-shadow: 0 4px 12px 0px $color-light;
-}
-
-.page-footer {
-  margin-top: 24px;
-  font-size: .833rem;
-}

data/lib/redis_dashboard/views/stylesheets/server-card.scss

@@ -1,37 +0,0 @@
-.server-list {
-  display: flex;
-  flex-wrap: wrap;
-  margin: -24px 0 0 -24px;
-}
-.server-card {
-  background: $color-white;
-  padding: 0;
-  flex: 1 1 480px;
-  margin: 24px 0 0 24px;
-  box-shadow: 0 4px 12px 0px $color-light;
-}
-.server-card-title {
-  font-size: 1.2rem;
-  margin-right: auto;
-  padding: 24px;
-}
-.server-card-title a {
-  text-decoration: underline;
-}
-.server-card-content {
-  display: flex;
-  flex-wrap: nowrap;
-}
-.server-card-content > div {
-  margin:0;
-  padding: 0 24px 24px;
-  flex: 1;
-}
-.server-card-content .label {
-  font-family: sans-serif;
-  text-transform: uppercase;
-  font-size: .574rem;
-  letter-spacing: 2px;
-  font-weight: 400;
-  display: block;
-}

data/lib/redis_dashboard/views/stylesheets/table.scss

@@ -1,49 +0,0 @@
-
-// Table
-// ––––––––––––––––––––––––––––––––––––––––––––––––––
-
-table {
-  border-spacing: 0;
-  width: 100%;
-  overflow-x: scroll;
-}
-
-tr:hover {
-  background: $color-light;
-}
-thead tr:hover {
-  background: $color-white;
-}
-
-td,
-th {
-  border-bottom: 1px solid $color-light;
-  padding: 12px 12px 11px;
-  line-height: 24px;
-}
-
-th {
-  font-weight: 400;
-  font-family: sans-serif;
-  font-size: .694rem;
-  letter-spacing: 2px;
-  text-transform: uppercase;
-  text-align: center;
-}
-
-td.key {
-  text-transform: uppercase;
-  font-family: sans-serif;
-  font-weight: 400;
-  font-size: .694rem;
-  letter-spacing: 2px;
-}
-
-td.date {
-  white-space: nowrap;
-  text-align: right;
-}
-
-td.number {
-  text-align: right;
-}

data/lib/redis_dashboard/views/stylesheets/typography.scss

@@ -1,21 +0,0 @@
-b,
-strong {
-  font-weight: bold;
-}
-
-p {
-  margin-top: 0;
-}
-
-h1,
-h2 {
-  font-weight: 300;
-  letter-spacing: 0;
-  margin-bottom: 2.0rem;
-  margin-top: 0;
-}
-h2 {
-  font-size: 1.728rem;
-  font-weight: 700;
-  line-height: 2;
-}