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

This commit is contained in:
nau
2016-08-23 18:31:24 +02:00
parent 420c19fd7a
commit 59a9349de9
7 changed files with 18 additions and 14 deletions

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,

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
web/js/jquery-2.1.1.min.js vendored Normal file

File diff suppressed because one or more lines are too long

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>

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>

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>

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>