arxanas · dev-id · Jun 3, 2016 · Jun 3, 2016 · Jun 3, 2016 · Jun 3, 2016
diff --git a/.editorconfig b/.editorconfig
@@ -6,6 +6,6 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{js,css}]
+[*.{js,css,js.default}]
 indent_size = 2
 indent_style = space
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ data
 public/out
 public/lib
 
-config.js
+config.client.js
+config.server.js
diff --git a/Makefile b/Makefile
@@ -1,10 +1,12 @@
 .PHONY: all install clean cards score js
-all: install clean cards score js
+all: install cards score js
 
 node := ${CURDIR}/node_modules
 all_sets := ${CURDIR}/data/AllSets.json
 traceur := ${node}/.bin/traceur
-config := config.js
+
+client_config := config.client.js
+server_config := config.server.js
 
 ${traceur}: install
 
@@ -32,14 +34,16 @@ ${all_sets}:
 	curl -so ${all_sets} https://mtgjson.com/json/AllSets.json
 
 score:
-	-node src/make score #ignore errors
+	-node src/make score
 
-js: ${traceur} ${all_sets} ${config}
+js: ${traceur} ${all_sets} ${client_config}
 	${traceur} --out public/lib/app.js public/src/init.js
 
 # "order-only" prerequisite
-${config}: | ${config}.default
+${client_config}: | ${client_config}.default
+	cp $| $@
+${server_config}: | ${server_config}.default
 	cp $| $@
 
-run: js
+run: js ${server_config}
 	node run
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# drafts.ninja
+# drafts.ninja [![Stories in Ready](https://badge.waffle.io/arxanas/drafts.ninja.png?label=ready&title=Ready)](https://waffle.io/arxanas/drafts.ninja) [![Gitter chat](https://badges.gitter.im/arxanas/drafts.ninja.png)](https://gitter.im/arxanas/drafts.ninja)
 
 [drafts.ninja](http://drafts.ninja) is a fork of aeosynth's `draft` project. It
 supports all of the features of `draft` and more. Here are some of the

diff --git a/app.js b/app.js
@@ -1,4 +1,4 @@
-const CONFIG = require('./config')
+const CONFIG = require('./config.server')
 
 var http = require('http')
 var eio = require('engine.io')

diff --git a/config.client.js.default b/config.client.js.default
@@ -0,0 +1,20 @@
+let d = React.DOM
+
+export let STRINGS = {
+  BRANDING: {
+    SITE_NAME: ['drafts', 'ninja'],
+    DEFAULT_USERNAME: 'ninja',
+  },
+
+  PAGE_SECTIONS: {
+    MOTD: null, // message of the day; can be a React element
+
+    FOOTER: d.div({},
+      d.strong({}, 'drafts.ninja'),
+      ' is a fork of the ',
+      d.code({}, 'draft'),
+      ' project by aeosynth. Contributions welcome! ',
+      d.a({ href: 'https://github.com/arxanas/drafts.ninja' },
+        'https://github.com/arxanas/drafts.ninja')),
+  },
+}
diff --git a/config.js.default b/config.js.default
diff --git a/config.server.js.default b/config.server.js.default
@@ -0,0 +1,8 @@
+module.exports = {
+  PORT: 1337,
+  STRINGS: {
+    BRANDING: {
+      DEFAULT_USERNAME: 'ninja',
+    }
+  }
+}
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "node-fetch": "^1.0.3",
     "send": "^0.11.1",
     "traceur": "0.0.65",
-    "utils": "git://github.com/aeosynth/utils"
+    "utils": "git://github.com/arxanas/utils"
   },
   "devDependencies": {
     "normalize.css": "^3.0.1",

diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,6 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>drafts.ninja</title>
   <link rel="stylesheet" href="lib/normalize.css">
   <!-- https://github.com/driftyco/ionicons/issues/129 -->
   <link rel="stylesheet" href="http://code.ionicframework.com/ionicons/1.5.2/css/ionicons.min.css">

diff --git a/public/src/app.js b/public/src/app.js
@@ -1,5 +1,6 @@
 import _ from '../lib/utils'
 import EventEmitter from '../lib/ee'
+import {STRINGS} from './config'
 
 function message(msg) {
   let args = JSON.parse(msg)
@@ -11,7 +12,7 @@ let App = {
 
   state: {
     id: null,
-    name: 'ninja',
+    name: STRINGS.BRANDING.DEFAULT_USERNAME,
 
     numUsers: 0,
     numPlayers: 0,
@@ -35,7 +36,8 @@ let App = {
     packs: 3,
 
     bots: true,
-    timer: true,
+    useTimer: true,
+    timerLength: 40, // seconds
 
     beep: false,
     chat: true,

diff --git a/public/src/cards.js b/public/src/cards.js
@@ -93,8 +93,8 @@ let events = {
     App.send('readyToStart', e.target.checked)
   },
   start() {
-    let {bots, timer} = App.state
-    let options = [bots, timer]
+    let {bots, useTimer, timerLength} = App.state
+    let options = {bots, useTimer, timerLength}
     App.send('start', options)
   },
   pack(cards) {
@@ -390,6 +390,13 @@ function Key(groups, sort) {
   return o
 }
 
+function sortLandsBeforeNonLands(lhs, rhs) {
+  let isLand = x => x.type.toLowerCase().indexOf('land') !== -1
+  let lhsIsLand = isLand(lhs)
+  let rhsIsLand = isLand(rhs)
+  return rhsIsLand - lhsIsLand
+}
+
 export function getZone(zoneName) {
   let zone = Zones[zoneName]
 
@@ -401,7 +408,7 @@ export function getZone(zoneName) {
   let {sort} = App.state
   let groups = _.group(cards, sort)
   for (let key in groups)
-    _.sort(groups[key], 'color', 'cmc', 'name')
+    _.sort(groups[key], sortLandsBeforeNonLands, 'color', 'cmc', 'name')
 
   groups = Key(groups, sort)
 

diff --git a/public/src/components/deck-settings.js b/public/src/components/deck-settings.js
@@ -12,7 +12,7 @@ function Lands() {
     let inputs = BASICS.map(cardName =>
       d.td({},
         d.input({
-          className: 'num-lands',
+          className: 'number',
           min: 0,
           onChange: App._emit('land', zoneName, cardName),
           type: 'number',
@@ -27,7 +27,7 @@ function Lands() {
   let suggest = d.tr({},
     d.td({}, 'deck size'),
     d.td({}, d.input({
-      className: 'num-lands',
+      className: 'number',
       min: 0,
       onChange: App._emit('deckSize'),
       type: 'number',

diff --git a/public/src/components/game.js b/public/src/components/game.js
@@ -69,7 +69,22 @@ export default React.createClass({
     let startControls = d.div({},
       d.div({}, `Format: ${App.state.format}`),
       LBox('bots', 'bots'),
-      LBox('timer', 'timer'),
+      d.div({},
+        d.label({},
+          d.input({
+            type: 'checkbox',
+            checkedLink: App.link('useTimer'),
+          }), ' use '),
+        d.label({},
+          d.input({
+            className: 'number',
+            disabled: !App.state.useTimer,
+            min: 0,
+            max: 60,
+            step: 5,
+            type: 'number',
+            valueLink: App.link('timerLength'),
+          }), '-second timer')),
       d.div({}, startButton, readyReminderText))
 
     return d.fieldset({ className: 'start-controls fieldset' },

diff --git a/public/src/components/grid.js b/public/src/components/grid.js
@@ -1,6 +1,7 @@
 import _ from '../../lib/utils'
 import App from '../app'
 import {getZone} from '../cards'
+import {Spaced} from './spacer'
 let d = React.DOM
 
 export default React.createClass({
@@ -30,9 +31,8 @@ function zone(zoneName) {
       })))
 
   return d.div({ className: 'zone' },
-    d.h1({},
+    d.h1({}, Spaced(
       d.span({}, zoneName),
-      d.span({ className: 'spacer-dot' }),
-      d.span({}, `${cards.length} ${cards.length === 1 ? 'card' : 'cards' }`)),
+      d.span({}, `${cards.length} ${cards.length === 1 ? 'card' : 'cards' }`))),
     items)
 }
diff --git a/public/src/components/lobby.js b/public/src/components/lobby.js
@@ -1,8 +1,10 @@
 import _ from '../../lib/utils'
+import {STRINGS} from '../config'
 import App from '../app'
 import data from '../data'
 import Chat from './chat'
 import {RBox} from './checkbox'
+import {Spaced} from './spacer'
 let d = React.DOM
 
 export default React.createClass({
@@ -13,32 +15,29 @@ export default React.createClass({
     App.send('join', 'lobby')
   },
   render() {
+    document.title = STRINGS.BRANDING.SITE_NAME.join('.')
+
     return d.div({ className: 'container' },
       d.div({ className: 'lobby' },
         d.header({},
           d.h1({ className: 'lobby-header' },
-            d.span({}, 'drafts'),
-            d.span({ className: 'spacer-dot' }),
-            d.span({}, 'ninja'))),
-        d.p({}, `${App.state.numUsers}
-                 ${App.state.numUsers === 1 ? 'user' : 'users'}
-                 connected;
-                 ${App.state.numPlayers}
-                 ${App.state.numPlayers === 1 ? 'player' : 'players'}
-                 playing
-                 ${App.state.numActiveGames}
-                 ${App.state.numActiveGames === 1 ? 'game' : 'games'}`),
+            Spaced(...STRINGS.BRANDING.SITE_NAME))),
+
+        d.p({},
+          Spaced(
+            `${App.state.numUsers}
+            ${App.state.numUsers === 1 ? 'user' : 'users'}
+            connected`,
+            `${App.state.numPlayers}
+            ${App.state.numPlayers === 1 ? 'player' : 'players'}
+            playing
+            ${App.state.numActiveGames}
+            ${App.state.numActiveGames === 1 ? 'game' : 'games'}`)),
         d.p({ className: 'error' }, App.err),
         Create(),
         Join(),
         Motd(),
-        d.div({},
-          d.strong({}, 'drafts.ninja'),
-          ' is a fork of the ',
-          d.code({}, 'draft'),
-          ' project by aeosynth. Contributions welcome! ',
-          d.a({ href: 'https://github.com/arxanas/drafts.ninja' },
-            'https://github.com/arxanas/drafts.ninja'))),
+        STRINGS.PAGE_SECTIONS.FOOTER),
       Chat())
   }
 })
@@ -92,10 +91,11 @@ function content() {
 }
 
 function Motd() {
-  if (App.state.motd)
+  let motd = STRINGS.PAGE_SECTIONS.MOTD
+  if (motd)
     return d.fieldset({ className: 'fieldset' },
       d.legend({ className: 'legend' }, 'News'),
-      d.div({ dangerouslySetInnerHTML: { '__html': App.state.motd } }))
+      d.div({}, motd))
 }
 
 function Create() {

diff --git a/public/src/components/spacer.js b/public/src/components/spacer.js
@@ -0,0 +1,11 @@
+let d = React.DOM
+
+export function Spaced(...elements) {
+  let parts = []
+  for (let part of elements) {
+    parts.push(d.span({}, part))
+    parts.push(d.span({ className: 'spacer-dot' }))
+  }
+  parts.splice(-1, 1)
+  return parts
+}
diff --git a/public/src/config.js b/public/src/config.js
@@ -0,0 +1 @@
+../../config.client.js
diff --git a/public/src/data.js b/public/src/data.js
@@ -94,6 +94,7 @@ export default {
     "Limited Edition Alpha": "LEA"
   },
   other: {
+    "Eternal Masters": "EMA",
     "Magic Origins": "ORI",
     "Modern Masters 2015": "MM2",
     "Tempest Remastered": "TPR",

diff --git a/public/style.css b/public/style.css
@@ -109,6 +109,10 @@ input[type=button]:disabled:active, button:disabled:active {
   box-shadow: 0 0 1px 0 black inset;
 }
 
+.number {
+  width: 50px;
+}
+
 /** Container of inputs that share a border. **/
 
 .connected-container, .connected-column {
@@ -159,7 +163,7 @@ input[type=button]:disabled:active, button:disabled:active {
 .spacer-dot:after {
   content: "\00b7";
   display: inline-block;
-  width: 25px;
+  width: 0.75em;
   text-align: center;
 }
 
@@ -396,10 +400,6 @@ input[type=button]:disabled:active, button:disabled:active {
   flex-shrink: 0;
 }
 
-.num-lands {
-  width: 50px;
-}
-
 .deck-settings tr:first-of-type {
   text-align: center;
 }