arnaucube
/
thoughts
mirror of https://github.com/arnaucube/thoughts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tot en fitxers del mateix servidor, i url dels gets/posts apuntant a l'api del servidor

master
nau 8 years ago
parent
420c19fd7a
commit
59a9349de9
7 changed files with 18 additions and 14 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      web/controllers.js
  2. +1
    -1
      web/index.html
  3. +4
    -0
      web/js/jquery-2.1.1.min.js
  4. +3
    -3
      web/login.html
  5. +3
    -3
      web/newthought.html
  6. +3
    -3
      web/signup.html
  7. +3
    -3
      web/user.html

+ 1
- 1
web/controllers.js
View File

@ -1,6 +1,6 @@
var url="http://localhost:3000/api/";
var url="https://thoughtsserver.herokuapp.com/api/";
angular.module('thoughtsApp', []) angular.module('thoughtsApp', [])
.controller('ThoughtsController', function( .controller('ThoughtsController', function(
$scope, $scope,

+ 1
- 1
web/index.html
View File

@ -46,7 +46,7 @@
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script> <script type="text/javascript" src="js/materialize.min.js"></script>
<script src="jslib/toastr.js"></script> <script src="jslib/toastr.js"></script>

+ 4
- 0
web/js/jquery-2.1.1.min.js
File diff suppressed because it is too large
View File


+ 3
- 3
web/login.html
View File

@ -3,7 +3,7 @@
<html ng-app="thoughtsApp"> <html ng-app="thoughtsApp">
<head> <head>
<!--Import Google Icon Font--> <!--Import Google Icon Font-->
<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="fonts/icons.css" rel="stylesheet">
<!--Import materialize.css--> <!--Import materialize.css-->
<link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/>
@ -12,7 +12,7 @@
<title>Thoughts - login</title> <title>Thoughts - login</title>
<!-- ANGULAR --> <!-- ANGULAR -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
<script src="libraries/angular.min.js"></script>
</head> </head>
<body ng-controller="ThoughtsController"> <body ng-controller="ThoughtsController">
@ -46,7 +46,7 @@
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script> <script type="text/javascript" src="js/materialize.min.js"></script>
<script src="jslib/toastr.js"></script> <script src="jslib/toastr.js"></script>

+ 3
- 3
web/newthought.html
View File

@ -3,7 +3,7 @@
<html ng-app="thoughtsApp"> <html ng-app="thoughtsApp">
<head> <head>
<!--Import Google Icon Font--> <!--Import Google Icon Font-->
<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="fonts/icons.css" rel="stylesheet">
<!--Import materialize.css--> <!--Import materialize.css-->
<link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/>
@ -12,7 +12,7 @@
<title>Thoughts - new thought</title> <title>Thoughts - new thought</title>
<!-- ANGULAR --> <!-- ANGULAR -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
<script src="libraries/angular.min.js"></script>
</head> </head>
<body ng-controller="ThoughtsController"> <body ng-controller="ThoughtsController">
@ -40,7 +40,7 @@
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script> <script type="text/javascript" src="js/materialize.min.js"></script>
<script src="jslib/toastr.js"></script> <script src="jslib/toastr.js"></script>

+ 3
- 3
web/signup.html
View File

@ -3,7 +3,7 @@
<html ng-app="thoughtsApp"> <html ng-app="thoughtsApp">
<head> <head>
<!--Import Google Icon Font--> <!--Import Google Icon Font-->
<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="fonts/icons.css" rel="stylesheet">
<!--Import materialize.css--> <!--Import materialize.css-->
<link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/>
@ -12,7 +12,7 @@
<title>Thoughts - signup</title> <title>Thoughts - signup</title>
<!-- ANGULAR --> <!-- ANGULAR -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
<script src="libraries/angular.min.js"></script>
</head> </head>
<body ng-controller="ThoughtsController"> <body ng-controller="ThoughtsController">
@ -62,7 +62,7 @@
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script> <script type="text/javascript" src="js/materialize.min.js"></script>
<script src="jslib/toastr.js"></script> <script src="jslib/toastr.js"></script>

+ 3
- 3
web/user.html
View File

@ -3,7 +3,7 @@
<html ng-app="thoughtsApp"> <html ng-app="thoughtsApp">
<head> <head>
<!--Import Google Icon Font--> <!--Import Google Icon Font-->
<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="fonts/icons.css" rel="stylesheet">
<!--Import materialize.css--> <!--Import materialize.css-->
<link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection"/>
@ -12,7 +12,7 @@
<title>Thoughts</title> <title>Thoughts</title>
<!-- ANGULAR --> <!-- ANGULAR -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
<script src="libraries/angular.min.js"></script>
</head> </head>
<body ng-controller="ThoughtsController as thoughtsList"> <body ng-controller="ThoughtsController as thoughtsList">
@ -46,7 +46,7 @@
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script> <script type="text/javascript" src="js/materialize.min.js"></script>
<script src="jslib/toastr.js"></script> <script src="jslib/toastr.js"></script>

Write Preview
Loading…
Cancel
Save