diff --git a/Makefile b/Makefile index d819652..ee1b0e2 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,60 @@ -.PHONY: push +SOURCES = src/mm.js \ + src/promise.js \ + src/promise-addons.js \ + src/repo.js \ + src/item.js \ + src/map.js \ + src/keyboard.js \ + src/action.js \ + src/clipboard.js \ + src/command.js \ + src/command.edit.js \ + src/command.select.js \ + src/layout.js \ + src/layout.graph.js \ + src/layout.tree.js \ + src/layout.map.js \ + src/shape.js \ + src/shape.underline.js \ + src/shape.box.js \ + src/shape.ellipse.js \ + src/format.js \ + src/format.json.js \ + src/format.freemind.js \ + src/format.mma.js \ + src/format.mup.js \ + src/backend.js \ + src/backend.local.js \ + src/backend.file.js \ + src/backend.firebase.js \ + src/backend.gdrive.js \ + src/ui.js \ + src/ui.layout.js \ + src/ui.shape.js \ + src/ui.value.js \ + src/ui.status.js \ + src/ui.color.js \ + src/ui.help.js \ + src/ui.io.js \ + src/ui.backend.js \ + src/ui.backend.file.js \ + src/ui.backend.local.js \ + src/ui.backend.firebase.js \ + src/ui.backend.gdrive.js \ + src/app.js -all: +.PHONY: all push clean + +all: my-mind.js + +my-mind.js: $(SOURCES) + @echo "/* My Mind web app: all source files combined. */" > $@ + @cat $^ >> $@ push: @hg bookmark -f master @hg push ; true @hg push github ; true + +clean: + @rm my-mind.js diff --git a/README.md b/README.md index 73ac86c..4eccaa2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ My Mind My Mind is a web application for creating and managing Mind maps. It is free to use and you can fork its source code. * [Official web page](http://my-mind.github.io/) -* [Sample mind map]() showcasing many features +* [Sample mind map](http://my-mind.github.io/?map=examples/features.mymind) showcasing many features * [Documentation](https://github.com/ondras/my-mind/wiki) My Mind is being actively developed. Do you want to participate? diff --git a/css/ui.css b/css/ui.css index 875742a..5cea699 100644 --- a/css/ui.css +++ b/css/ui.css @@ -103,22 +103,32 @@ border-color: #000; } +.ui #github { + position: absolute; + right: 160px; + bottom: 6px; +} + +.ui #github img { + vertical-align: middle; +} + .ui ~ #toggle { position: fixed; - bottom: 25px; - right: 75px; - width: 50px; - height: 50px; - line-height: 30px; + bottom: 6px; + right: 10px; + width: 32px; + height: 32px; + line-height: 18px; margin: auto; border-radius: 50%; box-shadow: 0 0 2px 3px #ccf; } .ui ~ #toggle:after { - content: "◀"; + content: "←"; font-weight: bold; - font-size: 28px; + font-size: 22px; } .ui.visible ~ #toggle { @@ -126,7 +136,7 @@ } .ui.visible ~ #toggle:after { - content: "▶"; + content: "→"; } .ui#help { diff --git a/examples/features.mymind b/examples/features.mymind new file mode 100644 index 0000000..264f234 --- /dev/null +++ b/examples/features.mymind @@ -0,0 +1,190 @@ +{ + "root": { + "id": "ujfdpxoz", + "text": "My Mind\nFeatures", + "layout": "map", + "children": [ + { + "id": "cmetfpcz", + "text": "Basic features", + "side": "right", + "color": "#e33", + "children": [ + { + "id": "oufzmqvy", + "text": "Node selection, manipulation" + }, + { + "id": "hsthllrc", + "text": "Rich text editing" + }, + { + "id": "spnaifjx", + "text": "Auto-linking" + }, + { + "id": "meeftorp", + "text": "Colors" + }, + { + "id": "pphsgpvu", + "text": "Zooming" + }, + { + "id": "avzourxv", + "text": "Shapes" + }, + { + "id": "bhszysqp", + "text": "Full keyboard control" + } + ] + }, + { + "id": "nkrfhzwg", + "text": "I/O", + "side": "left", + "color": "#3e3", + "children": [ + { + "id": "fpbtygky", + "text": "Multiple backends", + "children": [ + { + "id": "ezwvmtko", + "text": "Local storage" + }, + { + "id": "sczzbjgf", + "text": "Local filesystem" + }, + { + "id": "megldbuw", + "text": "Firebase" + }, + { + "id": "rmxmrpum", + "text": "Google Drive" + } + ] + }, + { + "id": "bmatbsiz", + "text": "Multiple file formats", + "children": [ + { + "id": "lyzyawpn", + "text": "Native" + }, + { + "id": "chfwbjrp", + "text": "Freemind" + }, + { + "id": "vhsldewc", + "text": "Mind Architect" + }, + { + "id": "whmzheiy", + "text": "MindMup" + } + ] + }, + { + "id": "hjialeal", + "text": "Permalinks" + } + ] + }, + { + "id": "scoyihcg", + "text": "Advanced features", + "side": "right", + "color": "#33e", + "children": [ + { + "id": "bvfjpmrm", + "text": "Numerical node values", + "value": "sum", + "children": [ + { + "id": "fppldjcr", + "text": "Constant values", + "value": 3.14 + }, + { + "id": "lhqwyqwq", + "text": "Functions", + "value": 42 + } + ] + }, + { + "id": "pjqwdjad", + "text": "Bool node statuses", + "value": "maybe", + "status": "maybe", + "children": [ + { + "id": "jsrxnhgy", + "text": "Yes/No", + "value": "yes", + "status": "no" + }, + { + "id": "oqzwbzvf", + "text": "Auto-propagation to parent", + "value": "no", + "status": "maybe" + } + ] + }, + { + "id": "adqojbln", + "text": "Variable layouts", + "layout": "tree-right", + "children": [ + { + "id": "uglsvbbi", + "text": "Map" + }, + { + "id": "mvqxmutu", + "text": "Graph" + }, + { + "id": "uonrboqe", + "text": "Tree" + } + ] + }, + { + "id": "rsruxymh", + "text": "Infinite undo/redo" + } + ] + }, + { + "id": "rbahwqul", + "text": "Planned features", + "side": "left", + "color": "#d3d", + "children": [ + { + "id": "krsvhker", + "text": "Realtime sync (Firebase)" + }, + { + "id": "vcmxdsvj", + "text": "Custom styles" + }, + { + "id": "bsddmwik", + "text": "Custom icons" + } + ] + } + ] + }, + "id": "dwqxduay" +} diff --git a/examples/test.mymind b/examples/test.mymind deleted file mode 100644 index e569814..0000000 --- a/examples/test.mymind +++ /dev/null @@ -1,87 +0,0 @@ -{ - "root": { - "text": "This is Sparta Root", - "layout": "map", - "children": [ - { - "text": "right 1", - "value": "sum", - "side": "right", - "color": "#33f", - "layout": "tree-right", - "shape": "box", - "children": [ - { - "value": 1, - "text": "right 1.1" - }, - { - "value": 13, - "text": "right 1.2 zejo", - "status": "yes" - }, - { - "text": "right 1.3 very long", - "children": [ - { - "text": "right 1.3.1" - } - ] - } - ] - }, - { - "text": "left 1", - "value": 3.14, - "side": "left", - "children": [ - { - "text": "left 1.1" - }, - { - "text": "left 1.2\nnewline jak cyp", - "children": [ - { - "text": "left 1.2.1" - } - ] - }, - { - "text": "left 1.3", - "children": [ - { - "text": "left 1.3.1" - } - ] - }, - { - "text": "left 1.4" - } - ] - }, - { - "text": "right 2", - "side": "right", - "color": "#f33", - "children": [ - { - "text": "right 2.1" - }, - { - "text": "right 2.2" - } - ] - }, - { - "text": "left 2 veri long k?", - "side": "left", - "children": [ - { - "text": "left 2.1" - } - ] - } - ] - }, - "id": "mltgjtma" -} diff --git a/github.png b/github.png new file mode 100644 index 0000000..8b25551 Binary files /dev/null and b/github.png differ diff --git a/index.html b/index.html index e5c9a60..8c1987a 100644 --- a/index.html +++ b/index.html @@ -4,51 +4,9 @@ My Mind - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -117,9 +75,11 @@

Item

+ + GitHub project page - +

@@ -156,6 +116,16 @@

Server

+

+ Auth + +

Saved maps @@ -192,54 +162,22 @@

Help