update

bvallelunga · May 2, 2014 · 15cf5dd · 15cf5dd
1 parent 33503d2
commit 15cf5dd
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/lib/models/projects/index.js b/lib/models/projects/index.js
@@ -51,15 +51,16 @@ module.exports = function (db, models) {
                 return req.signedCookies[cookie] || {
                     feedback: false,
                     closed: false,
-                    visits: {}
+                    visits: {},
+                    expires: new Date(Date.now() + 7890000000)
                 }
             },
             set_cookie: function(res, data) {
                 var cookie = "%s_%s".sprintf([config.cookies.tracking, this.pub_id]);
                 res.cookie(cookie, data, {
                     httpOnly: true,
                     signed: true,
-                    maxAge: 7890000000 //3 months
+                    expires: new Date(data.expires)
                 });
             },
             rule_engine: function(req, res, callback) {

diff --git a/lib/models/users/index.js b/lib/models/users/index.js
@@ -20,7 +20,8 @@ module.exports = function (db, models) {
             required: true
         },
         card: Object,
-        stripe: String
+        stripe: String,
+        admin: Boolean
     }, {
         timestamp: true,
         hooks: {

diff --git a/public/js/track/index.js b/public/js/track/index.js
@@ -19,7 +19,9 @@
                 full_params += "&";
             }
 
-            full_params += key + "=" + encodeURIComponent(params[key]);
+            if(params[key]) {
+                full_params += key + "=" + encodeURIComponent(params[key]);
+            }
         }
 
         if(action == "GET") {
@@ -52,7 +54,7 @@
                 if(xhr.readyState < 4 || xhr.status !== 200) {
                     return callback(false);
                 } else if(xhr.readyState === 4) {
-                    return callback(xhr.responseText);
+                    return callback(xhr.response);
                 } else {
                     return callback(false);
                 }
@@ -61,6 +63,7 @@
 
         xhr.withCredentials = true;
         xhr.open(action, full_url, true);
+        xhr.responseType = "json";
 
         if(action != "GET") {
             xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
@@ -93,8 +96,6 @@
         var _this = this;
 
         if(data != false) {
-            data = JSON.parse(data);
-
             if(data.success && data.show) {
                 insertAssests(data.assests);
                 insertContent(data.content);

diff --git a/public/less/core/dashboard.less b/public/less/core/dashboard.less
@@ -329,6 +329,7 @@
     font-size: 24px;
     font-weight: lighter;
     color: rgba(255, 255, 255, 0.5);
+    display: block;
 
     img {
         width: 24px;

diff --git a/public/less/core/popup.less b/public/less/core/popup.less
@@ -15,6 +15,7 @@ body {
             font-size: 24px;
             font-weight: lighter;
             color: rgba(255, 255, 255, 0.5);
+            display: block;
 
             img {
                 width: 24px;

diff --git a/views/account/index.html b/views/account/index.html
@@ -17,5 +17,5 @@
         </div>
     </div>
 </div>
-<% include ../includes/dashboard/logo.html %>
+<% include ../includes/logo.html %>
 <% include ../includes/end.html %>
diff --git a/views/auth/login.html b/views/auth/login.html
@@ -1,9 +1,6 @@
 <% include ../includes/start.html %>
 <div class="popup">
-    <div class="logo">
-        <img src="/img/logo.png"/>
-        Imprint
-    </div>
+    <% include ../includes/logo.html %>
     <form action="/login/" autocomplete="off">
         <div class="header">Welcome Back!</div>
         <div class="info">

diff --git a/views/auth/register.html b/views/auth/register.html
@@ -1,9 +1,6 @@
 <% include ../includes/start.html %>
 <div class="popup">
-    <div class="logo">
-        <img src="/img/logo.png"/>
-        Imprint
-    </div>
+    <% include ../includes/logo.html %>
     <form action="/register/" autocomplete="off">
         <div class="header">Welcome to Imprint!</div>
         <div class="info">

diff --git a/views/dashboard/create.html b/views/dashboard/create.html
@@ -1,9 +1,6 @@
 <% include ../includes/start.html %>
 <div class="popup">
-    <div class="logo">
-        <img src="/img/logo.png"/>
-        Imprint
-    </div>
+    <% include ../includes/logo.html %>
     <form action="/dashboard/create/" autocomplete="off">
         <div class="header">
             <% if(!forced) { %>

diff --git a/views/dashboard/index.html b/views/dashboard/index.html
@@ -32,5 +32,5 @@
         </div>
     </div>
 </div>
-<% include ../includes/dashboard/logo.html %>
+<% include ../includes/logo.html %>
 <% include ../includes/end.html %>
diff --git a/views/includes/logo.html b/views/includes/logo.html
@@ -0,0 +1,4 @@
+<a href="/" class="logo">
+    <img src="/img/logo.png"/>
+    Imprint
+</a>