ready to angular go... at last

beubeubeubeu · Jan 15, 2017 · d9c9353 · d9c9353
1 parent 68d3732
commit d9c9353
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 public/app_client/vendors
+public/npm-debug.log
diff --git a/app.js b/app.js
@@ -15,6 +15,16 @@ var bodyParser    = require('body-parser')
 var app           = express()
 var server        = require('http').createServer(app)
 
+// app config ================================================
+
+app.use(logger('dev'));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(morgan('dev'));
+app.use(passport.initialize())
+app.use(express.static(path.join(__dirname, 'public')));
+
 // connection to DB ==========================================
 
 var dbconnection  = require('./app_server/models/connect_db').connectdb()
@@ -26,33 +36,26 @@ require('./app_server/config/passport');
 var CtrlAuth = require('./app_server/controllers/authentication');
 var CtrlProfile = require('./app_server/controllers/profile');
 
-// what part is this ? =======================================
-
-app.use(logger('dev'));
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(cookieParser());
-app.use(morgan('dev'));
-app.use(passport.initialize())
 
 // Routes ===================================================
 
+app.use('/public', express.static(__dirname + '/public'));
+app.use('/app_client', express.static(__dirname + '/public/app_client'));
+app.use('/vendors', express.static(__dirname + '/public/app_client/vendors'));
+
 var routesApi = require('./app_server/routes/users')
 app.use(passport.initialize());
 app.use('/api', routesApi);
-// 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'))
+app.get('/', function(req, res) {
+    res.sendFile('index.html', { root: path.join(__dirname, './public/app_client') })
 });
 
+
 // Default Port =============================================
 
 var PORT = ( process.env.PORT || 8080 );
 
 // error handlers ===========================================
-// Catch unauthorised errors (see index.js routes)
 
 app.use(function (err, req, res, next) {
   if (err.name === 'UnauthorizedError') {
@@ -61,7 +64,6 @@ app.use(function (err, req, res, next) {
   }
 });
 
-
 server.listen(PORT, function() {
   console.log("Party started at http://localhost:" + PORT);
 });

diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "twittermean",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "^1.5.8",
+    "angular": "latest",
     "angular-local-storage": "^0.5.0",
     "angular-jwt": "^0.1.3",
     "angular-socket-io": "^0.7.0",

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "mongoose": "^4.7.6",
     "morgan": "~1.7.0",
     "passport": "^0.3.2",
+    "passport-local": "^1.0.0",
     "serve-favicon": "~2.3.0"
   },
   "devDependencies": {

diff --git a/public/app_client/index.html b/public/app_client/index.html
@@ -1,50 +1,32 @@
 <!DOCTYPE html>
-<html ng-app="twitterMean">
+<html>
   <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"/>
+    <link rel="stylesheet" src="/vendors/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" src="/vendors/font-awesome/css/font-awesome.css">
+    <link rel="stylesheet" src="/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>
+    <script src="/vendors/jquery/dist/jquery.js"></script>
+    <script src="/vendors/angular/angular.min.js"></script>
+    <script src="/vendors/angular-ui-router/release/angular-ui-router.min.js"></script>
+    <script src="/vendors/bootstrap/dist/js/bootstrap.js"></script>
+    <script src="/vendors/foundation/js/foundation.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]-->
+    <script src="/app_client/app.js"></script>
+    <script src="/app_client/controllers/MainCtrl.js"></script>
+    <script src="/app_client/controllers/LoginCtrl.js"></script>
+    <script src="/app_client/controllers/RegisterCtrl.js"></script>
+    <script src="/app_client/services/AuthService.js"></script>
   </head>
-
-  <body>
-    <h1>BONJOUR</h1>
-
-    <ui-view></ui-view>
-
-
+  <body ng-app="twitterMean">
+    <H1>YOW</H1>
   </body>
 </html>
diff --git a/public/app_client/routes.js b/public/app_client/routes.js
@@ -6,7 +6,6 @@ app.config(function($stateProvider, $urlRouterProvider) {
       url: '/register',
       templateUrl: '/views/register.html',
       controller: 'registerController'
-
     })
 
 })