-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
89 changed files
with
650 additions
and
22,914 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,53 @@ | ||
| import _ from "lodash"; | ||
| import { createView } from "./view.jsx"; | ||
| import { date } from "../date"; | ||
| import { entry } from "../entry"; | ||
| import { temperature } from "../temperature"; | ||
| import { nest } from "../util/nest"; | ||
|
|
||
| export const nest = (update, path) => modelChange => | ||
| update(model => model.updateIn(path, modelChange)); | ||
|
|
||
| export const save = (model, update) => evt => { | ||
| evt.preventDefault(); | ||
|
|
||
| const errors = { | ||
| date: { errors: date.validateModel(model.date) }, | ||
| entry: { errors: entry.validateModel(model.entry) } | ||
| }; | ||
| update(model => | ||
| Object.keys(errors).reduce( | ||
| (m, key) => m.setIn([key, "errors"], errors[key].errors), | ||
| model | ||
| ) | ||
| ); | ||
|
|
||
| if (!(errors.date.errors || errors.entry.errors)) { | ||
| const air = model.temperature.air; | ||
| const water = model.temperature.water; | ||
|
|
||
| update(model => | ||
| model. | ||
| set("saved", "Entry #" + model.getIn(["entry", "value"]) + " on " + model.getIn(["date", "value"]) + ":" + | ||
| " Air: " + air.value + " \xB0" + air.units + | ||
| " Water: " + water.value + " \xB0" + water.units). | ||
| setIn(["entry", "value"], ""). | ||
| setIn(["date", "value"], "") | ||
| ); | ||
| const createActions = update => ({ | ||
| save: evt => { | ||
| evt.preventDefault(); | ||
|
|
||
| update(model => { | ||
| const errors = { | ||
| date: { errors: date.validateModel(model.date) }, | ||
| entry: { errors: entry.validateModel(model.entry) } | ||
| }; | ||
| model = Object.keys(errors).reduce( | ||
| (m, key) => _.set(m, [key, "errors"], errors[key].errors), | ||
| model | ||
| ); | ||
|
|
||
| if (!(errors.date.errors || errors.entry.errors)) { | ||
| const air = model.temperature.air; | ||
| const water = model.temperature.water; | ||
|
|
||
| model.saved = | ||
| "Entry #" + model.entry.value + | ||
| " on " + model.date.value + ":" + | ||
| " Air: " + air.value + " \xB0" + air.units + | ||
| " Water: " + water.value + " \xB0" + water.units; | ||
|
|
||
| model.entry.value = ""; | ||
| model.date.value = ""; | ||
| } | ||
| return model; | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| export const app = { | ||
| create: update => { | ||
| const actions = createActions(update); | ||
|
|
||
| const components = { | ||
| date: date.create(nest(update, ["date"])), | ||
| entry: entry.create(nest(update, ["entry"])), | ||
| airTemperature: temperature.create(nest(update, ["temperature", "air"])), | ||
| waterTemperature: temperature.create(nest(update, ["temperature", "water"])) | ||
| }; | ||
|
|
||
| return createView(actions, components); | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,17 @@ | ||
| import preact from "preact"; | ||
|
|
||
| import { nest, save } from "./index"; | ||
| import { createDateView } from "../date/view-jsx.jsx"; | ||
| import { createEntryView } from "../entry/view-jsx.jsx"; | ||
| import { createTemperatureView } from "../temperature/view-jsx.jsx"; | ||
| export const createView = (actions, components) => | ||
| model => ( | ||
| <form className="pure-form pure-form-aligned"> | ||
| <fieldset> | ||
| {components.entry(model.entry)} | ||
| {components.date(model.date)} | ||
| {components.airTemperature(model.temperature.air)} | ||
| {components.waterTemperature(model.temperature.water)} | ||
|
|
||
| export const view = update => { | ||
| const dateView = createDateView(nest(update, ["date"])); | ||
| const entryView = createEntryView(nest(update, ["entry"])); | ||
| const airTemperatureView = createTemperatureView(nest(update, ["temperature", "air"])); | ||
| const waterTemperatureView = createTemperatureView(nest(update, ["temperature", "water"])); | ||
| <button className="pure-button pure-button-primary" onClick={actions.save}>Save</button> | ||
| </fieldset> | ||
|
|
||
| return model => ( | ||
| <div> | ||
| <div className="row"> | ||
| <div className="column column-25"> | ||
| <a className="button" href="index-jsx.html">Preact + JSX + Milligram</a> | ||
| </div> | ||
| <div className="column column-25"> | ||
| <a className="button button-outline" href="index-h.html">Preact + h + Basscss</a> | ||
| </div> | ||
| </div> | ||
| <form> | ||
| <fieldset> | ||
| {entryView(model.entry)} | ||
| {dateView(model.date)} | ||
| {airTemperatureView(model.temperature.air)} | ||
| {waterTemperatureView(model.temperature.water)} | ||
| <button onClick={save(model, update)}>Save</button> | ||
| <span>Saved: {model.saved}</span> | ||
| </fieldset> | ||
| </form> | ||
| </div> | ||
| <span>Saved: {model.saved}</span> | ||
| </form> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| import _ from "lodash"; | ||
|
|
||
| export const createActions = update => ({ | ||
| editDateValue: evt => update(model => model.set("value", evt.target.value)) | ||
| editDateValue: evt => update(model => _.set(model, "value", evt.target.value)) | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,12 @@ | ||
| import * as model from "./model"; | ||
| import { model, validateModel } from "./model"; | ||
| import { createActions } from "./actions"; | ||
| import { createView } from "./view.jsx"; | ||
|
|
||
| export const date = model; | ||
| export const date = { | ||
| model, | ||
| validateModel, | ||
| create: update => { | ||
| const actions = createActions(update); | ||
| return createView(actions); | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,10 @@ | ||
| import preact from "preact"; | ||
| import { createActions } from "./actions"; | ||
|
|
||
| export const createDateView = update => { | ||
| const actions = createActions(update); | ||
|
|
||
| return model => { | ||
| const error = model.errors && model.errors.value[0]; | ||
|
|
||
| return (<div> | ||
| <label>Date:</label> | ||
| <input type="text" size="10" value={model.value} onInput={actions.editDateValue} /> | ||
| <span>{error}</span> | ||
| </div>); | ||
| }; | ||
| }; | ||
| export const createView = actions => | ||
| model => ( | ||
| <div className="pure-control-group"> | ||
| <label htmlFor="date">Date:</label> | ||
| <input id="date" type="text" size="10" value={model.value} onInput={actions.editDateValue} /> | ||
| <span className="pure-form-message-inline">{model.errors && model.errors.value[0]}</span> | ||
| </div> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| import _ from "lodash"; | ||
|
|
||
| export const createActions = update => ({ | ||
| editEntryValue: evt => update(model => model.set("value", evt.target.value)) | ||
| editEntryValue: evt => update(model => _.set(model, "value", evt.target.value)) | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,12 @@ | ||
| import * as model from "./model"; | ||
| import { model, validateModel } from "./model"; | ||
| import { createActions } from "./actions"; | ||
| import { createView } from "./view.jsx"; | ||
|
|
||
| export const entry = model; | ||
| export const entry = { | ||
| model, | ||
| validateModel, | ||
| create: update => { | ||
| const actions = createActions(update); | ||
| return createView(actions); | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,10 @@ | ||
| import preact from "preact"; | ||
| import { createActions } from "./actions"; | ||
|
|
||
| export const createEntryView = update => { | ||
| const actions = createActions(update); | ||
|
|
||
| return model => { | ||
| const error = model.errors && model.errors.value[0]; | ||
|
|
||
| return (<div> | ||
| <label>Entry number:</label> | ||
| <input type="text" size="2" value={model.value} onInput={actions.editEntryValue} /> | ||
| <span>{error}</span> | ||
| </div>); | ||
| }; | ||
| }; | ||
| export const createView = actions => | ||
| model => ( | ||
| <div className="pure-control-group"> | ||
| <label htmlFor="entry">Entry number:</label> | ||
| <input id="entry" type="text" size="2" value={model.value} onInput={actions.editEntryValue} /> | ||
| <span className="pure-form-message-inline">{model.errors && model.errors.value[0]}</span> | ||
| </div> | ||
| ); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,29 @@ | ||
| import flyd from "flyd"; | ||
| import { render } from "preact"; | ||
| import { fromJS } from "immutable"; | ||
| import { applyUpdate, trace } from "meiosis"; | ||
| import meiosisTracer from "meiosis-tracer"; | ||
|
|
||
| import { app } from "./app"; | ||
| import { entry } from "./entry"; | ||
| import { date } from "./date"; | ||
| import { temperature } from "./temperature"; | ||
|
|
||
| export const startApp = createView => { | ||
| const initialModel = fromJS({ | ||
| saved: "", | ||
| entry: entry.initialModel(), | ||
| date: date.initialModel(), | ||
| temperature: { | ||
| air: temperature.initialModel("Air temperature:"), | ||
| water: temperature.initialModel("Water temperature:") | ||
| } | ||
| }); | ||
| const initialModel = { | ||
| saved: "", | ||
| entry: entry.model(), | ||
| date: date.model(), | ||
| temperature: { | ||
| air: temperature.model("Air temperature:"), | ||
| water: temperature.model("Water temperature:") | ||
| } | ||
| }; | ||
|
|
||
| const update = flyd.stream(); | ||
| const model = flyd.scan(applyUpdate, initialModel, update); | ||
| const view = createView(update); | ||
| const update = flyd.stream(); | ||
| const model = flyd.scan(applyUpdate, initialModel, update); | ||
|
|
||
| const element = document.getElementById("app"); | ||
| const modeljs = model.map(model => model.toJS()); | ||
| modeljs.map(modeljs => render(view(modeljs), element, element.lastElementChild)); | ||
| const view = app.create(update); | ||
| const element = document.getElementById("app"); | ||
| model.map(model => render(view(model), element, element.lastElementChild)); | ||
|
|
||
| trace({ update, dataStreams: [ modeljs ] }); | ||
| meiosisTracer({ selector: "#tracer" }); | ||
| }; | ||
| trace({ update, dataStreams: [ model ] }); | ||
| meiosisTracer({ selector: "#tracer" }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.