BoostIO · Sarah-Seo · Jan 4, 2017 · Jan 4, 2017 · Jan 6, 2017 · Jan 6, 2017
diff --git a/.babelrc b/.babelrc
@@ -43,9 +43,8 @@
         "react"
       ],
       "plugins": [
-        "react-hot-loader/babel",
-        "transform-class-properties",
-        "rewire"
+        "transform-es2015-modules-commonjs",
+        "transform-class-properties"
       ]
     }
   }

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "6"
diff --git a/app/lib/main.html b/app/lib/main.html
@@ -10,6 +10,9 @@
   <link rel="stylesheet" type="text/css" href="../../node_modules/codemirror/lib/codemirror.css">
   <link rel="stylesheet" type="text/css" href="../../node_modules/codemirror/addon/dialog/dialog.css">
   <style>
+    body {
+      font-family: Helvetica, Arial, sans-serif;
+    }
     #content {
       position: absolute;
       top: 0;
@@ -18,12 +21,47 @@
       bottom: 0;
       overflow: hidden;
     }
-    body {
-      font-family: Helvetica, Arial, sans-serif;
+    @keyframes pulse {
+      0% {
+        opacity: 0.6;
+      }
+      50% {
+        opacity: 0.9;
+      }
+      100% {
+        opacity: 0.6;
+      }
+    }
+    #loading {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 1000;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+      background-color: white;
+      -webkit-app-region: drag;
+    }
+    #loading img {
+      animation: pulse 1.5s ease-in-out infinite;
+    }
+    #loading p {
+      font-size: 24px;
+      color: gray;
+      animation: pulse 1.5s ease-in-out infinite;
+      font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
     }
   </style>
 </head>
 <body>
+<div id="loading">
+  <img width="300" src="../../resources/icon.svg" />
+  <p>Loading...</p>
+</div>
 <div id="content"></div>
 
 <!-- Codemirror stuff -->

diff --git a/app/lib/main.production.html b/app/lib/main.production.html
@@ -10,6 +10,9 @@
   <link rel="stylesheet" type="text/css" href="../../node_modules/codemirror/lib/codemirror.css">
   <link rel="stylesheet" type="text/css" href="../../node_modules/codemirror/addon/dialog/dialog.css">
   <style>
+    body {
+      font-family: Helvetica, Arial, sans-serif;
+    }
     #content {
       position: absolute;
       top: 0;
@@ -18,12 +21,47 @@
       bottom: 0;
       overflow: hidden;
     }
-    body {
-      font-family: Helvetica, Arial, sans-serif;
+    @keyframes pulse {
+      0% {
+        opacity: 0.6;
+      }
+      50% {
+        opacity: 0.9;
+      }
+      100% {
+        opacity: 0.6;
+      }
+    }
+    #loading {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 1000;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+      background-color: white;
+      -webkit-app-region: drag;
+    }
+    #loading img {
+      animation: pulse 1.5s ease-in-out infinite;
+    }
+    #loading p {
+      font-size: 24px;
+      color: gray;
+      animation: pulse 1.5s ease-in-out infinite;
+      font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
     }
   </style>
 </head>
 <body>
+<div id="loading">
+  <img width="300" src="../../resources/icon.svg" />
+  <p>Loading...</p>
+</div>
 <div id="content"></div>
 
 <!-- Codemirror stuff -->

diff --git a/app/lib/menuTemplate.js b/app/lib/menuTemplate.js
@@ -129,6 +129,24 @@ const template = [
       },
       {
         role: 'togglefullscreen'
+      },
+      {
+        label: 'Single Layout',
+        accelerator: 'CmdOrCtrl + 1',
+        click: e => {
+          if (global.windows.main) {
+            global.windows.main.webContents.send('set-single-layout')
+          }
+        }
+      },
+      {
+        label: 'Two Pane Layout',
+        accelerator: 'CmdOrCtrl + 2',
+        click: e => {
+          if (global.windows.main) {
+            global.windows.main.webContents.send('set-two-pane-layout')
+          }
+        }
       }
     ]
   },

diff --git a/docs/development/database.md b/docs/development/database.md
@@ -1,6 +1,12 @@
 # Database
 
-Inpad uses pouchDB as a storage and the pouchDB uses WebSQL as a default.
+Inpad uses pouchDB as a storage and the pouchDB uses IndexedDB as a default.
+
+## Apis
+
+- Create/Update apis can take partial data. (Default values will be applied to any missing attributes.)
+- Create/Update apis must return whole data and its id. (Redux store will use it without any further processing.)
+- Delete api should return id.
 
 ## Default Storage
 
@@ -27,7 +33,7 @@ type   | conventions
 -------|--------------------
 Note   | `note:$RANDOM_HASH$`
 Folder | `folder:$PATH_OF_FOLDER$`
-Tag    | `tag:$TAG$`
+Tag    | `tag:$TAG_NAME$`
 
 ### `$RANDOM_HASH$`
 
@@ -37,11 +43,13 @@ This is a string of 10 Random bytes. It can be issued easily by `main/lib/util.r
 
 ### `$PATH_OF_FOLDERS$`
 
-This string should be a valid path. When creating a folder, the app will convert it into a valid path if it is invalid.
+This string should be a valid path for Unix. `/` character will be used for seperating directory components.
+
+When creating a folder, the app will convert it into a valid path if it is invalid.
 
-### `$TAG$`
+### `$TAG_NAME$`
 
-Tag is a lowcased alphanumeric string. Spaces will be replaced with `_`.
+Any character can be used for tag name.
 
 ## Schemes
 

diff --git a/docs/development/keymap-and-commands.md b/docs/development/keymap-and-commands.md
@@ -22,6 +22,8 @@ macOS               | Windows/Linux        | Command via ipc or Action
 **Cmd - R**         | **Ctrl - R, F5**     | Refresh
 **Cmd - ,**         | **Ctrl - ,**         | `title:preferences`
 **Cmd - P**         | **Ctrl - P**         | `detail:print` (ipc `print`)
+**Cmd - 1**         | **Ctrl - 1**         | `detail:set-single-layout`
+**Cmd - 2**         | **Ctrl - 2**         | `detail:set-two-pane-layout`
 
 ## Main
 
@@ -66,6 +68,7 @@ Right     | Right         | `list:focus`
 Up        | Up            | `nav:up`
 Down      | Down          | `nav:down`
 D         | D             | `nav:delete`
+Tab       | Tab           | `nav:toggle-tab`
 
 ### Commands
 
@@ -112,9 +115,12 @@ Cmd - '  | Ctrl - '      | `detail:focus-tag-select`
 
 ### Commands
 
-Command                 | Action
-------------------------|----------------------------
-detail:focus-tag-select | Focus tag select
-detail:focus            | Focus Detail
-detail:find             | Start finding
-detail:print            | Print
+Command                    | Action
+---------------------------|----------------------------
+detail:focus-tag-select    | Focus tag select
+detail:focus               | Focus Detail
+detail:find                | Start finding
+detail:print               | Print
+detail:set-single-layout   | Set single layout
+detail:set-two-pane-layout | Set two pane layout
+detail:toggle-layout       | Toggle layout
diff --git a/gh-pages b/gh-pages
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "inpad",
   "productName": "Inpad",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A Polished Notes App with Github Flavored Markdown",
   "main": "app/index.js",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/Sarah-Seo/Inpad.git"
+    "type": "git",
+    "url": "https://github.com/Sarah-Seo/Inpad.git"
   },
   "scripts": {
     "start": "electron app/index.js",
@@ -18,8 +18,9 @@
     "shasum": "shasum -a 256 dist/mac/Inpad-$npm_package_version.dmg",
     "lint": "standard",
     "webpack": "NODE_ENV=development webpack-dev-server --config webpack.config.js",
-    "test:run": "NODE_ENV=test electron ./tools/webpack-test.js",
-    "test:serve": "NODE_ENV=test webpack-dev-server --config webpack.config.js",
+    "test": "NODE_ENV=test jest",
+    "test:watch": "NODE_ENV=test jest --watch",
+    "todo": "fixme -i 'compiled/**' -i 'dist/**' -i 'resources/**' -i 'node_modules/**'",
     "rebuild": "electron-rebuild"
   },
   "keywords": [
@@ -33,9 +34,10 @@
   "devDependencies": {
     "babel-core": "^6.18.0",
     "babel-eslint": "^7.1.1",
+    "babel-jest": "^18.0.0",
     "babel-loader": "^6.2.7",
-    "babel-plugin-rewire": "^1.0.0",
     "babel-plugin-transform-class-properties": "^6.19.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-react": "^6.16.0",
     "babel-preset-stage-2": "^6.18.0",
@@ -46,10 +48,13 @@
     "electron-devtools-installer": "^2.0.1",
     "electron-rebuild": "^1.3.0",
     "env-cmd": "^4.0.0",
+    "eslint-plugin-jest": "^1.0.2",
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "file-loader": "^0.9.0",
     "filenamify": "^1.2.1",
+    "fixme": "^0.4.2",
     "immutable": "^3.8.1",
+    "jest": "^18.1.0",
     "json-loader": "^0.5.4",
     "lodash": "^4.16.6",
     "moment": "^2.17.0",
@@ -88,7 +93,37 @@
     "katex": "^0.6.0"
   },
   "standard": {
-    "parser": "babel-eslint"
+    "parser": "babel-eslint",
+    "plugins": [
+      "jest"
+    ],
+    "envs": [
+      "jest"
+    ]
+  },
+  "jest": {
+    "setupFiles": [
+      "<rootDir>/specs/utils/setup.js"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/"
+    ],
+    "moduleFileExtensions": [
+      "js",
+      "jsx",
+      "json"
+    ],
+    "moduleDirectories": [
+      "node_modules"
+    ],
+    "moduleNameMapper": {
+      "^main(.*)$": "<rootDir>/src/main$1",
+      "^lib(.*)$": "<rootDir>/src/lib$1",
+      "^components(.*)$": "<rootDir>/src/components$1",
+      "^specs(.*)$": "<rootDir>/specs$1",
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/specs/__mocks__/fileMock.js",
+      "\\.(css|less)$": "<rootDir>/specs/__mocks__/styleMock.js"
+    }
   },
   "build": {
     "appId": "com.electron.Inpad",

diff --git a/resources/dmg.png b/resources/dmg.png
diff --git a/resources/dmg@2x.png b/resources/dmg@2x.png
diff --git a/resources/install.gif b/resources/install.gif