diff --git a/build.sc b/build.sc index 38731d7..0cadc3e 100644 --- a/build.sc +++ b/build.sc @@ -91,6 +91,19 @@ object cells extends Module { .map { PathRef(_) } } + def css = + T.sources { + os.walk(millSourcePath / "css") + .filter { _.ext == "css" } + .map { PathRef(_) } + } + + def fonts = + T.sources { + os.walk(millSourcePath / "fonts") + .map { PathRef(_) } + } + } def resources = @@ -110,13 +123,15 @@ object cells extends Module { ) os.write( - target / "app" / "cells.css", + target / "app" / "css" / "cells.css", ui.compiledSass(), createFolders = true ) val assets = - ui.html().map { x => (x.path -> os.rel / x.path.last) } + ui.html().map { x => (x.path -> os.rel / x.path.last) }++ + ui.css().map { x => (x.path -> os.rel / "css" / x.path.last) }++ + ui.fonts().map { x => (x.path -> os.rel / "fonts" / x.path.last) } for((asset, assetTarget) <- assets){ os.copy.over( diff --git a/cells/server/src/net/okennedy/cells/CellsServer.scala b/cells/server/src/net/okennedy/cells/CellsServer.scala index 9b84100..7d0896e 100644 --- a/cells/server/src/net/okennedy/cells/CellsServer.scala +++ b/cells/server/src/net/okennedy/cells/CellsServer.scala @@ -7,6 +7,8 @@ import net.okennedy.cells.WebsocketConnection object CellsServer extends cask.MainRoutes { + override def port: Int = 4444 + var layout = new state.Canvas() layout.addTable(rows = 5, cols = 3) @@ -31,10 +33,6 @@ object CellsServer extends cask.MainRoutes def app(request: cask.Request) = serveResource("app/cells.js", "Content-Type" -> "application/javascript") - @cask.get("/cells.css") - def css(request: cask.Request) = - serveResource("app/cells.css", "Content-Type" -> "text/css") - @cask.get("/out.js.map") def appMap(request: cask.Request) = serveResource("app/out.js.map", "Content-Type" -> "application/javascript") @@ -49,8 +47,15 @@ object CellsServer extends cask.MainRoutes } } - @cask.staticResources("/app") - def staticResourceRoutes() = "app" + @cask.staticResources("/css", + headers = Seq("Content-Type" -> "text/css") + ) + def cssResourceRoutes() = "app/css" + + @cask.staticResources("/fonts", + // headers = Seq("Content-Type" -> "text/css") + ) + def fontResourceRoutes() = "app/fonts" initialize() } \ No newline at end of file diff --git a/cells/server/src/net/okennedy/cells/WebsocketConnection.scala b/cells/server/src/net/okennedy/cells/WebsocketConnection.scala index eb1a5e2..8f6c96d 100644 --- a/cells/server/src/net/okennedy/cells/WebsocketConnection.scala +++ b/cells/server/src/net/okennedy/cells/WebsocketConnection.scala @@ -13,6 +13,8 @@ class WebsocketConnection(val id: Int, channel: WsChannelActor) { event match { case Ws.Text(data) => + + println(s"ZZZ: $data") Json.parse(data).as[WebsocketRequest] match { case WebsocketHello(_) => for(table <- CellsServer.layout.tables.values) diff --git a/cells/server/src/net/okennedy/cells/state/Table.scala b/cells/server/src/net/okennedy/cells/state/Table.scala index 17bd130..5dc83bb 100644 --- a/cells/server/src/net/okennedy/cells/state/Table.scala +++ b/cells/server/src/net/okennedy/cells/state/Table.scala @@ -5,10 +5,8 @@ import net.okennedy.cells.Identifier import net.okennedy.cells.serialized import net.okennedy.cells.TableRequest import net.okennedy.cells.RequestSetTablePosition -import net.okennedy.cells.RequestAppendColumn -import net.okennedy.cells.RequestAppendRow -import net.okennedy.cells.RequestUpdateColumn -import net.okennedy.cells.RequestUpdateRow +import net.okennedy.cells.RequestUpdateColumns +import net.okennedy.cells.RequestUpdateRows import net.okennedy.cells.SetTablePosition import net.okennedy.cells.WebsocketConnection import net.okennedy.cells.serialized.ColSpec @@ -55,48 +53,48 @@ class Table(val id: Identifier) return id } + def updateColumns(op: SeqOp[ColSpec]): Unit = + { + val opWithValidId = + op match { + case SeqInsert(_, _) => op.map { _.copy(id = genSafeColId()) } + case SeqReplace(pos, _) => op.map { _.copy(id = columns(pos).id) } + case SeqDelete(_) => op + } + println(s"Update: $op") + opWithValidId.bufferApply(columns) + WebsocketConnection.broadcast( + UpdateTableColumns(id, opWithValidId) + ) + } + def addColumn(width: Int = 100): Unit = { - val col = ColSpec( - id = genSafeColId(), - width = width - ) - columns.append(col) + updateColumns(SeqInsert(columns.length, + ColSpec(id = null, width = width) + )) + } + + def updateRows(op: SeqOp[RowSpec]): Unit = + { + val opWithValidId = + op match { + case SeqInsert(_, _) => op.map { _.copy(id = genSafeRowId()) } + case SeqReplace(pos, _) => op.map { _.copy(id = rows(pos).id) } + case SeqDelete(_) => op + } + + opWithValidId.bufferApply(rows) WebsocketConnection.broadcast( - UpdateTableColumns(id, SeqInsert(columns.size-1, col)) + UpdateTableRows(id, opWithValidId) ) } def addRow(height: Int = 30): Unit = { - val row = RowSpec( - id = genSafeColId(), - height = height - ) - rows.append(row) - WebsocketConnection.broadcast( - UpdateTableRows(id, SeqInsert(rows.size-1, row)) - ) - } - - def updateColumn(spec: ColSpec): Unit = - { - val idx = columns.indexWhere { _.id == spec.id } - if(idx < 0){ return } - columns.update(idx, spec) - WebsocketConnection.broadcast( - UpdateTableColumns(id, SeqReplace(idx, spec)) - ) - } - - def updateRow(spec: RowSpec): Unit = - { - val idx = rows.indexWhere { _.id == spec.id } - if(idx < 0){ return } - rows.update(idx, spec) - WebsocketConnection.broadcast( - UpdateTableRows(id, SeqReplace(idx, spec)) - ) + updateRows(SeqInsert(rows.length, + RowSpec(id = null, height = height) + )) } def setPosition(x: Int, y: Int): Unit = @@ -109,12 +107,11 @@ class Table(val id: Identifier) def update(op: TableRequest): Unit = { + println(s"Table update: $op") op match { case RequestSetTablePosition(_, x, y) => setPosition(x, y) - case RequestAppendColumn(_) => addColumn() - case RequestAppendRow(_) => addRow() - case RequestUpdateColumn(_, spec) => updateColumn(spec) - case RequestUpdateRow(_, spec) => updateRow(spec) + case RequestUpdateColumns(_, cop) => updateColumns(cop) + case RequestUpdateRows(_, rop) => updateRows(rop) } } diff --git a/cells/shared/src/net/okennedy/cells/SeqOp.scala b/cells/shared/src/net/okennedy/cells/SeqOp.scala index 5c037f9..1dd8d56 100644 --- a/cells/shared/src/net/okennedy/cells/SeqOp.scala +++ b/cells/shared/src/net/okennedy/cells/SeqOp.scala @@ -1,5 +1,6 @@ package net.okennedy.cells +import scala.collection.mutable import play.api.libs.json.Json import play.api.libs.json.Format import play.api.libs.json.JsResult @@ -12,6 +13,7 @@ sealed trait SeqOp[T] { def apply(seq: Seq[T]): Seq[T] def map[B](op: T => B): SeqOp[B] + def bufferApply(seq: mutable.Buffer[T]): Unit } @@ -23,6 +25,8 @@ case class SeqInsert[T](position: Int, value: T) extends SeqOp[T] (before :+ value) ++ after } def map[B](op: T => B): SeqOp[B] = SeqInsert[B](position, op(value)) + def bufferApply(seq: mutable.Buffer[T]): Unit = + seq.insert(position, value) } case class SeqDelete[T](position: Int) extends SeqOp[T] { @@ -32,6 +36,8 @@ case class SeqDelete[T](position: Int) extends SeqOp[T] before ++ after.drop(1) } def map[B](op: T => B): SeqOp[B] = SeqDelete(position) + def bufferApply(seq: mutable.Buffer[T]): Unit = + seq.remove(position) } case class SeqReplace[T](position: Int, value: T) extends SeqOp[T] { @@ -41,6 +47,8 @@ case class SeqReplace[T](position: Int, value: T) extends SeqOp[T] (before :+ value) ++ after.drop(1) } def map[B](op: T => B): SeqOp[B] = SeqReplace[B](position, op(value)) + def bufferApply(seq: mutable.Buffer[T]): Unit = + seq(position) = value } object SeqOp diff --git a/cells/shared/src/net/okennedy/cells/WebsocketRequest.scala b/cells/shared/src/net/okennedy/cells/WebsocketRequest.scala index a5e2ee3..426632d 100644 --- a/cells/shared/src/net/okennedy/cells/WebsocketRequest.scala +++ b/cells/shared/src/net/okennedy/cells/WebsocketRequest.scala @@ -16,19 +16,15 @@ sealed trait TableRequest extends CanvasRequest } case class RequestSetTablePosition(table: Identifier, x: Int, y: Int) extends TableRequest -case class RequestAppendColumn(table: Identifier) extends TableRequest -case class RequestUpdateColumn(table: Identifier, spec: serialized.ColSpec) extends TableRequest -case class RequestAppendRow(table: Identifier) extends TableRequest -case class RequestUpdateRow(table: Identifier, spec: serialized.RowSpec) extends TableRequest +case class RequestUpdateColumns(table: Identifier, op: SeqOp[serialized.ColSpec]) extends TableRequest +case class RequestUpdateRows(table: Identifier, op: SeqOp[serialized.RowSpec]) extends TableRequest object WebsocketRequest { implicit val WebsocketHelloFormat: Format[WebsocketHello] = Json.format implicit val RequestAddTableFormat: Format[RequestAddTable] = Json.format implicit val RequestSetTablePositionFormat: Format[RequestSetTablePosition] = Json.format - implicit val RequestAppendColumnFormat: Format[RequestAppendColumn] = Json.format - implicit val RequestUpdateColumnFormat: Format[RequestUpdateColumn] = Json.format - implicit val RequestAppendRowFormat: Format[RequestAppendRow] = Json.format - implicit val RequestUpdateRowFormat: Format[RequestUpdateRow] = Json.format + implicit val RequestUpdateColumnsFormat: Format[RequestUpdateColumns] = Json.format + implicit val RequestUpdateRowsFormat: Format[RequestUpdateRows] = Json.format implicit val WebsocketRequestFormat: Format[WebsocketRequest] = Json.format } \ No newline at end of file diff --git a/cells/ui/css/cells.scss b/cells/ui/css/cells.scss index b5dcb91..aa53eeb 100644 --- a/cells/ui/css/cells.scss +++ b/cells/ui/css/cells.scss @@ -117,6 +117,44 @@ body margin-top: -5px; cursor: row-resize; } + + .addRemoveColumnWidget + { + $addRemoveColumnWidgetOffset: 16px; + position: absolute; + right: -1px-$addRemoveColumnWidgetOffset; + top: 0px; + width: $addRemoveColumnWidgetOffset; + height: 20px; + background-color: #eee; + text-align: center; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + cursor: ew-resize; + visibility: hidden; + } + + .addRemoveRowWidget + { + $addRemoveRowWidgetOffset: 16px; + position: absolute; + left: 0px; + bottom: -1px-$addRemoveRowWidgetOffset; + height: $addRemoveRowWidgetOffset; + width: 20px; + background-color: #eee; + text-align: center; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + cursor: ns-resize; + visibility: hidden; + } + + &:hover + { + .addRemoveColumnWidget { visibility: visible; } + .addRemoveRowWidget { visibility: visible; } + } } .widgets diff --git a/cells/ui/css/font-awesome.min.css b/cells/ui/css/font-awesome.min.css new file mode 100644 index 0000000..540440c --- /dev/null +++ b/cells/ui/css/font-awesome.min.css @@ -0,0 +1,4 @@ +/*! + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} diff --git a/cells/ui/fonts/fontawesome-webfont.eot b/cells/ui/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..e9f60ca Binary files /dev/null and b/cells/ui/fonts/fontawesome-webfont.eot differ diff --git a/cells/ui/fonts/fontawesome-webfont.svg b/cells/ui/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000..855c845 --- /dev/null +++ b/cells/ui/fonts/fontawesome-webfont.svg @@ -0,0 +1,2671 @@ + + + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cells/ui/fonts/fontawesome-webfont.ttf b/cells/ui/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/cells/ui/fonts/fontawesome-webfont.ttf differ diff --git a/cells/ui/fonts/fontawesome-webfont.woff b/cells/ui/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..400014a Binary files /dev/null and b/cells/ui/fonts/fontawesome-webfont.woff differ diff --git a/cells/ui/fonts/fontawesome-webfont.woff2 b/cells/ui/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000..4d13fc6 Binary files /dev/null and b/cells/ui/fonts/fontawesome-webfont.woff2 differ diff --git a/cells/ui/html/index.html b/cells/ui/html/index.html index 3a5159e..811e73d 100644 --- a/cells/ui/html/index.html +++ b/cells/ui/html/index.html @@ -4,7 +4,8 @@ Cells - + + diff --git a/cells/ui/src/net/okennedy/cells/CellsUI.scala b/cells/ui/src/net/okennedy/cells/CellsUI.scala index 52ce758..8f4a96e 100644 --- a/cells/ui/src/net/okennedy/cells/CellsUI.scala +++ b/cells/ui/src/net/okennedy/cells/CellsUI.scala @@ -14,7 +14,7 @@ object CellsUI @JSExport("run") def run(): Unit = { - val conn = new network.Connection("ws://localhost:8080/ws") + val conn = new network.Connection("ws://localhost:4444/ws") dom.window.onload = { (evt: dom.Event) => val container: dom.Element = diff --git a/cells/ui/src/net/okennedy/cells/sheet/Constants.scala b/cells/ui/src/net/okennedy/cells/sheet/Constants.scala index e7bedfe..08b01f3 100644 --- a/cells/ui/src/net/okennedy/cells/sheet/Constants.scala +++ b/cells/ui/src/net/okennedy/cells/sheet/Constants.scala @@ -5,4 +5,10 @@ object Constants val GUTTER_HEIGHT = 20 val GUTTER_WIDTH = 30 val BORDER = 1 + + val DEFAULT_CELL_WIDTH = 100 + val DEFAULT_CELL_HEIGHT = 30 + + val NULL_UUID = + java.util.UUID(0, 0) } \ No newline at end of file diff --git a/cells/ui/src/net/okennedy/cells/sheet/Table.scala b/cells/ui/src/net/okennedy/cells/sheet/Table.scala index 64a28da..3095f75 100644 --- a/cells/ui/src/net/okennedy/cells/sheet/Table.scala +++ b/cells/ui/src/net/okennedy/cells/sheet/Table.scala @@ -20,8 +20,14 @@ import net.okennedy.cells.network.Connection import net.okennedy.cells.RequestSetTablePosition import net.okennedy.cells.UpdateTableColumns import net.okennedy.cells.UpdateTableRows -import net.okennedy.cells.RequestUpdateRow -import net.okennedy.cells.RequestUpdateColumn +import net.okennedy.cells.RequestUpdateRows +import net.okennedy.cells.RequestUpdateColumns +import net.okennedy.cells.widgets.Icon +import scala.collection.Searching.Found +import scala.collection.Searching.InsertionPoint +import net.okennedy.cells.SeqReplace +import net.okennedy.cells.SeqInsert +import net.okennedy.cells.SeqDelete class Table(val id: Identifier, connection: Connection) { @@ -50,8 +56,10 @@ class Table(val id: Identifier, connection: Connection) x.set(newX); y.set(newY) ) case UpdateTableColumns(_, update) => + println(s"ColUpdate??? : $update") columns.set(update(columns.now())) case UpdateTableRows(_, update) => + println(s"RowUpdate??? : $update") rows.set(update(rows.now())) } } @@ -106,6 +114,43 @@ class Table(val id: Identifier, connection: Connection) rows.signal.map { _.foldLeft(0)( (h, row) => h + row.height) } .observe + def snapIndex(snaps: Seq[Int], excessStep: Int, value: Int): Int = + { + // println(s"Snap $value") + if(snaps.size > 0 && value < snaps.last){ + snaps.search(value) match { + case Found(foundIndex) => + // println(s"Found: $foundIndex"); + foundIndex + case InsertionPoint(insertionPoint) => + if(insertionPoint == 0) { + // println(s"Insert @ start"); + 0 + } else if(insertionPoint >= snaps.length) { + // println(s"Insert @ end"); + snaps.length - 1 + } else { + val lowDiff = value - snaps(insertionPoint - 1) + val highDiff = snaps(insertionPoint) - value + // println(s"Insert @ [${insertionPoint-1}, $insertionPoint] : $lowDiff <-> $highDiff"); + if(lowDiff > highDiff){ insertionPoint } + else { insertionPoint-1 } + } + } + } else { + val excess = value - snaps.lastOption.getOrElse(0) + (excessStep / 2) + // println(s"Over with excess: $excess") + (snaps.length - 1) + (excess / excessStep).toInt + } + } + + def snapTo(snaps: Seq[Int], excessStep: Int, value: Int): Int = + { + val idx = snapIndex(snaps, excessStep, value) + if(idx < snaps.length){ snaps(idx) } + else { snaps.lastOption.getOrElse(0) + excessStep * (idx - (snaps.length -1)) } + } + def root = div( className("dataTable"), @@ -228,8 +273,8 @@ class Table(val id: Identifier, connection: Connection) // Display the resizing bars - Up<->Down children <-- - rowGutters.map { _.map { - case (rowKey, rowStream) => + rowGutters.map { _.zipWithIndex.map { + case ((rowKey, rowStream), rowIdx) => div( className("rowResizeBar"), styleAttr <-- @@ -260,10 +305,13 @@ class Table(val id: Identifier, connection: Connection) ) { newHeight => println(s"Drag $rowKey @ ($pos, ${pos+height}) -> $newHeight") connection.send( - RequestUpdateRow( + RequestUpdateRows( id, - rows.now().find { _.id == rowKey }.get - .copy( height = newHeight ) + SeqReplace( + rowIdx, + rows.now().find { _.id == rowKey }.get + .copy( height = newHeight ) + ) ) ) } @@ -276,8 +324,8 @@ class Table(val id: Identifier, connection: Connection) // Display the resizing bars - Left<->Right children <-- - columnGutters.map { _.map { - case (colKey, colStream) => + columnGutters.map { _.zipWithIndex.map { + case ((colKey, colStream), colIdx) => div( className("columnResizeBar"), styleAttr <-- @@ -308,10 +356,13 @@ class Table(val id: Identifier, connection: Connection) ) { newWidth => println(s"Drag $colKey @ ($pos, ${pos+width}) -> $newWidth") connection.send( - RequestUpdateColumn( + RequestUpdateColumns( id, - columns.now().find { _.id == colKey }.get - .copy( width = newWidth ) + SeqReplace( + colIdx, + columns.now().find { _.id == colKey }.get + .copy( width = newWidth ) + ) ) ) } @@ -319,6 +370,132 @@ class Table(val id: Identifier, connection: Connection) evt.stopPropagation() } ) - } } + } }, + + // Display the add/remove column widget + + div( + className("addRemoveColumnWidget"), + Icon("caret-right"), + onMouseDown --> { + (evt) => + if(evt.button == 0){ + val snaps = + columns.now() + .foldLeft( Seq[Int]() ){ + (accum, col) => + accum :+ (accum.lastOption.getOrElse(0) + col.width ) + } + // println(s"Snaps: ${snaps.mkString(", ")}") + DragFrame.snapWidth( + x.now()+Constants.GUTTER_WIDTH, + y.now(), + width.now(), + height.now()+Constants.GUTTER_HEIGHT, + evt + )(snapTo(snaps, Constants.DEFAULT_CELL_WIDTH, _)) { snap => + val oldColCount = columns.now().length + val newColCount = snapIndex(snaps, Constants.DEFAULT_CELL_WIDTH, snap) + 1 + + var i = 0 + if(oldColCount < newColCount) + { + for(i <- oldColCount until newColCount) + { + println(s"Adding column $i") + connection.send( + RequestUpdateColumns( + id, + SeqInsert( + i, + serialized.ColSpec( + id = Constants.NULL_UUID, + width = Constants.DEFAULT_CELL_WIDTH + ) + ) + ) + ) + } + } else if(oldColCount > newColCount) + { + for(i <- (oldColCount-1) to newColCount by -1) + { + println(s"Removing column $i") + connection.send( + RequestUpdateColumns( + id, + SeqDelete(i) + ) + ) + } + } + } + + evt.stopPropagation() + } + } + ), + + div( + className("addRemoveRowWidget"), + Icon("caret-down"), + onMouseDown --> { + (evt) => + if(evt.button == 0){ + val snaps = + rows.now() + .foldLeft( Seq[Int]() ){ + (accum, row) => + accum :+ (accum.lastOption.getOrElse(0) + row.height ) + } + // println(s"Snaps: ${snaps.mkString(", ")}") + DragFrame.snapHeight( + x.now(), + y.now()+Constants.GUTTER_HEIGHT, + width.now()+Constants.GUTTER_WIDTH, + height.now(), + evt + )(snapTo(snaps, Constants.DEFAULT_CELL_HEIGHT, _)) { snap => + val oldRowCount = rows.now().length + val newRowCount = snapIndex(snaps, Constants.DEFAULT_CELL_HEIGHT, snap) + 1 + + var i = 0 + if(oldRowCount < newRowCount) + { + for(i <- oldRowCount until newRowCount) + { + println(s"Adding row $i") + connection.send( + RequestUpdateRows( + id, + SeqInsert( + i, + serialized.RowSpec( + id = Constants.NULL_UUID, + height = Constants.DEFAULT_CELL_HEIGHT + ) + ) + ) + ) + } + } else if(oldRowCount > newRowCount) + { + for(i <- (oldRowCount-1) to newRowCount by -1) + { + println(s"Removing row $i") + connection.send( + RequestUpdateRows( + id, + SeqDelete(i) + ) + ) + } + } + } + + evt.stopPropagation() + } + } + ) ) } \ No newline at end of file diff --git a/cells/ui/src/net/okennedy/cells/widgets/DragFrame.scala b/cells/ui/src/net/okennedy/cells/widgets/DragFrame.scala index 0321119..c362689 100644 --- a/cells/ui/src/net/okennedy/cells/widgets/DragFrame.scala +++ b/cells/ui/src/net/okennedy/cells/widgets/DragFrame.scala @@ -17,12 +17,24 @@ object DragFrame Widgets.register(frame) } + def snapWidth(x: Int, y: Int, width: Int, height: Int, evt: org.scalajs.dom.MouseEvent)(doSnap: Int => Int)(callback: (Int) => Unit) = + { + val frame = new Width(x, y, width, height, evt.pageX, evt.pageY, callback) { override def snap(x: Int) = doSnap(x+width)-width } + Widgets.register(frame) + } + def height(x: Int, y: Int, width: Int, height: Int, evt: org.scalajs.dom.MouseEvent)(callback: (Int) => Unit) = { val frame = new Height(x, y, width, height, evt.pageX, evt.pageY, callback) Widgets.register(frame) } + def snapHeight(x: Int, y: Int, width: Int, height: Int, evt: org.scalajs.dom.MouseEvent)(doSnap: Int => Int)(callback: (Int) => Unit) = + { + val frame = new Height(x, y, width, height, evt.pageX, evt.pageY, callback) { override def snap(x: Int) = doSnap(x+height)-height } + Widgets.register(frame) + } + class Position(initX: Int, initY: Int, width: Int, height: Int, cursorX: Double, cursorY: Double, callback: (Int, Int) => Unit) extends Widget { @@ -55,6 +67,8 @@ object DragFrame { val curr = Var[Int](initial = width) + def snap(v: Int): Int = v + val root = div( className("dragFrame"), styleAttr <-- @@ -69,7 +83,7 @@ object DragFrame }, documentEvents.onMouseMove --> { (evt) => - curr.set( (width) + (evt.pageX - cursorX).toInt ) + curr.set( (width) + snap( (evt.pageX - cursorX).toInt ) ) } ) } @@ -79,6 +93,8 @@ object DragFrame { val curr = Var[Int](initial = height) + def snap(v: Int): Int = v + val root = div( className("dragFrame"), styleAttr <-- @@ -93,7 +109,7 @@ object DragFrame }, documentEvents.onMouseMove --> { (evt) => - curr.set( (height) + (evt.pageY - cursorY).toInt ) + curr.set( (height) + snap( (evt.pageY - cursorY).toInt ) ) } ) } diff --git a/cells/ui/src/net/okennedy/cells/widgets/Icon.scala b/cells/ui/src/net/okennedy/cells/widgets/Icon.scala new file mode 100644 index 0000000..f9a50de --- /dev/null +++ b/cells/ui/src/net/okennedy/cells/widgets/Icon.scala @@ -0,0 +1,14 @@ +package net.okennedy.cells.widgets + +import org.scalajs.dom +import com.raquo.laminar.api.L._ +import com.raquo.laminar.nodes.ReactiveHtmlElement + +object Icon +{ + def apply(name: String): ReactiveHtmlElement[dom.html.Element]= + i( + className(s"fa fa-${name}"), + aria.hidden(true) + ) +}