push for Tom

beubeubeubeu · Jan 13, 2017 · 68d3732 · 68d3732
1 parent c6635a0
commit 68d3732
Show file tree

Hide file tree

Showing 15 changed files with 201 additions and 55 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "public/vendors/"
+  "directory": "public/app_client/vendors/"
 }
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 node_modules
-public/vendors
+public/app_client/vendors
diff --git a/app.js b/app.js
@@ -32,7 +32,6 @@ app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
-app.use(express.static(path.join(__dirname, 'public')))
 app.use(morgan('dev'));
 app.use(passport.initialize())
 
@@ -41,8 +40,12 @@ app.use(passport.initialize())
 var routesApi = require('./app_server/routes/users')
 app.use(passport.initialize());
 app.use('/api', routesApi);
-var routeur = require('./app_server/routes/index')
-app.use('/', routeur);
+// var routeur = require('./app_server/routes/index')
+// app.use(app.router);
+// app.use(express.static())
+app.get('*', function(req, res) {
+    res.sendFile(path.join(__dirname, 'public/app_client/index.html'))
+});
 
 // Default Port =============================================
 

diff --git a/app_server/routes/index.js b/app_server/routes/index.js
diff --git a/app_server/views/index.html b/app_server/views/index.html
diff --git a/bower.json b/bower.json
@@ -1,17 +1,17 @@
 {
-    "name": "startpitch",
-    "version": "0.0.0",
-    "dependencies": {
-        "angular": "^1.5.8",
-        "angular-route": "^1.5.8",
-        "angular-local-storage": "^0.5.0",
-        "angular-jwt": "^0.1.3",
-        "angular-socket-io": "^0.7.0",
-        "bootstrap": "^3.3.7",
-        "materialize": "^0.97.7",
-        "socket.io-client": "^1.4.8",
-        "moment": "^2.15.1",
-        "font-awesome": "latest",
-        "animate.css": "latest"
-    }
+  "name": "twittermean",
+  "version": "0.0.0",
+  "dependencies": {
+    "angular": "^1.5.8",
+    "angular-local-storage": "^0.5.0",
+    "angular-jwt": "^0.1.3",
+    "angular-socket-io": "^0.7.0",
+    "bootstrap": "^3.3.7",
+    "materialize": "^0.97.7",
+    "socket.io-client": "^1.4.8",
+    "moment": "^2.15.1",
+    "font-awesome": "latest",
+    "animate.css": "latest",
+    "angular-ui-router": "^0.3.2"
+  }
 }
diff --git a/public/app_client/app.js b/public/app_client/app.js
@@ -1 +1 @@
-var app = angular.module('twitterMean', ['ngRoute']);
+var app = angular.module('twitterMean', ['ui.router']);
diff --git a/public/app_client/controllers/MainCtrl.js b/public/app_client/controllers/MainCtrl.js
@@ -0,0 +1,4 @@
+app.controller('mainController', function($scope) {
+        // create a message to display in our view
+        $scope.message = 'Everyone come and see how good I look!';
+    });
diff --git a/public/app_client/controllers/RegisterCtrl.js b/public/app_client/controllers/RegisterCtrl.js
@@ -0,0 +1,4 @@
+app.controller('registerController', function($scope) {
+        // create a message to display in our view
+        $scope.message = 'Everyone come and see how good I look!';
+    });
diff --git a/public/app_client/index.html b/public/app_client/index.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html ng-app="twitterMean">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>Register momo</title>
+
+    <script>
+      var loc = window.location.pathname;
+      var dir = loc.substring(0,loc.lastIndexOf('/'));
+      console.log(loc);
+    </script>
+
+    <!-- CSS -->
+    <link rel="stylesheet" href="./vendors/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="./vendors/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="./vendors/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="./vendors/foundation/css/foundation.css"/>
+
+
+    <!-- JS -->
+    <script src="./vendors/angular.min.js"></script>
+    <script src="./vendors/angular-ui-router/release/angular-ui-router.min.js"></script>
+
+    <!-- ANGULAR CUSTOM -->
+    <script src="./app.js"></script>
+    <script src="./controllers/MainCtrl.js"></script>
+    <script src="./controllers/LoginCtrl.js"></script>
+    <script src="./controllers/RegisterCtrl.js"></script>
+    <script src="./services/AuthService.js"></script>
+    <script src="./vendors/bootstrap/dist/js/bootstrap.js"></script>
+    <script src="./vendors/foundation/js/foundation.js"></script>
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- Leave those next 4 lines if you care about users using IE8 -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+    <h1>BONJOUR</h1>
+
+    <ui-view></ui-view>
+
+
+  </body>
+</html>
diff --git a/public/app_client/routes.js b/public/app_client/routes.js
@@ -0,0 +1,12 @@
+app.config(function($stateProvider, $urlRouterProvider) {
+
+    $stateProvider
+    // REGISTER VIEW ========================================
+    .state('register', {
+      url: '/register',
+      templateUrl: '/views/register.html',
+      controller: 'registerController'
+
+    })
+
+})
diff --git a/public/app_client/services/AuthService.js b/public/app_client/services/AuthService.js
@@ -8,15 +8,58 @@ app.factory('AuthService',  ['$http', '$window', function($http, $window) {
       return $window.localStorage['mean-token'];
     };
 
+    var isLoggedIn = function() {
+      var token = getToken();
+      var payload;
+
+      if(token){
+        payload = token.split('.')[1];
+        payload = $window.atob(payload);
+        payload = JSON.parse(payload);
+
+        return payload.exp > Date.now() / 1000;
+      } else {
+        return false;
+      }
+    };
+
+    var currentUser = function() {
+      if(isLoggedIn()){
+        var token = getToken();
+        var payload = token.split('.')[1];
+        payload = $window.atob(payload);
+        payload = JSON.parse(payload);
+        return {
+          email : payload.email,
+          name : payload.name
+        };
+      }
+    };
+
+    register = function(user) {
+      return $http.post('/api/register', user).success(function(data){
+        saveToken(data.token);
+      });
+    };
+
+    login = function(user) {
+      return $http.post('/api/login', user).success(function(data) {
+        saveToken(data.token);
+      });
+    };
+
     logout = function() {
       $window.localStorage.removeItem('mean-token');
     };
 
     return {
       saveToken : saveToken,
+      isLoggedIn : isLoggedIn,
+      currentUser : currentUser,
+      register : register,
+      login : login,
       getToken : getToken,
       logout : logout
     };
-  }
 
 }]);
diff --git a/public/stylesheets/style.css → public/app_client/stylesheets/style.css b/public/stylesheets/style.css → public/app_client/stylesheets/style.css
diff --git a/public/app_client/views/login.html b/public/app_client/views/login.html
diff --git a/public/app_client/views/register.html b/public/app_client/views/register.html
@@ -0,0 +1,63 @@
+<form>
+  <div class="row">
+    <div class="large-12 columns">
+      <label>Input Label
+        <input type="text" placeholder="large-12.columns" />
+      </label>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-4 columns">
+      <label>Input Label
+        <input type="text" placeholder="large-4.columns" />
+      </label>
+    </div>
+    <div class="large-4 columns">
+      <label>Input Label
+        <input type="text" placeholder="large-4.columns" />
+      </label>
+    </div>
+    <div class="large-4 columns">
+      <div class="row collapse">
+        <label>Input Label</label>
+        <div class="small-9 columns">
+          <input type="text" placeholder="small-9.columns" />
+        </div>
+        <div class="small-3 columns">
+          <span class="postfix">.com</span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <label>Select Box
+        <select>
+          <option value="husker">Husker</option>
+          <option value="starbuck">Starbuck</option>
+          <option value="hotdog">Hot Dog</option>
+          <option value="apollo">Apollo</option>
+        </select>
+      </label>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-6 columns">
+      <label>Choose Your Favorite</label>
+      <input type="radio" name="pokemon" value="Red" id="pokemonRed"><label for="pokemonRed">Red</label>
+      <input type="radio" name="pokemon" value="Blue" id="pokemonBlue"><label for="pokemonBlue">Blue</label>
+    </div>
+    <div class="large-6 columns">
+      <label>Check these out</label>
+      <input id="checkbox1" type="checkbox"><label for="checkbox1">Checkbox 1</label>
+      <input id="checkbox2" type="checkbox"><label for="checkbox2">Checkbox 2</label>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <label>Textarea Label
+        <textarea placeholder="small-12.columns"></textarea>
+      </label>
+    </div>
+  </div>
+</form>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		var app = angular.module('twitterMean', ['ngRoute']);
		var app = angular.module('twitterMean', ['ui.router']);