beyond-rails 0.0.222 → 0.0.227

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9092f0bac590910c0f6c461a47857ad83cb7efacb67586997817cae359792141
-  data.tar.gz: 0ad899417aab8fc983e7757fbb10d92a0716b73b71336dd676a113409c88adb8
+  metadata.gz: 4240bb4020f2fa8d7a190f8026ba1bc9434e0a20ccc545156ff5935ad174f76c
+  data.tar.gz: b0eef0c93430d3955695451c4db43fb350dfbd02afe9bf16e1a49d5df3f543e0
 SHA512:
-  metadata.gz: 52d4d14acf31d6bd983bb790129edfb3be544f2d65614ec9c0939ec3935f74e132422529a9a6e4e1cc3da8075b76089c96168782c8a0feb005d8e35118aa4385
-  data.tar.gz: 0f1a43fb0eec229837bd6626baac37af0a6b6ccd9a5857475d9198610006df39782856c2cdfde45af9781a6fcbdc32cf935ab22ed105b2f07cc782d5b3d53e18
+  metadata.gz: b050adf27c9cf90bae213bd72144f227b2ff831c5c2b768380ee44473fa31f1b885032c66ff66c31874a78025a07f9f00238ced01ce861d68d644a2bd5f265a6
+  data.tar.gz: e763f9218b0ea16809f0ad13f6027b06758e26604789f85b44e54341a3ae88ff0027abc36b6a3edfb5f8d29c90794cd959bc809e820a5f4f907e8a3b1eab0f91

data/src/js/components/LineChart.js

@@ -83,6 +83,10 @@ export default class LineChart {
     this.bindPointMouseOver()
   }
 
+  get noData() {
+    return (this.xLabelRows.length === 0) && (this.yLabelRows.length === 0)
+  }
+
   get contentWidth() {
     return this.width - (this.xPadding * 2) - this.yLabelMargin -
       this.yLabelWidth - (this.xLabelWidth / 2)
@@ -130,6 +134,10 @@ export default class LineChart {
     return this.xAxisStart + this.contentWidth
   }
 
+  get xAxisMiddle() {
+    return (this.xAxisEnd - this.xAxisStart) / 2
+  }
+
   get xRatio() {
     const lineWidth = this.xAxisEnd - this.xAxisStart
     const xDelta = this.lastX - this.firstX
@@ -145,6 +153,10 @@ export default class LineChart {
     return this.yAxisStart - this.contentHeight
   }
 
+  get yAxisMiddle() {
+    return (this.yAxisStart - this.yAxisEnd) / 2
+  }
+
   get yRatio() {
     const lineHeight = this.yAxisStart - this.yAxisEnd
     const yDelta = Math.abs(this.lastY - this.firstY)
@@ -200,8 +212,17 @@ export default class LineChart {
     ctx.lineWidth = 2
 
     this.pointsArr.forEach((points, i) => {
+      const style = lineStyles[i] ? lineStyles[i] : '#000'
+
+      // only one point in a line
+      if (points.length === 1) {
+        const pos = pointPosMap.get(points[0])
+        this.fillCircle(ctx, pos.x, pos.y, 2, style)
+        return
+      }
+
       ctx.beginPath()
-      ctx.strokeStyle = lineStyles[i] ? lineStyles[i] : '#000'
+      ctx.strokeStyle = style
       points.forEach(p => {
         const pos = pointPosMap.get(p)
         ctx.lineTo(pos.x, pos.y)
@@ -271,10 +292,13 @@ export default class LineChart {
 
     ctx.strokeStyle = '#3c4257'
 
-    xLabelRows.forEach((row, i) => {
+    let x = this.xAxisMiddle
 
-      const x = xAxisStart + ((row.value - firstX) / xRatio)
+    xLabelRows.forEach((row, i) => {
 
+      if (xRatio !== 0) {
+        x = xAxisStart + ((row.value - firstX) / xRatio)
+      }
       ctx.beginPath()
       ctx.moveTo(x, scaleStart)
       ctx.lineTo(x, scaleEnd)
@@ -293,8 +317,12 @@ export default class LineChart {
     ctx.fillStyle = '#3c4257'
     ctx.textAlign = 'right'
 
+    let y = this.yAxisMiddle
+
     yLabelRows.forEach(row => {
-      const y = yAxisStart - ((row.value - firstY) / yRatio)
+      if (yRatio !== 0) {
+        y = yAxisStart - ((row.value - firstY) / yRatio)
+      }
       ctx.fillText(row.label, x, y - halfYLabelHeight)
     })
   }
@@ -445,8 +473,13 @@ export default class LineChart {
       this.setLabelHeights()
       this.setAxisData()
       this.updateLabelSizeForAutoStep()
+
+      if (this.noData) {
+        return this.raf(() => this.clear())
+      }
+
       this.setPointPos()
-      this.draw()
+      this.raf(() => this.draw())
     })
   }
 
@@ -498,6 +531,10 @@ export default class LineChart {
     this.setLabelHeights()
     this.setAxisData()
     this.updateLabelSizeForAutoStep()
+
+    if (this.noData) {
+      return this.raf(() => this.clear())
+    }
     this.setPointPos()
     this.raf(() => this.draw())
   }
@@ -505,10 +542,20 @@ export default class LineChart {
   setPointPos() {
     const { firstX, firstY, pointPosMap, xAxisStart, xRatio, yAxisStart, yRatio } = this
 
+    // edge case: only one point
+    let x = this.xAxisMiddle
+    let y = this.yAxisMiddle
+
     this.pointsArr.forEach((points, i) => {
       points.forEach(point => {
-        const x = xAxisStart + ((point.x - firstX) / xRatio)
-        const y = yAxisStart - ((point.y - firstY) / yRatio)
+
+        if (xRatio !== 0) {
+          x = xAxisStart + ((point.x - firstX) / xRatio)
+        }
+        if (yRatio !== 0) {
+          y = yAxisStart - ((point.y - firstY) / yRatio)
+        }
+
         const pos = { x, y }
         pointPosMap.set(point, pos)
       })

data/src/sass/_main.scss

@@ -131,6 +131,16 @@ $color-active: #5469d4;
   text-align: center !important;
 }
 
+.float-left {
+  float: left !important;
+}
+.float-right {
+  float: right !important;
+}
+.float-none {
+  float: none !important;
+}
+
 .sr-only {
   position: absolute;
   width: 1px;
@@ -143,6 +153,15 @@ $color-active: #5469d4;
   border: 0;
 }
 
+hr {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border-top: 1px solid #e3e8ee;
+  border-left: 0;
+  border-right: 0;
+  border-bottom: 0;
+}
+
 input[type=file], /* FF, IE7+, chrome (except button) */
 input[type=file]::-webkit-file-upload-button { /* chromes and blink button */
   cursor: pointer;

data/src/sass/components/_btn.scss

@@ -97,6 +97,11 @@
   @include ripple(48px, 0, 0);
 }
 
+.btn.btn-outline,
+a.btn.btn-outline {
+  color: $text-color;
+}
+
 .btn.btn-outline {
   background-color: #fff;
   font-size: 13px;
@@ -186,3 +191,18 @@ button.close {
     color: #fff;
   }
 }
+
+.btn-file {
+  position: relative;
+  input[type="file"] {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    opacity: 0;
+  }
+}

data/src/sass/components/_table.scss

@@ -4,6 +4,14 @@
   overflow-x: auto;
   -webkit-overflow-scrolling: touch;
 }
+
+%disabled-td {
+  cursor: not-allowed;
+  background-color: #ddd;
+  color: #333;
+  box-shadow: inset 0 -1px #c7c7c7;
+}
+
 .table {
   width: 100%;
   margin-bottom: 1rem;
@@ -51,6 +59,11 @@
     padding: 7px;
     box-shadow: inset 0 -1px #e3e8ee;
   }
+  tr.disabled {
+    > td {
+      @extend %disabled-td;
+    }
+  }
   tr {
     transition: .3s all;
   }
@@ -61,5 +74,8 @@
     tr:nth-child(even) td {
       background-color: #f7fafc;
     }
+    tr.disabled:nth-child(even) td {
+      @extend %disabled-td;
+    }
   }
 }

data/src/sass/layout/_col.scss

@@ -49,13 +49,12 @@
 }
 
 @for $i from 1 through length($breakpoints) {
-  $breakpoint: nth($breakpoints, $i);
   $size: nth($screen-sizes, $i);
   .col-#{$size} {
     @extend %col-basic;
   }
   @for $j from 1 through $col-total {
-    .col-#{$i},
+    .col-#{$j},
     .col-#{$size}-#{$j} {
       @extend %col-basic;
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.222
+  version: 0.0.227
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc