-
Notifications
You must be signed in to change notification settings - Fork 151
Another round of example updates #159
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
StorytellerCZ
wants to merge
7
commits into
devel
Choose a base branch
from
feature/update-examples
base: devel
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
78b31b7
Another round of example updates
StorytellerCZ 991ef4e
Update solomo to Meteor 2.16
StorytellerCZ 54f7246
Simple photo to Meteor 2.16
StorytellerCZ 255053f
Simple-map to Meteor 3.0-rc.4
StorytellerCZ 904353a
Map and camera examples updated to Meteor 3 & photo package as well
StorytellerCZ 5eafcfd
Upgrade Solomo example to Meteor 3
StorytellerCZ 249df64
Solomo example upgrade
StorytellerCZ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -5,8 +5,6 @@ | |
|
|
||
| [email protected] | ||
| [email protected] | ||
| mrt:moment | ||
| iron:router | ||
| ionic | ||
| [email protected] | ||
| [email protected] | ||
|
|
@@ -27,3 +25,4 @@ [email protected] | |
| [email protected] | ||
| [email protected] | ||
| blaze-html-templates | ||
| ostrio:flow-router-extra | ||
This file contains hidden or 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
File renamed without changes.
File renamed without changes.
This file contains hidden or 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,21 +1,55 @@ | ||
| Router.map(function() { | ||
| this.route('map', { | ||
| path: '/', | ||
| data: function () { | ||
| Session.set("currentPhoto", null); | ||
| } | ||
| }); | ||
| this.route("mapWithPhoto", { | ||
| template: "map", | ||
| path: 'map/:_id', | ||
| data: function () { | ||
| Session.set("currentPhoto", this.params._id); | ||
| } | ||
| }); | ||
| this.route('camera-page'); | ||
| this.route("list"); | ||
| }); | ||
| import { FlowRouter } from 'meteor/ostrio:flow-router-extra'; | ||
| import { Session } from 'meteor/session' | ||
|
|
||
| Router.configure({ | ||
| layoutTemplate: "layout" | ||
| }); | ||
| FlowRouter.route('/', { | ||
| name: 'index', | ||
| action: function () { | ||
| this.render('layout', 'map') | ||
| }, | ||
| data: function () { | ||
| Session.set("currentPhoto", null); | ||
| } | ||
| }) | ||
| FlowRouter.route('/map/:_id', { | ||
| name: 'mapWithPhoto', | ||
| action: function () { | ||
| this.render('layout', 'map') | ||
| }, | ||
| data: function (params) { | ||
| Session.set("currentPhoto", params._id); | ||
| } | ||
| }) | ||
| FlowRouter.route('/camera-page', { | ||
| name: 'camera-page', | ||
| action: function () { | ||
| this.render('layout', 'camera-page') | ||
| } | ||
| }) | ||
| FlowRouter.route('/list', { | ||
| name: 'list', | ||
| action: function () { | ||
| this.render('layout', 'list') | ||
| } | ||
| }) | ||
|
|
||
| // Router.map(function() { | ||
| // this.route('map', { | ||
| // path: '/', | ||
| // data: function () { | ||
| // Session.set("currentPhoto", null); | ||
| // } | ||
| // }); | ||
| // this.route("mapWithPhoto", { | ||
| // template: "map", | ||
| // path: 'map/:_id', | ||
| // data: function () { | ||
| // Session.set("currentPhoto", this.params._id); | ||
| // } | ||
| // }); | ||
| // this.route('camera-page'); | ||
| // this.route("list"); | ||
| // }); | ||
| // | ||
| // Router.configure({ | ||
| // layoutTemplate: "layout" | ||
| // }); | ||
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need to keep these comments?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would like to keep it commented for at least one more iteration just in case I have missed something in the migration to flow-router.