Skip to content

Commit

Permalink
Merge pull request #9 from srtucker22/meteor-1.3-beta.11
Browse files Browse the repository at this point in the history
Meteor 1.3 beta.11
  • Loading branch information
srtucker22 committed Feb 24, 2016
2 parents 7f23054 + 845f1b4 commit bebe216
Show file tree
Hide file tree
Showing 4,394 changed files with 420,449 additions and 604 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ notices-for-facebook-graph-api-2
1.2.0-meteor-platform-split
1.2.0-cordova-changes
1.2.0-breaking-changes
1.3.0-split-minifiers-package
17 changes: 5 additions & 12 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,37 @@ ejson
email
fastclick
johnantoni:meteor-normalize
jquery
lepozepo:streams
logging
meteor-base
meteorflux:dispatcher
meteorflux:reactive-dependency
meteorhacks:kadira
mobile-experience
momentjs:moment
mongo
random
react
reactive-var
reactrouter:react-router
reload
service-configuration
session
spacebars
spiderable
standard-minifiers
tracker
twbs:bootstrap
underscore
markoshust:radium
okgrow:analytics
mizzao:user-status
quark:electron
crosswalk
meteorhacks:npm


npm-container
long:google-contacts
cfs:standard-packages
cosmos:browserify@=0.9.3
izzilab:material-ui@=0.2.6
http
raix:push
cfs:gridfs
force-ssl
msavin:mongol
srtucker22:throttled-requester
standard-minifier-css
standard-minifier-js
ecmascript
react-meteor-data
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.3-cordova-beta.3
METEOR@1.3-beta.11
159 changes: 76 additions & 83 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
accounts-base@1.2.3-cordova.3
accounts-base@1.2.3-beta.11
accounts-google@1.0.6
accounts-oauth@1.1.8
accounts-password@1.1.5-cordova.3
accounts-oauth@1.1.9-beta.11
accounts-password@1.1.5-beta.11
accounts-ui@1.1.6
accounts-ui-unstyled@1.1.8
accounts-ui-unstyled@1.1.9-beta.11
alanning:roles@1.2.14
aldeed:collection2@2.8.0
aldeed:collection2-core@1.0.0
aldeed:schema-deny@1.0.1
aldeed:schema-index@1.0.1
aldeed:simple-schema@1.5.3
allow-deny@1.0.1-cordova.3
allow-deny@1.0.1-beta.11
artwells:accounts-guest@0.1.13
autoupdate@1.2.5-cordova.3
babel-compiler@5.8.25-cordova.3
babel-runtime@0.1.5-cordova.3
base64@1.0.4
binary-heap@1.0.4
blaze@2.1.4-cordova.3
autoupdate@1.2.5-beta.11
babel-compiler@6.4.0-beta.11
babel-runtime@0.1.5-beta.11
base64@1.0.5-beta.11
binary-heap@1.0.5-beta.11
blaze@2.1.4-beta.11
blaze-html-templates@1.0.1
blaze-tools@1.0.4
boilerplate-generator@1.0.5-cordova.3
blaze-tools@1.0.5-beta.11
boilerplate-generator@1.0.5-beta.11
brettle:accounts-login-state@0.0.4
brettle:accounts-patch-ui@0.1.3
caching-compiler@1.0.1-cordova.3
caching-html-compiler@1.0.2
callback-hook@1.0.4
caching-compiler@1.0.1-beta.11
caching-html-compiler@1.0.3-beta.11
callback-hook@1.0.5-beta.11
cfs:access-point@0.1.49
cfs:base-package@0.0.30
cfs:collection@0.5.5
Expand All @@ -43,109 +43,102 @@ cfs:storage-adapter@0.2.3
cfs:tempstore@0.1.5
cfs:upload-http@0.0.20
cfs:worker@0.1.4
check@1.1.1-cordova.3
coffeescript@1.0.12-cordova.3
cosmos:browserify@0.9.3
crosswalk@1.4.0-cordova.3
check@1.1.1-beta.11
coffeescript@1.0.12-beta.11
crosswalk@1.4.0-beta.11
dburles:mongo-collection-instances@0.3.4
ddp@1.2.2
ddp-client@1.2.2-cordova.3
ddp-client@1.2.2-beta.11
ddp-common@1.2.2
ddp-rate-limiter@1.0.1-cordova.3
ddp-server@1.2.3-cordova.3
ddp-rate-limiter@1.0.1-beta.11
ddp-server@1.2.3-beta.11
deps@1.0.9
diff-sequence@1.0.1
ecmascript@0.3.1-cordova.3
ecmascript-runtime@0.2.6
ejson@1.0.7
email@1.0.9-cordova.3
fastclick@1.0.7
force-ssl@1.0.6
geojson-utils@1.0.4
google@1.1.7
hot-code-push@1.0.0
html-tools@1.0.5
htmljs@1.0.6-cordova.3
http@1.1.2-cordova.3
diff-sequence@1.0.2-beta.11
ecmascript@0.4.0-beta.11
ecmascript-runtime@0.2.7-beta.11
ejson@1.0.8-beta.11
email@1.0.9-beta.11
fastclick@1.0.8-beta.11
force-ssl@1.0.8-beta.11
geojson-utils@1.0.5-beta.11
google@1.1.8-beta.11
hot-code-push@1.0.1-beta.11
html-tools@1.0.6-beta.11
htmljs@1.0.6-beta.11
http@1.1.2-beta.11
id-map@1.0.4
izzilab:material-ui@0.2.6
johnantoni:meteor-normalize@0.0.1
jquery@1.11.4
jquery@1.11.5-beta.11
jsx@0.2.4
lai:collection-extensions@0.1.4
launch-screen@1.0.5-cordova.3
launch-screen@1.0.6-beta.11
lepozepo:streams@0.2.0
less@2.5.2-cordova.3
less@2.5.2-beta.11
livedata@1.0.15
localstorage@1.0.5
logging@1.0.9-cordova.3
localstorage@1.0.6-beta.11
logging@1.0.9-beta.11
long:google-contacts@0.2.1
markoshust:radium@0.15.3
mdg:validation-error@0.4.0
meteor@1.1.11-cordova.3
meteor@1.1.11-beta.11
meteor-base@1.0.1
meteor-env-dev@0.0.1-beta.11
meteor-env-prod@0.0.1-beta.11
meteorflux:dispatcher@1.2.3
meteorflux:namespace@1.0.0
meteorflux:reactive-dependency@0.1.1
meteorhacks:async@1.0.0
meteorhacks:kadira@2.27.3
meteorhacks:meteorx@1.4.1
meteorhacks:npm@1.5.0
meteortoys:toykit@2.2.1
minifiers-css@1.1.8-cordova.3
minifiers-js@1.1.8-cordova.3
minimongo@1.0.11-cordova.3
minifier-css@1.1.8-beta.11
minifier-js@1.1.8-beta.11
minimongo@1.0.11-beta.11
mizzao:timesync@0.3.4
mizzao:user-status@0.6.6
mobile-experience@1.0.1
mobile-status-bar@1.0.7-cordova.3
mobile-status-bar@1.0.8-beta.11
modules@0.5.0-beta.11
modules-runtime@0.5.0-beta.11
momentjs:moment@2.11.2
mongo@1.1.4-cordova.3
mongo@1.1.4-beta.11
mongo-id@1.0.1
mongo-livedata@1.0.9
msavin:mongol@1.6.2
npm-bcrypt@0.7.8_2
npm-container@1.2.0
npm-mongo@1.4.40-cordova.3
oauth@1.1.7-cordova.3
oauth2@1.1.5
observe-sequence@1.0.7
npm-mongo@1.4.40-beta.11
oauth@1.1.7-beta.11
oauth2@1.1.6-beta.11
observe-sequence@1.0.8-beta.11
okgrow:analytics@1.0.4
ordered-dict@1.0.4
promise@0.5.2-cordova.3
promise@0.5.2-beta.11
quark:electron@0.1.3
raix:eventemitter@0.1.3
raix:eventstate@0.0.4
raix:push@3.0.2
random@1.0.5
rate-limit@1.0.0
react@0.14.3_1
random@1.0.6-beta.11
rate-limit@1.0.1-beta.11
react-meteor-data@0.2.5
react-runtime@0.14.4
react-runtime-dev@0.14.4
react-runtime-prod@0.14.4
reactive-dict@1.1.4-cordova.3
reactive-dict@1.1.4-beta.11
reactive-var@1.0.6
reactrouter:react-router@0.1.12
reload@1.1.5-cordova.3
reload@1.1.5-beta.11
retry@1.0.4
routepolicy@1.0.6
service-configuration@1.0.5
session@1.1.1
routepolicy@1.0.7-beta.11
service-configuration@1.0.6-beta.11
session@1.1.2-beta.11
sha@1.0.4
spacebars@1.0.8-cordova.3
spacebars-compiler@1.0.8-cordova.3
spiderable@1.0.10-cordova.3
srp@1.0.4
standard-minifiers@1.0.3-cordova.3
standard-minifiers-css@1.0.3-cordova.3
standard-minifiers-js@1.0.3-cordova.3
templating@1.1.6-cordova.3
templating-tools@1.0.1-cordova.3
tracker@1.0.9
spacebars@1.0.8-beta.11
spacebars-compiler@1.0.8-beta.11
spiderable@1.0.10-beta.11
srp@1.0.5-beta.11
srtucker22:throttled-requester@0.0.1
standard-minifier-css@1.0.3-beta.11
standard-minifier-js@1.0.3-beta.11
templating@1.1.6-beta.11
templating-tools@1.0.1-beta.11
tracker@1.0.10-beta.11
twbs:bootstrap@3.3.6
ui@1.0.8
underscore@1.0.4
url@1.0.5
webapp@1.2.4-cordova.3
webapp-hashing@1.0.5
underscore@1.0.5-beta.11
url@1.0.6-beta.11
webapp@1.2.5-beta.11
webapp-hashing@1.0.6-beta.11
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,14 @@ It is also an example of how to create a WebRTC video chatroom and of how to int

5. Run the app with the settings <code>meteor --settings settings.json</code>

### Deployment Notes:

To deploy to a remote server, consider using a package like <a href="https://github.com/arunoda/meteor-up">Meteor Up</a>

### Electron Notes:

*Do NOT include the 'electron' field in your settings.json file if you are not running quasar from a Windows or Mac machine. meteor-electron will throw errors if you try and build from a Linux machine.*

quasar uses <a href="https://github.com/mixmaxhq/meteor-electron" target="_blank">meteor-electron</a> to easily transform into a downloadable desktop app and update as you develop. For <code>settings.json</code> configuration for this feature, please refer to the <a href="https://github.com/mixmaxhq/meteor-electron" target="_blank">meteor-electron documentation</a>.

meteor-electron has been modified to build a compressed version of the quasar desktop app at <code>quasar/public/downloads/{platform}-{arch}/quasar.zip</code>, which browser versions can reference for easy downloading. See <a href="https://github.com/srtucker22/quasar/blob/master/client/components/modules/download-button.component.jsx#L57" target="_blank">download-button.component.jsx</a> for how components reference this directory.
Expand All @@ -88,7 +94,7 @@ To run the Electron app pointing to localhost, exclude the <code>rootUrl</code>

## Application Design Overview

As mentioned previously, quasar is an example of how to create a WebRTC video chatroom and also of how to integrate React and Flux in a Meteor app.
Quasar is an example of how to create a WebRTC video chatroom and also of how to integrate React and Flux in a Meteor app.

Don't know React or Flux? No problem!

Expand Down Expand Up @@ -137,13 +143,10 @@ quasar is intended to be an example of how to create a WebRTC video chatroom and
- Change the name of the project to make it more accessible for projected users (suggestions welcome)

## TODO
- local material icons
- Enhance invite workflow
- mobile -- you send an invite to a room to active users
- if an invitee opens the app after a notification and the inviter is active,
they will get a dialog asking to join the room and a notification in their quasar notification list for retrieval -- which shows 'join' cta until the users leave the room
- if you invite non-users, they will go through auth flow and then directed to the room. if the room is empty, user will be directed to notifications list on mobile or homepage on desktop.
- Implement a global namespace for appName (clarify meaning)
- mobile -- you send an invite
- if an active invitee opens the app after a notification and the inviter is active, they will get a dialog asking to join the room and a notification in their quasar notification list for retrieval -- which shows 'join' cta until the users leave the room
- if you invite non-users, they will go directly to room as guest. if the room is empty, user will be directed to notifications list on mobile or homepage on desktop. ~ implement with invitation codes in email
- Add raix push notifications for cordova to enhance mobile support
- Add TURN server support to make it more useful for real-world deployment
- Package the application to make it easier to install
Expand Down
4 changes: 4 additions & 0 deletions client/actions/user.actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ var UserActions = function() {
Dispatcher.dispatch({actionType: 'USER_LOGIN_PASSWORD'});
},

loginAsGuest() {
Dispatcher.dispatch({actionType: 'USER_LOGIN_GUEST'});
},

loginWithGoogle() {
Dispatcher.dispatch({actionType: 'USER_LOGIN_GOOGLE'});
},
Expand Down
10 changes: 8 additions & 2 deletions client/components/app.component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
*
*/

import MUI from 'material-ui';
import Radium from 'radium';
import React from 'react';

let {ThemeManager, LightRawTheme} = MUI.Styles;

const styles = {
Expand All @@ -27,7 +31,7 @@ const styles = {
}
};

AppComponent = Radium(React.createClass({
export const AppComponent = Radium(React.createClass({
childContextTypes: {
muiTheme: React.PropTypes.object,
},
Expand All @@ -44,7 +48,9 @@ AppComponent = Radium(React.createClass({

render() {
return (
<div style={[styles.css]} appName='quasar'>{this.props.children}</div>
<div style={[styles.css]} appName={AppDetails.name}>
{this.props.children}
</div>
);
},
}));
Loading

0 comments on commit bebe216

Please sign in to comment.