Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/BootcampHTML5/Equipo-3.git

  • Loading branch information...
commit f9627e109b888cee1f9f9fa3813a2e743fcd5822 2 parents e847406 + 517ddf0
Joaquin Volpe volpejoaquin authored
Showing with 25 additions and 1 deletion.
  1. +24 −0 js/login.js
  2. +1 −1  login.html
24 js/login.js
View
@@ -0,0 +1,24 @@
+require.config({
+ paths: {
+ underscore: 'lib/underscore-min',
+ backbone: 'lib/backbone-min'
+ }
+});
+
+require(["backbone","views/HomeView"],
+ function(Backbone,HomeView) {
+ $(function() {
+
+ url = "apiTwitter/service/UserCredentials.php";
+
+
+
+ $.getJSON(url,function(json){
+ if (json.user_id){
+ $(location).attr('href',"home.html");
+ }
+ });
+ var view = new HomeView;
+ });
+ }
+);
2  login.html
View
@@ -9,7 +9,7 @@
<link rel="stylesheet" href="css/main.css" />
<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
<script src="http://code.jquery.com/mobile/1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.min.js"></script>
- <!-- <script data-main="js/login.js" src="js/require.js"></script> -->
+ <script data-main="js/login.js" src="js/require.js"></script>
</head>
<body>
<div data-role="page" id="home" class="login">
Please sign in to comment.
Something went wrong with that request. Please try again.