Merge remote-tracking branch 'origin/master'

# Conflicts: # app/user/profile/profile.component.html
pranaysashank · Sep 9, 2016 · 9192d1b · 9192d1b
2 parents 20a9bf7 + ded50e0
commit 9192d1b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules/*
+.idea/*
diff --git a/app/login/auth.service.js b/app/login/auth.service.js
diff --git a/app/login/auth.service.ts b/app/login/auth.service.ts
@@ -24,7 +24,7 @@ export class AuthService {
 
         return this.http
             .post(
-                'http://127.0.0.1:4568/login.php',
+                'http://127.0.0.1:4567/login.php',
                 JSON.stringify({id, password}),
                 {headers}
             )

diff --git a/app/user/user.service.js b/app/user/user.service.js
diff --git a/app/user/user.service.ts b/app/user/user.service.ts
@@ -144,7 +144,7 @@ export class UserService {
      let authToken = localStorage.getItem('auth_token');
 
      this.observable = this.http
-     .get(`http://127.0.0.1:4568/user.php?auth_token=${authToken}`)
+     .get(`http://127.0.0.1:4567/user.php?auth_token=${authToken}`)
      .map((res) => {
      this.observable = null;
      this.user = res.json();
@@ -154,7 +154,7 @@ export class UserService {
      }*/
         let authToken = localStorage.getItem('auth_token');
         return this.http
-            .get(`http://127.0.0.1:4568/user.php?auth_token=${authToken}`)
+            .get(`http://127.0.0.1:4567/user.php?auth_token=${authToken}`)
             .map((res) => res.json());
     }
 

diff --git a/index.html b/index.html
@@ -6,8 +6,10 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
-    <link rel="stylesheet" href="node_modules/semantic-ui/dist/semantic.min.css">
-    <script src="node_modules/semantic-ui/dist/semantic.min.js"></script>
+    <!--<link rel="stylesheet" href="node_modules/semantic-ui/dist/semantic.min.css">-->
+    <!--<script src="node_modules/semantic-ui/dist/semantic.min.js"></script>-->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.4/semantic.min.css" rel="stylesheet">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.4/semantic.min.js"></script>
     <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>-->
     <!-- 1. Load libraries -->