From 3e7a83f168a8aa88623c6a0d14aa802e67566b64 Mon Sep 17 00:00:00 2001
From: Tmadkaud <thierry.madkaud@gmail.com>
Date: Fri, 8 Jun 2018 15:30:13 +0200
Subject: [PATCH] version stable v2

---
 bin/www                          |  2 +-
 config/passport.js               | 22 ------------------
 src/app/book/book.component.html |  4 ++--
 src/app/main/main.component.html | 38 +-------------------------------
 4 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/bin/www b/bin/www
index dc89cc7..822cb10 100644
--- a/bin/www
+++ b/bin/www
@@ -38,7 +38,7 @@ var credentials = {
 var server = https.createServer(credentials, app);
 //var server = http.createServer(app);
 
-// server.setSecure(credentials);
+
 
 /**
  * Listen on provided port, on all network interfaces.
diff --git a/config/passport.js b/config/passport.js
index 1fd4e8e..520d94b 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -11,25 +11,7 @@ module.exports = function(passport) {
     var opts = {};
     opts.jwtFromRequest = ExtractJwt.fromAuthHeaderWithScheme("jwt");
     opts.secretOrKey = config.secret;
-/*
-    passport.use(new FacebookStrategy({
-            clientID: "191092458179642",
-            clientSecret: "964e490d7e49a13ee7a77c9b65419fb3",
-            callbackURL: "http://localhost:3000/api/facebook/callback"
-        },
-        function(accessToken, refreshToken, profile, done) {
-            console.log('yaaauuu : ' + accessToken + ' ----- ' + profile.displayName);
 
-            User.findOrCreate({username: profile.displayName}, {username: profile.displayName, id: profile.id}, function(err, user) {
-                console.log('yaaauuu err : ' + ' ----- ' + err );
-
-                console.log('yaaauuu user : ' + ' ----- ' + JSON.stringify(user));
-                if (err) { return done(err); }
-                done(null, user);
-            });
-        }
-    ));
-*/
     passport.use(new JwtStrategy(opts, function(jwt_payload, done) {
 
         User.findOne({id: jwt_payload.id, username: jwt_payload.username}, function(err, user) {
@@ -45,9 +27,5 @@ module.exports = function(passport) {
                 done(null, false);
             }
         });
-
-
-
-
     }));
 };
diff --git a/src/app/book/book.component.html b/src/app/book/book.component.html
index d400cdd..63a9743 100644
--- a/src/app/book/book.component.html
+++ b/src/app/book/book.component.html
@@ -7,7 +7,7 @@
                 <p> Current Folder : {{mainFolder?.name}}</p>
             </div>
             <div class="col-md-4 card-text">
-                <p> Used space : {{sizeFile.toString() === '0' ? '0' :  (sizeFile/ ( 1024 * 1024 ) | number : '1.2-2')}} / 30 Mo</p>
+                <p> Used space : {{sizeFile.toString() === '0' ? '0' :  (sizeFile/ ( 1024 * 1024 ) | number : '1.2-2')}} Mo / 30 Go</p>
             </div>
             <div class="col-md-4 card-text">
                 <p> Path : {{mainFolder?.path}}</p>
@@ -129,7 +129,7 @@
             <label>{{folder.name}}</label>
         </td>
         <!--<td>{{ folder.name }}</td>-->
-        <td><label>{{ folder.taille}} Mo</label></td>
+        <td><label></label></td>
         <td><label>Folder</label></td>
         <td><label>{{ folder.owner }}</label></td>
     </tr>
diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html
index a18fa30..0d19fd4 100644
--- a/src/app/main/main.component.html
+++ b/src/app/main/main.component.html
@@ -58,29 +58,6 @@
               </mdb-item-body>
             </mdb-item>
 
-            <!-- Simple link
-            <mdb-item class="no-collase">
-              <mdb-item-head mdbWavesEffect><i class="fa fa-hand-pointer-o"></i> Simple link</mdb-item-head>
-              <mdb-item-body></mdb-item-body>
-            </mdb-item>
-
-
-            <mdb-item>
-              <mdb-item-head mdbWavesEffect><i class="fa fa-eye"></i> Collapsible menu 2</mdb-item-head>
-              <mdb-item-body>
-                <ul>
-                  <li><a href="#" class="waves-effect" mdbWavesEffect>Link 1</a></li>
-                  <li><a href="#" class="waves-effect" mdbWavesEffect>Link 2</a></li>
-                </ul>
-              </mdb-item-body>
-            </mdb-item>
-
-
-            <mdb-item class="no-collase">
-              <mdb-item-head mdbWavesEffect><i class="fa fa-diamond"></i> Simple link 2</mdb-item-head>
-              <mdb-item-body></mdb-item-body>
-            </mdb-item>-->
-
           </mdb-squeezebox>
         </ul>
       </li>
@@ -112,24 +89,11 @@
     <navlinks>
       <ul class="nav navbar-nav nav-flex-icons ml-auto ie-double-nav">
         <li class="nav-item">
-          <a class="nav-link waves-light" mdbWavesEffect><i class="fa fa-envelope"></i> <span class="clearfix d-none d-sm-inline-block">Contact</span></a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link waves-light" mdbWavesEffect><i class="fa fa-user"></i> <span class="clearfix d-none d-sm-inline-block">Account</span></a>
+          <a class="nav-link waves-light" mdbWavesEffect><i class="fa fa-user"></i> <span class="clearfix d-none d-sm-inline-block"> {{currentUser.username}} </span></a>
         </li>
         <li class="nav-item" (click)="logout()">
           <a class="nav-link waves-light" mdbWavesEffect><i class="fa fa-sign-out mr-1"></i> <span class="clearfix d-none d-sm-inline-block">Log out</span></a>
         </li>
-        <!--<li class="nav-item dropdown btn-group" dropdown>-->
-          <!--<a dropdownToggle type="button" class="nav-link dropdown-toggle waves-light" mdbWavesEffect>-->
-            <!--Dropdown-->
-          <!--</a>-->
-          <!--<div class="dropdown-menu dropdown-primary dropdown-menu-right" role="menu">-->
-            <!--<a class="dropdown-item" href="#">Action</a>-->
-            <!--<a class="dropdown-item" href="#">Another action</a>-->
-            <!--<a class="dropdown-item" href="#">Something else here</a>-->
-          <!--</div>-->
-        <!--</li>-->
       </ul>
     </navlinks>
   </mdb-navbar>