Skip to content

Commit

Permalink
splitting off to vendor files, firebase.json, adding footer
Browse files Browse the repository at this point in the history
  • Loading branch information
hasdavidc committed Aug 5, 2014
1 parent d49ad2e commit 04daaff
Show file tree
Hide file tree
Showing 8 changed files with 12,916 additions and 13 deletions.
12 changes: 7 additions & 5 deletions authenticated.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<link href="style.css" rel="stylesheet" type="text/css" media="all">

<!-- React JS -->
<script src="http://fb.me/react-0.10.0.min.js"></script>
<script src="http://fb.me/JSXTransformer-0.10.0.js"></script>
<script src="vendor/react-0.10.0.min.js"></script>
<script src="vendor/JSXTransformer-0.10.0.js"></script>

<!-- Firebase JS -->
<script src="https://cdn.firebase.com/js/client/1.0.17/firebase.js"></script>
<script src="vendor/firebase.js"></script>
<!-- Firebase Login JS -->
<script src="https://cdn.firebase.com/js/simple-login/1.6.1/firebase-simple-login.js"></script>
<script src="vendor/firebase-simple-login.js"></script>
<!-- ReactFire -->
<script src="https://cdn.firebase.com/libs/reactfire/0.1.6/reactfire.min.js"></script>
<script src="vendor/reactfire.min.js"></script>
</head>
<body>
<div id="mount"></div>
Expand Down Expand Up @@ -87,6 +87,7 @@
<UserDisplay user={this.state.user} />
<PeopleToYo name={this.state.name} />
<YoDisplay user={this.state.user} name={this.state.name} />
<h5>Made by <a href="https://twitter.com/davidchizzle">@davidchizzle</a> from <a href="http://davidandsuzi.com">davidandsuzi.com</a></h5>
</div>
);
}
Expand All @@ -102,6 +103,7 @@ <h3>My Web Version of Yo using React and Firebase</h3>
<div className="margin-bottom">If you do not want to log in, you can still view the experience at <a href="index.html">here</a>.</div>
{errorMsg}
<a className="margin-bottom btn btn-primary" href="#" onClick={this._login}>Login</a>
<h5>Made by <a href="https://twitter.com/davidchizzle">@davidchizzle</a> from <a href="http://davidandsuzi.com">davidandsuzi.com</a></h5>
</div>
);
}
Expand Down
9 changes: 9 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"firebase": "yo-in-react",
"public": ".",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
}
16 changes: 8 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<link href="style.css" rel="stylesheet" type="text/css" media="all">

<!-- React JS -->
<script src="http://fb.me/react-0.10.0.min.js"></script>
<script src="http://fb.me/JSXTransformer-0.10.0.js"></script>
<script src="vendor/react-0.10.0.min.js"></script>
<script src="vendor/JSXTransformer-0.10.0.js"></script>

<!-- Firebase JS -->
<script src="https://cdn.firebase.com/js/client/1.0.17/firebase.js"></script>
<script src="vendor/firebase.js"></script>
<!-- Firebase Login JS -->
<script src="https://cdn.firebase.com/js/simple-login/1.6.1/firebase-simple-login.js"></script>
<script src="vendor/firebase-simple-login.js"></script>
<!-- ReactFire -->
<script src="https://cdn.firebase.com/libs/reactfire/0.1.6/reactfire.min.js"></script>
<script src="vendor/reactfire.min.js"></script>
</head>
<body>
<div id="mount"></div>
Expand All @@ -33,8 +33,7 @@
getInitialState : function() {
return {
name : 'special-user-for-demo',
user : {},
errorMsg : ''
user : {}
};
},
render : function() {
Expand All @@ -46,6 +45,7 @@ <h3>My Web Version of Yo using React and Firebase</h3>
<UserDisplay user={this.state.user} />
<PeopleToYo name={this.state.name} />
<YoDisplay user={this.state.user} name={this.state.name} />
<h5>Made by <a href="https://twitter.com/davidchizzle">@davidchizzle</a> from <a href="http://davidandsuzi.com">davidandsuzi.com</a></h5>
</div>
);
}
Expand All @@ -55,4 +55,4 @@ <h3>My Web Version of Yo using React and Firebase</h3>
</script>

</body>
</html>
</html>
Loading

0 comments on commit 04daaff

Please sign in to comment.