fixed many bugs

index.tmpl.html

@@ -7,7 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <link rel="stylesheet" href="css/style.css" />
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css">
     </head>
     <body>
         <script>

script/views/confidentialPage.js

@@ -4,7 +4,7 @@ define(['m', '_', 'teams', 'views/loginPage', 'views/playersPage', 'views/topNav
 
     confidentialPage.view  = function(){
         var body;
-        if(_.isEmpty(window.secret)){
+        if(_.isEmpty(localStorage.getItem('secret'))){
             body = loginPage;
         }else{
             body = playersPage;

script/views/contactPage.js

@@ -13,7 +13,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
     };
 
     contactBody.email = function(){
-        return m('a[href=mailto:info@ballephenix.com]', 'info@ballephenix.com');
+        return m('a[href=mailto:ballephenix@gmail.com]', 'ballephenix@gmail.com');
     };
 
     contactBody.tel = function(){
@@ -21,10 +21,15 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
     };
 
     contactBody.address = function(){
-        //   app 205 cd h1l ob2
         return m('p', ' 9200 rue hochelage, App 205', m('br'), 'Montréal, Québec H1L 0B2');
     };
 
+    contactBody.website = function(){
+        var gitlabUrl = 'https://gitlab.com/ballephenix/website';
+        return m('p', ' Le site web est ouvert et accessible sur ',
+                        m('a', {href: gitlabUrl}, 'gitlab.'));
+    };
+
     contactBody.contact = function(){
         return m('div.div.uk-panel.uk-panel-box.uk-panel-box-secondary.uk-container-center.uk-margin',[
             m('table.uk-table',
@@ -39,6 +44,10 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
                 m('tr',
                     m('td.uk-text-right',  m('i.fa.fa-envelope')),
                     m('td',  contactBody.address())
+                ),
+                m('tr',
+                    m('td.uk-text-right',  m('i.fa.fa-gitlab')),
+                    m('td',  contactBody.website())
                 )
             )
         ]);

script/views/footer.js

@@ -13,7 +13,7 @@ define(['m', '_', 'util'], function (m, _, util) {
                     m('div.uk-container.uk-container-center.uk-text-center', [
                         m('div.uk-panel', footer.wording()),
                         m('ul.uk-subnav.uk-subnav-line.uk-flex-center',
-                            m('li', m('a[href="mailto:info@ballephenix.com"]', 'info@ballephenix.com'))),
+                            m('li', m('a[href="mailto:ballephenix@gmail.com"]', 'ballephenix@gmail.com'))),
                         m('h1', util.facebookLink())
                     ])
         );

script/views/loginPage.js

@@ -19,7 +19,7 @@ define(['m', '_'], function (m, _) {
 
     loginPage.login = function(ctrl){
         return function(){
-            window.secret = loginPage.salt + ctrl.email() + ctrl.password();
+            localStorage.setItem('secret', loginPage.salt + ctrl.email() + ctrl.password());
             return false;
         };
     };

script/views/playersPage.js

@@ -85,9 +85,15 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
 
     playersTable.decryptPlayerList = function(encryptedPlayerList){
         var keyLengthInBytes = 128;
-        var key = spritz.hash(window.secret, keyLengthInBytes);
+        var key = spritz.hash(localStorage.getItem('secret') || '', keyLengthInBytes);
         var decryptedMessage = spritz.decrypt(key, encryptedPlayerList);
-        return JSON.parse(spritz.utf8ByteArrayToString(decryptedMessage));
+        try{
+            return JSON.parse(spritz.utf8ByteArrayToString(decryptedMessage));
+        }catch(e){
+            localStorage.removeItem('secret');
+            m.route('/membre');
+        }
+
     };
 
     playersTable.getEncryptedPlayerList = function(){
@@ -96,20 +102,19 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
             if(!_.isEmpty(window.encryptedPlayerList)){
                 clearInterval(interval);
                 deferred.resolve(window.encryptedPlayerList);
-                 m.redraw();
+                m.redraw();
             }
         }, 333);
         return deferred.promise;
     };
 
     playersTable.controller = function(model){
-        var players = m.prop([]);
         var ctrl = {};
         ctrl.model = model;
 
         ctrl.players = playersTable.getEncryptedPlayerList()
-                        .then(playersTable.decryptPlayerList)
+                        .then(playersTable.decryptPlayerList);
-                        .then(players);
+
         ctrl.sortPlayers = function(){
             ctrl.players(playersTable._sortPlayers(ctrl.model.sorting, ctrl.players()));
         };
@@ -205,7 +210,7 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
                     m('td', ''),
                     m('td[colspan=3]',
                         m('ul', [
-                            m('li', [m('b', 'tel: '), playersTaguble.playerTelLink(player)]),
+                            m('li', [m('b', 'tel: '), playersTable.playerTelLink(player)]),
                             m('li', [m('b', 'email: '), player.email])
                         ]))
                 ]);

script/views/topNavBar.js

@@ -32,9 +32,8 @@ define(['m', '_', 'util'], function (m, _, util) {
         var class_ = topNavBar._isActive(item.path) ? 'uk-active' : '';
         var url = topNavBar._getUrlForId(item.path);
         return  m("li", {class: class_},
-                    m("a.uk-navbar-nav-subtitle", {href: url},
+                    m("a", {href: url},
-                        topNavBar._getItemIcon(item),
+                        m('div', topNavBar._getItemIcon(item), ' ', item.name)
-                        m('div', item.name)
                     )
                 );
     };
@@ -52,9 +51,10 @@ define(['m', '_', 'util'], function (m, _, util) {
     topNavBar._getSmallItem = function(item){
         var class_ = topNavBar._isActive(item.path) ? 'uk-active' : '';
         var url = topNavBar._getUrlForId(item.path);
-        return  m("li.uk-align-left", {class: class_},
+        return  m("li", {class: class_},
-                    topNavBar._getItemIcon(item), ' ',
                     m("a", {href: url},
+                        topNavBar._getItemIcon(item),
+                        ' ',
                         item.name
                     )
                 );
@@ -69,16 +69,16 @@ define(['m', '_', 'util'], function (m, _, util) {
 
     topNavBar.mediumTopNav = function(){
         return [
-            m('li.uk-parent', util.facebookLink()),
+            m('li.uk-parent',  m('div.uk-navbar-brand', util.facebookLink())),
             _.map(topNavBar._urlMapping, topNavBar._getMediumItem)
         ];
     };
 
     topNavBar.dropdown = function(){
         return  m('div.uk-dropdown',
-                    m('ul.uk-nav.uk-nav-navbar.uk-dropdown-navbar'),
+                    m('ul.uk-nav.uk-nav-navbar.uk-dropdown-navbar',
                         _.map(topNavBar._urlMapping, topNavBar._getSmallItem)
-                );
+                ));
     };
 
     topNavBar.toggleDropdown = function(model){
@@ -106,7 +106,7 @@ define(['m', '_', 'util'], function (m, _, util) {
         var class_ = model.openDropdown ? 'uk-open' : '';
         var attrs = {class: class_, onclick:  topNavBar.toggleDropdown(model)};
         var ret = [
-            m('li.uk-parent', util.facebookLink()),
+            m('li.uk-parent',  m('div.uk-navbar-brand', util.facebookLink())),
             m('li.uk-parent[data-uk-dropdown][aria-expanded]', attrs, m('a', m('i.fa.fa-bars'), ' Menu'), topNavBar.dropdown()),
         ];
         if(model.openDropdown){