Merge pull request #22 from tatomyr/v7/use-purity-core

v7: Move modules reexports into one file. Refactor CHANGE_INPUT handler

Author: tatomyr

src/modules.js

@@ -0,0 +1,17 @@
+export {
+  createStore,
+  render,
+} from 'https://tatomyr.github.io/purity/core.min.js'
+export { registerAsync } from 'https://tatomyr.github.io/purity/register-async.min.js'
+export { debounce } from 'https://tatomyr.github.io/purity/lib/debounce.min.js'
+// TODO: use minified version after fixing md5.min.js
+export { md5 } from 'https://tatomyr.github.io/purity/lib/md5.js'
+export { sanitize } from 'https://tatomyr.github.io/purity/lib/sanitize.min.js'
+
+// Local:
+
+// export { createStore, render } from 'http://192.168.1.3:8081/core.js'
+// export { registerAsync } from 'http://192.168.1.3:8081/register-async.js'
+// export { debounce } from 'http://192.168.1.3:8081/lib/debounce.js'
+// export { md5 } from 'http://192.168.1.3:8081/lib/md5.js'
+// export { sanitize } from 'http://192.168.1.3:8081/lib/sanitize.js'

src/modules/debounce.js

@@ -13,7 +13,6 @@ export const types = {
   NOTIFICATION_HIDE: 'NOTIFICATION_HIDE',
   CHANGE_IMAGE: 'CHANGE_IMAGE',
   CAPTURE_PHOTO: 'CAPTURE_PHOTO',
-  SUBSTITUTE_ROUTE: 'SUBSTITUTE_ROUTE',
   CHANGE_INPUT: 'CHANGE_INPUT',
   MOVE_TASK: 'MOVE_TASK',
   SHOW_INFO: 'SHOW_INFO',

src/modules/md5.js

@@ -1,5 +1,4 @@
-import { registerAsync } from '/modules/purity.js'
-import { md5 } from '/modules/md5.js'
+import { registerAsync, md5 } from '/modules.js'
 import * as services from '/services/index.js'
 import { types } from './action-types.js'
 
@@ -74,10 +73,6 @@ export function deleteTask(action, dispatch, state) {
   })
 }
 
-export function changeInput(action, dispatch, state) {
-  dispatch({ type: types.SUBSTITUTE_ROUTE, hasInput: !!action.input })
-}
-
 export function notify(action, dispatch, state) {
   const pass = ({ type, ...rest }) => rest
   if (state.notification.notificationId)
@@ -284,8 +279,8 @@ async function uploadUserData(action, dispatch, state) {
       )
     ) {
       services.saveTasks(tasks)
-      dispatch({ type: 'FILTER', view: 'active' })
-      dispatch({ type: 'RESET_TASKS', tasks })
+      dispatch({ type: types.FILTER, view: 'active' })
+      dispatch({ type: types.RESET_TASKS, tasks })
     }
   } catch (err) {
     dispatch({ type: types.NOTIFY, text: err.message })
@@ -299,7 +294,6 @@ export default registerAsync(
     [types.TRIGGER_TASK]: triggerTask,
     [types.DELETE_TASK]: deleteTask,
     [types.UPDATE_TASK]: saveTasks,
-    [types.CHANGE_INPUT]: changeInput,
     [types.NOTIFY]: notify,
     [types.MOVE_TASK]: moveTask,
     [types.CHANGE_IMAGE]: changeImage,

src/modules/purity.js

@@ -1,4 +1,4 @@
-import { createStore } from '/modules/purity.js'
+import { createStore } from '/modules.js'
 import { stateHandler } from './state-handler.js'
 import asyncWatcher from './async-handler.js'
 

src/modules/sanitize.js

@@ -4,15 +4,15 @@ import { getCachedTasks } from '/services/index.js'
 // Default Application state
 const defaults = {
   tasks: getCachedTasks(),
+  taskId: undefined,
+  input: '',
   view: 'active',
-  _backupRoute: undefined, // TODO: -> startedInputAt: [view]
+  startedInputAt: 'active',
   notification: {
     text: '',
     notificationId: undefined,
     pageY: undefined,
   },
-  input: '',
-  taskId: undefined,
 }
 
 // Main syncronous Application handler. Handle all App state changes.
@@ -22,7 +22,7 @@ export const stateHandler = (state = defaults, action = {}) => {
       return {
         view: action.view,
         // If we've intentionally changed view, apparently we don't want go back.
-        _backupRoute: undefined,
+        startedInputAt: action.view,
       }
     case types.ADD_TASK:
       return {
@@ -74,19 +74,11 @@ export const stateHandler = (state = defaults, action = {}) => {
           notificationId: undefined,
         },
       }
-    // TODO: combine this with CHANGE_INPUT
-    case types.SUBSTITUTE_ROUTE:
-      return action.hasInput
-        ? {
-            view: 'all',
-            _backupRoute: state._backupRoute || state.view,
-          }
-        : {
-            view: state._backupRoute || state.view,
-            _backupRoute: undefined,
-          }
     case types.CHANGE_INPUT:
-      return { input: action.input }
+      return {
+        input: action.input,
+        view: action.input ? 'all' : state.startedInputAt,
+      }
     case types.SHOW_INFO:
       return { view: 'show-info' }
     case types.RESET_TASKS:

src/store/action-types.js

@@ -97,11 +97,18 @@ textarea {
   display: none;
 }
 
+/* TODO: refactor styles */
+/* Todo page styles */
+.todo-page {
+  height: calc(100% - 2 * var(--height));
+  max-height: calc(100% - 2 * var(--height));
+}
+
 /* TasksList style */
 .tasks-list {
   overflow-y: auto;
-  height: calc(100% - 2 * var(--height));
-  max-height: calc(100% - 2 * var(--height));
+  height: 100%;
+  max-height: 100%;
   background: lightgrey;
 
   /* TODO: box-shadow: inset 0px 8px 5px -5px grey; */