A bit of cleaning

eprochasson · Jul 10, 2013 · e85c636 · e85c636
1 parent 8fc5ac6
commit e85c636
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 278 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .idea/
+client/helpers/main.config.js
diff --git a/[object Object] b/[object Object]
diff --git a/client/helpers/config.js b/client/helpers/config.js
diff --git a/client/helpers/config.sample b/client/helpers/config.sample
@@ -0,0 +1,9 @@
+console.log('loading sample config');
+
+Accounts.ui.config({
+    passwordSignupFields: 'EMAIL_ONLY'
+});
+
+Meteor.setLocale('en_GB');
+
+filePickerKey = "Av2HCAqJSM2aHdX5yKTZtz";
diff --git a/client/helpers/errors.js b/client/helpers/errors.js
diff --git a/client/helpers/router.js b/client/helpers/router.js
@@ -21,21 +21,6 @@ Meteor.Router.add({
         and: function(id){ Session.set('currentUserProfile', id);}
     },
     '/settings': 'settings',
-    '/images/:_id': function(id){
-        console.log(id);
-
-
-        Pictures.retrieveBlob(id, function(fileItem) {
-            console.log('file', fileItem);
-            if (fileItem.blob) {
-                return fileItem.blob;
-//                saveAs(fileItem.blob, fileItem.filename);
-            } else {
-                return fileItem.file;
-//                saveAs(fileItem.file, fileItem.filename);
-            }
-        });
-    },
     '*': 'p404'
 });
 

diff --git a/client/helpers/user.js b/client/helpers/user.js
diff --git a/client/views/editProfile/editProfile.html b/client/views/editProfile/editProfile.html
diff --git a/client/views/front/login.html b/client/views/front/login.html
diff --git a/client/views/front/login.js b/client/views/front/login.js
diff --git a/client/views/front/register.html b/client/views/front/register.html
diff --git a/client/views/front/register.js b/client/views/front/register.js
diff --git a/client/views/includes/errors.html b/client/views/includes/errors.html
diff --git a/client/views/includes/errors.js b/client/views/includes/errors.js
diff --git a/client/views/profile/profile_picture.html b/client/views/profile/profile_picture.html
diff --git a/client/views/profile/profile_pictures.js b/client/views/profile/profile_pictures.js
@@ -10,7 +10,6 @@ Template.profile_pictures.helpers({
         }
     },
     thumbnail50x50: function(){
-        console.log('fileHandler', this.fileHandler);
         if(this.fileHandler && this.fileHandler.thumbnail50x50){
             return this.fileHandler.thumbnail50x50.url;
         } else {

diff --git a/collections/conversations.js b/collections/conversations.js
diff --git a/lib/forms.js b/lib/forms.js
diff --git a/lib/users.js b/lib/users.js
diff --git a/public/uploads/20130530_131826.jpg b/public/uploads/20130530_131826.jpg
diff --git a/public/uploads/bob.jpg b/public/uploads/bob.jpg
diff --git a/public/uploads/brainteaser-cadre.png b/public/uploads/brainteaser-cadre.png
diff --git a/server/user.js b/server/user.js