From b1f267ee18e910258acf8e80d2655bf1a8c54420 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 30 May 2015 22:48:49 -0300
Subject: [PATCH 01/10] Init avatar selection

---
 .meteor/packages                          |  2 ++
 client/routes/router.coffee               |  4 +++
 client/views/avatar/avatar.coffee         | 13 +++++++
 client/views/avatar/avatar.html           | 30 ++++++++++++++++
 server/methods/getAvatarSuggestion.coffee | 44 +++++++++++++++++++++++
 5 files changed, 93 insertions(+)
 create mode 100644 client/views/avatar/avatar.coffee
 create mode 100644 client/views/avatar/avatar.html
 create mode 100644 server/methods/getAvatarSuggestion.coffee

diff --git a/.meteor/packages b/.meteor/packages
index 7121f27ba09eb..ab159c30eb852 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -45,3 +45,5 @@ percolate:migrations
 underscorestring:underscore.string
 meteorhacks:kadira
 yasaricli:slugify
+jparker:gravatar
+http
diff --git a/client/routes/router.coffee b/client/routes/router.coffee
index d63a896904657..3a77ba6d80264 100644
--- a/client/routes/router.coffee
+++ b/client/routes/router.coffee
@@ -29,6 +29,10 @@ Router.onBeforeAction ->
 		this.layout('usernameLayout')
 		return this.render('usernamePrompt')
 
+	if Meteor.userId()? and not Meteor.user().avatarOrigin?
+		this.layout('usernameLayout')
+		return this.render('avatarPrompt')
+
 	this.next()
 , {
 	except: ['login']
diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
new file mode 100644
index 0000000000000..680169ee1d9c6
--- /dev/null
+++ b/client/views/avatar/avatar.coffee
@@ -0,0 +1,13 @@
+Template.avatarPrompt.onCreated ->
+	self = this
+	self.suggestions = new ReactiveVar
+
+	Meteor.call 'getAvatarSuggestion', (error, avatars) ->
+		self.suggestions.set
+			ready: true
+			avatars: avatars
+
+
+Template.avatarPrompt.helpers
+	suggestions: ->
+		return Template.instance().suggestions.get()
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
new file mode 100644
index 0000000000000..1d4ef12bd7e47
--- /dev/null
+++ b/client/views/avatar/avatar.html
@@ -0,0 +1,30 @@
+<template name="avatarPrompt">
+	<form id="login-card" method='/'>
+		<div class="fields">
+			<h2>Selecione um avatar</h2>
+		</div>
+		<div class="fields">
+			<div class='input-text active'>
+				<div class='field'>
+					{{#if suggestions.ready}}
+						{{#each suggestions.avatars}}
+							<div>
+								{{service}}
+								<div style="background-image: url({{blob}}); height: 50px; width: 50px; background-size: cover;">
+								</div>
+							</div>
+						{{/each}}
+					{{else}}
+						{{_ "usernameRegistration.Loading_suggestion"}}
+					{{/if}}
+				</div>
+			</div>
+		</div>
+
+		{{#if username.ready}}
+			<div class="submit">
+				<button data-loading-text="{{_ "general.Please_wait"}}..." class='button primary login'><span>{{_ "usernameRegistration.Use_this_username"}}</span></button>
+			</div>
+		{{/if}}
+	</form>
+</template>
diff --git a/server/methods/getAvatarSuggestion.coffee b/server/methods/getAvatarSuggestion.coffee
new file mode 100644
index 0000000000000..d765a231cacab
--- /dev/null
+++ b/server/methods/getAvatarSuggestion.coffee
@@ -0,0 +1,44 @@
+Meteor.methods
+	getAvatarSuggestion: ->
+		if not Meteor.userId()
+			throw new Meteor.Error 203, '[methods] typingStatus -> Usuário não logado'
+
+		user = Meteor.user()
+
+		avatars = []
+
+		if user.services.facebook?.id?
+			avatars.push
+				service: 'facebook'
+				url: "https://graph.facebook.com/#{user.services.facebook.id}/picture?type=large"
+
+		if user.services.google?.picture?
+			avatars.push
+				service: 'google'
+				url: user.services.google.picture
+
+		if user.services.github?.username?
+			avatars.push
+				service: 'github'
+				url: "https://avatars.githubusercontent.com/#{user.services.github.username}?s=200"
+
+		if user.emails?.length > 0
+			for email in user.emails when email.verified is true
+				avatars.push
+					service: 'gravatar'
+					url: Gravatar.imageUrl email.address
+
+		validAvatars = []
+		for avatar in avatars
+			try
+				result = HTTP.get avatar.url, npmRequestOptions: {encoding: null}
+				if result.statusCode is 200
+					blob = "data:#{result.headers['content-type']};base64,"
+					binary = new Buffer(result.content, 'binary')
+					blob += binary.toString('base64')
+					avatar.blob = blob
+					validAvatars.push avatar
+			catch e
+				# ...
+
+		return validAvatars

From 46913ff94a19fc7a0bdea18d64318b07854aee17 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 12:19:02 -0300
Subject: [PATCH 02/10] Improve interface to select avatar

---
 client/stylesheets/base.less              | 18 ++++++++
 client/views/avatar/avatar.html           | 54 ++++++++++++++++++-----
 server/methods/getAvatarSuggestion.coffee |  9 ++--
 3 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index caf913d39ebc7..ded42ba0620f8 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -2666,6 +2666,24 @@ a.github-fork {
 	}
 }
 
+.avatar-suggestion-item {
+	height: 80px;
+	margin: 10px 0px;
+	text-align: left;
+
+	> div {
+		height: 80px;
+		width: 80px;
+		background-size: cover;
+		display: inline-block;
+		border: 1px solid #DDD;
+	}
+	button {
+		display: inline-block;
+		top: -33px;
+	}
+}
+
 @media all and(max-width: 1100px) {
 	#rocket-chat {
 		.flex-opened {
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index 1d4ef12bd7e47..68c5ef9139517 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -1,3 +1,23 @@
+<template name="avatarSuggestion">
+	{{#if .}}
+		<div class="avatar-suggestion-item">
+			<div style="background-image: url({{blob}});">
+			</div>
+			<button class="button primary">Use {{service}} avatar</button>
+		</div>
+	{{/if}}
+</template>
+
+<template name="avatarSuggestionLogin">
+	{{#if .}}
+		<div class="avatar-suggestion-item">
+			<div style="background-image: url();">
+			</div>
+			<button class="button primary">Login with {{.}}</button>
+		</div>
+	{{/if}}
+</template>
+
 <template name="avatarPrompt">
 	<form id="login-card" method='/'>
 		<div class="fields">
@@ -6,17 +26,29 @@ <h2>Selecione um avatar</h2>
 		<div class="fields">
 			<div class='input-text active'>
 				<div class='field'>
-					{{#if suggestions.ready}}
-						{{#each suggestions.avatars}}
-							<div>
-								{{service}}
-								<div style="background-image: url({{blob}}); height: 50px; width: 50px; background-size: cover;">
-								</div>
-							</div>
-						{{/each}}
-					{{else}}
-						{{_ "usernameRegistration.Loading_suggestion"}}
-					{{/if}}
+					<div class="avatar-suggestions">
+						{{#if suggestions.ready}}
+							{{> avatarSuggestion suggestions.avatars.gravatar}}
+							{{> avatarSuggestion suggestions.avatars.facebook}}
+							{{> avatarSuggestion suggestions.avatars.google}}
+							{{> avatarSuggestion suggestions.avatars.github}}
+
+							{{#unless suggestions.avatars.gravatar}}
+								{{> avatarSuggestionLogin 'gravatar'}}
+							{{/unless}}
+							{{#unless suggestions.avatars.facebook}}
+								{{> avatarSuggestionLogin 'facebook'}}
+							{{/unless}}
+							{{#unless suggestions.avatars.google}}
+								{{> avatarSuggestionLogin 'google'}}
+							{{/unless}}
+							{{#unless suggestions.avatars.github}}
+								{{> avatarSuggestionLogin 'github'}}
+							{{/unless}}
+						{{else}}
+							{{_ "usernameRegistration.Loading_suggestion"}}
+						{{/if}}
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/server/methods/getAvatarSuggestion.coffee b/server/methods/getAvatarSuggestion.coffee
index d765a231cacab..dcb169577f1d2 100644
--- a/server/methods/getAvatarSuggestion.coffee
+++ b/server/methods/getAvatarSuggestion.coffee
@@ -28,16 +28,15 @@ Meteor.methods
 					service: 'gravatar'
 					url: Gravatar.imageUrl email.address
 
-		validAvatars = []
+		validAvatars = {}
 		for avatar in avatars
 			try
 				result = HTTP.get avatar.url, npmRequestOptions: {encoding: null}
 				if result.statusCode is 200
-					blob = "data:#{result.headers['content-type']};base64,"
-					binary = new Buffer(result.content, 'binary')
-					blob += binary.toString('base64')
+					blob = "data:#{result.headers['content-type']};base64," 
+					blob += Buffer(result.content, 'binary').toString('base64')
 					avatar.blob = blob
-					validAvatars.push avatar
+					validAvatars[avatar.service] = avatar
 			catch e
 				# ...
 

From 2496118a4639de517de4cc954cfe28014b8ef56f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 17:31:33 -0300
Subject: [PATCH 03/10] Upload working

---
 .meteor/packages                  |  2 ++
 .meteor/versions                  | 17 +++++++++++++++++
 client/views/avatar/avatar.coffee | 25 +++++++++++++++++++++++++
 client/views/avatar/avatar.html   |  5 +++--
 lib/file.coffee                   | 16 ++++++++++++++++
 5 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 lib/file.coffee

diff --git a/.meteor/packages b/.meteor/packages
index ab159c30eb852..191db1dbd7bba 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -47,3 +47,5 @@ meteorhacks:kadira
 yasaricli:slugify
 jparker:gravatar
 http
+cfs:filesystem
+cfs:standard-packages
diff --git a/.meteor/versions b/.meteor/versions
index 77aef5ad40b97..7b3235323a358 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -13,7 +13,23 @@ blaze@2.1.2
 blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
+cfs:access-point@0.1.49
+cfs:base-package@0.0.30
+cfs:collection@0.5.5
+cfs:collection-filters@0.2.4
+cfs:data-man@0.0.6
+cfs:file@0.1.17
+cfs:filesystem@0.1.2
 cfs:http-methods@0.0.29
+cfs:http-publish@0.0.13
+cfs:power-queue@0.9.11
+cfs:reactive-list@0.0.9
+cfs:reactive-property@0.0.4
+cfs:standard-packages@0.5.9
+cfs:storage-adapter@0.2.2
+cfs:tempstore@0.1.5
+cfs:upload-http@0.0.20
+cfs:worker@0.1.4
 check@1.0.5
 chrismbeckett:toastr@2.1.0
 coffeescript@1.0.6
@@ -83,6 +99,7 @@ ordered-dict@1.0.3
 percolate:migrations@0.7.5
 percolatestudio:synced-cron@1.1.0
 qnub:emojione@0.0.3
+raix:eventemitter@0.1.2
 raix:handlebar-helpers@0.2.4
 random@1.0.3
 reactive-dict@1.1.0
diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
index 680169ee1d9c6..c48d89aaa1017 100644
--- a/client/views/avatar/avatar.coffee
+++ b/client/views/avatar/avatar.coffee
@@ -11,3 +11,28 @@ Template.avatarPrompt.onCreated ->
 Template.avatarPrompt.helpers
 	suggestions: ->
 		return Template.instance().suggestions.get()
+
+
+Template.avatarPrompt.events
+	'click .select-service': (e) ->
+		username = Meteor.user().username
+		file = new FS.File(this.blob)
+		file.attachData this.blob, (error) ->
+			if error?
+				console.log error
+			else
+				file.name(username)
+				Images.insert file, (err, fileObj) ->
+					console.log arguments
+
+	'change .myFileInput': (event, template) ->
+		username = Meteor.user().username
+		FS.Utility.eachFile event, (blob) ->
+			file = new FS.File(blob)
+			file.attachData blob, (error) ->
+				if error?
+					console.log error
+				else
+					file.name(username)
+					Images.insert file, (err, fileObj) ->
+						console.log arguments
\ No newline at end of file
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index 68c5ef9139517..e5525f970e9ea 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -3,7 +3,7 @@
 		<div class="avatar-suggestion-item">
 			<div style="background-image: url({{blob}});">
 			</div>
-			<button class="button primary">Use {{service}} avatar</button>
+			<button type="button" class="button primary select-service">Use {{service}} avatar</button>
 		</div>
 	{{/if}}
 </template>
@@ -13,7 +13,7 @@
 		<div class="avatar-suggestion-item">
 			<div style="background-image: url();">
 			</div>
-			<button class="button primary">Login with {{.}}</button>
+			<button type="button" class="button primary">Login with {{.}}</button>
 		</div>
 	{{/if}}
 </template>
@@ -48,6 +48,7 @@ <h2>Selecione um avatar</h2>
 						{{else}}
 							{{_ "usernameRegistration.Loading_suggestion"}}
 						{{/if}}
+						<input type="file" class="myFileInput">
 					</div>
 				</div>
 			</div>
diff --git a/lib/file.coffee b/lib/file.coffee
new file mode 100644
index 0000000000000..b91bdee6a21ce
--- /dev/null
+++ b/lib/file.coffee
@@ -0,0 +1,16 @@
+store = new FS.Store.FileSystem "images",
+	path: "~/uploads"
+	fileKeyMaker: (fileObj) ->
+		filename = fileObj.name()
+		filenameInStore = fileObj.name({store: 'images'})
+
+		return filenameInStore || filename
+
+@Images = new FS.Collection "images",
+	stores: [store]
+
+@Images.allow
+	insert: ->
+		return true
+	update: ->
+		return true
\ No newline at end of file

From d6d5dfda25c15bcca78a807c99843c63fbe5b31a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 18:00:05 -0300
Subject: [PATCH 04/10] Move avatar upload to server side

---
 client/views/avatar/avatar.coffee          | 25 ++++++----------------
 client/views/avatar/avatar.html            |  3 ++-
 server/methods/setAvatarFromService.coffee | 14 ++++++++++++
 server/publications.coffee                 |  1 +
 4 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 server/methods/setAvatarFromService.coffee

diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
index c48d89aaa1017..153cc4f84dc5e 100644
--- a/client/views/avatar/avatar.coffee
+++ b/client/views/avatar/avatar.coffee
@@ -15,24 +15,13 @@ Template.avatarPrompt.helpers
 
 Template.avatarPrompt.events
 	'click .select-service': (e) ->
-		username = Meteor.user().username
-		file = new FS.File(this.blob)
-		file.attachData this.blob, (error) ->
-			if error?
-				console.log error
-			else
-				file.name(username)
-				Images.insert file, (err, fileObj) ->
-					console.log arguments
+		Meteor.call 'setAvatarFromService', this.blob, this.service, ->
+			console.log arguments
 
 	'change .myFileInput': (event, template) ->
-		username = Meteor.user().username
 		FS.Utility.eachFile event, (blob) ->
-			file = new FS.File(blob)
-			file.attachData blob, (error) ->
-				if error?
-					console.log error
-				else
-					file.name(username)
-					Images.insert file, (err, fileObj) ->
-						console.log arguments
\ No newline at end of file
+			reader = new FileReader()
+			reader.readAsDataURL(blob)
+			reader.onloadend = ->
+				Meteor.call 'setAvatarFromService', reader.result, 'upload', ->
+					console.log arguments
\ No newline at end of file
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index e5525f970e9ea..f9dc1aa9d8692 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -45,10 +45,11 @@ <h2>Selecione um avatar</h2>
 							{{#unless suggestions.avatars.github}}
 								{{> avatarSuggestionLogin 'github'}}
 							{{/unless}}
+
+							<input type="file" class="myFileInput">
 						{{else}}
 							{{_ "usernameRegistration.Loading_suggestion"}}
 						{{/if}}
-						<input type="file" class="myFileInput">
 					</div>
 				</div>
 			</div>
diff --git a/server/methods/setAvatarFromService.coffee b/server/methods/setAvatarFromService.coffee
new file mode 100644
index 0000000000000..948cb37a51003
--- /dev/null
+++ b/server/methods/setAvatarFromService.coffee
@@ -0,0 +1,14 @@
+Meteor.methods
+	setAvatarFromService: (image, service) ->
+		if not Meteor.userId()
+			throw new Meteor.Error 203, '[methods] typingStatus -> Usuário não logado'
+
+		user = Meteor.user()
+
+		file = new FS.File image
+		file.attachData image, ->
+			file.name user.username
+
+			Images.insert file, (err, fileObj) ->
+				Meteor.users.update {_id: user._id}, {$set: {avatarOrigin: service}}
+
diff --git a/server/publications.coffee b/server/publications.coffee
index 1cc7d27137d5c..0bbf5a4c5e190 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -12,6 +12,7 @@ Meteor.publish 'userData', ->
 			status: 1
 			statusDefault: 1
 			statusConnection: 1
+			avatarOrigin: 1
 			emails: 1
 			'services.facebook.id': 1
 			'services.google.picture': 1

From f949753b9ddda0764fcdbbed5c9511567a69aaf4 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 18:29:44 -0300
Subject: [PATCH 05/10] Add upload preview

---
 client/stylesheets/base.less      | 12 ++++++++++++
 client/views/avatar/avatar.coffee |  9 +++++++--
 client/views/avatar/avatar.html   | 13 ++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 3bae95dbe49a3..9a4a5b776a55c 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -2691,6 +2691,18 @@ a.github-fork {
 		display: inline-block;
 		top: -33px;
 	}
+	input[type=file] {
+		position: absolute !important;
+		width: 100%;
+		top: 0;
+		left: 0;
+		height: 100%;
+		opacity: 0;
+		z-index: 10000;
+		* {
+			cursor: pointer;
+		}
+	}
 }
 
 @media all and(max-width: 1100px) {
diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
index 153cc4f84dc5e..ea7ace64e7e12 100644
--- a/client/views/avatar/avatar.coffee
+++ b/client/views/avatar/avatar.coffee
@@ -1,6 +1,7 @@
 Template.avatarPrompt.onCreated ->
 	self = this
 	self.suggestions = new ReactiveVar
+	self.upload = new ReactiveVar
 
 	Meteor.call 'getAvatarSuggestion', (error, avatars) ->
 		self.suggestions.set
@@ -12,6 +13,9 @@ Template.avatarPrompt.helpers
 	suggestions: ->
 		return Template.instance().suggestions.get()
 
+	upload: ->
+		return Template.instance().upload.get()
+
 
 Template.avatarPrompt.events
 	'click .select-service': (e) ->
@@ -23,5 +27,6 @@ Template.avatarPrompt.events
 			reader = new FileReader()
 			reader.readAsDataURL(blob)
 			reader.onloadend = ->
-				Meteor.call 'setAvatarFromService', reader.result, 'upload', ->
-					console.log arguments
\ No newline at end of file
+				template.upload.set
+					service: 'upload'
+					blob: reader.result
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index f9dc1aa9d8692..b5d82975e2bec 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -46,7 +46,18 @@ <h2>Selecione um avatar</h2>
 								{{> avatarSuggestionLogin 'github'}}
 							{{/unless}}
 
-							<input type="file" class="myFileInput">
+							<div class="avatar-suggestion-item">
+								<div style="background-image: url({{upload.blob}});">
+								</div>
+								{{#with upload}}
+									<button type="button" class="button primary select-service">Use uploaded avatar</button>
+								{{/with}}
+								{{#unless upload}}
+									<button type="button" class="button primary">Select file
+										<input type="file" class="myFileInput">
+									</button>
+								{{/unless}}
+							</div>
 						{{else}}
 							{{_ "usernameRegistration.Loading_suggestion"}}
 						{{/if}}

From a29e3c10a45878b4aa71c80f2348f85299c7b595 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 18:40:13 -0300
Subject: [PATCH 06/10] Improve design

---
 client/stylesheets/base.less    | 13 ++++++++++++-
 client/views/avatar/avatar.html |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 9a4a5b776a55c..a01fef8d9b0ab 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -2686,10 +2686,21 @@ a.github-fork {
 		background-size: cover;
 		display: inline-block;
 		border: 1px solid #DDD;
+		font-size: 80px;
+		text-align: center;
+		line-height: 80px;
+		background-color: #EEE;
+		color: #CCC;
+		&.question-mark:before {
+			content: "?";
+			position: absolute;
+			left: 0;
+			width: 80px;
+		}
 	}
 	button {
 		display: inline-block;
-		top: -33px;
+		top: -35px;
 	}
 	input[type=file] {
 		position: absolute !important;
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index b5d82975e2bec..1aee7b90883e7 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -11,7 +11,7 @@
 <template name="avatarSuggestionLogin">
 	{{#if .}}
 		<div class="avatar-suggestion-item">
-			<div style="background-image: url();">
+			<div class="question-mark">
 			</div>
 			<button type="button" class="button primary">Login with {{.}}</button>
 		</div>
@@ -47,7 +47,7 @@ <h2>Selecione um avatar</h2>
 							{{/unless}}
 
 							<div class="avatar-suggestion-item">
-								<div style="background-image: url({{upload.blob}});">
+								<div style="background-image: url({{upload.blob}});" class="{{#unless upload}}question-mark{{/unless}}">
 								</div>
 								{{#with upload}}
 									<button type="button" class="button primary select-service">Use uploaded avatar</button>

From bd4161bd47273c7b76fe3db861cee1524d754e05 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 18:52:07 -0300
Subject: [PATCH 07/10] Add social logins in avatar

---
 client/views/avatar/avatar.coffee | 29 +++++++++++++++++++++++++----
 client/views/avatar/avatar.html   |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
index ea7ace64e7e12..7580440909eaa 100644
--- a/client/views/avatar/avatar.coffee
+++ b/client/views/avatar/avatar.coffee
@@ -3,10 +3,14 @@ Template.avatarPrompt.onCreated ->
 	self.suggestions = new ReactiveVar
 	self.upload = new ReactiveVar
 
-	Meteor.call 'getAvatarSuggestion', (error, avatars) ->
-		self.suggestions.set
-			ready: true
-			avatars: avatars
+	self.getSuggestions = ->
+		self.suggestions.set undefined
+		Meteor.call 'getAvatarSuggestion', (error, avatars) ->
+			self.suggestions.set
+				ready: true
+				avatars: avatars
+
+	self.getSuggestions()
 
 
 Template.avatarPrompt.helpers
@@ -22,6 +26,23 @@ Template.avatarPrompt.events
 		Meteor.call 'setAvatarFromService', this.blob, this.service, ->
 			console.log arguments
 
+	'click .login-with-service': (event, template) ->
+		loginWithService = "loginWith#{_.capitalize(this)}"
+
+		serviceConfig = {}
+
+		Meteor[loginWithService] serviceConfig, (error) ->
+			if error?.error is 'github-no-public-email'
+				alert t("loginServices.github_no_public_email")
+				return
+
+			console.log error
+			if error?
+				toastr.error error.message
+				return
+
+			template.getSuggestions()
+
 	'change .myFileInput': (event, template) ->
 		FS.Utility.eachFile event, (blob) ->
 			reader = new FileReader()
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index 1aee7b90883e7..9c393dfec7bcf 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -13,7 +13,7 @@
 		<div class="avatar-suggestion-item">
 			<div class="question-mark">
 			</div>
-			<button type="button" class="button primary">Login with {{.}}</button>
+			<button type="button" class="button primary login-with-service">Login with {{.}}</button>
 		</div>
 	{{/if}}
 </template>

From 8e86b71297e793f33db815970f2f7215d76bf236 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@konecty.com>
Date: Sun, 31 May 2015 18:59:08 -0300
Subject: [PATCH 08/10] Translations to avatar

---
 client/views/avatar/avatar.html | 10 +++++-----
 i18n/en.i18n.json               |  7 +++++++
 i18n/pt.i18n.json               |  7 +++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index 1aee7b90883e7..56b397299e588 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -3,7 +3,7 @@
 		<div class="avatar-suggestion-item">
 			<div style="background-image: url({{blob}});">
 			</div>
-			<button type="button" class="button primary select-service">Use {{service}} avatar</button>
+			<button type="button" class="button primary select-service">{{_ "avatar.Use_service_avatar" service}}</button>
 		</div>
 	{{/if}}
 </template>
@@ -13,7 +13,7 @@
 		<div class="avatar-suggestion-item">
 			<div class="question-mark">
 			</div>
-			<button type="button" class="button primary">Login with {{.}}</button>
+			<button type="button" class="button primary">{{_ "avatar.Login_with" .}}</button>
 		</div>
 	{{/if}}
 </template>
@@ -21,7 +21,7 @@
 <template name="avatarPrompt">
 	<form id="login-card" method='/'>
 		<div class="fields">
-			<h2>Selecione um avatar</h2>
+			<h2>{{_ "avatar.Select_an_avatar"}}</h2>
 		</div>
 		<div class="fields">
 			<div class='input-text active'>
@@ -50,10 +50,10 @@ <h2>Selecione um avatar</h2>
 								<div style="background-image: url({{upload.blob}});" class="{{#unless upload}}question-mark{{/unless}}">
 								</div>
 								{{#with upload}}
-									<button type="button" class="button primary select-service">Use uploaded avatar</button>
+									<button type="button" class="button primary select-service">{{_ "avatar.Use_uploaded_avatar"}}</button>
 								{{/with}}
 								{{#unless upload}}
-									<button type="button" class="button primary">Select file
+									<button type="button" class="button primary">{{_ "avatar.Select_file"}}
 										<input type="file" class="myFileInput">
 									</button>
 								{{/unless}}
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 0d32ed6de46eb..5aa0345a91d82 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -149,5 +149,12 @@
 	},
 	"error": {
 		"Not_found_or_not_allowed": "Not Found or Not Allowed"
+	},
+	"avatar": {
+		"Use_service_avatar": "Use %s avatar",
+		"Login_with": "Login with %s",
+		"Select_an_avatar": "Select an avatar",
+		"Use_uploaded_avatar": "Use uploaded avatar",
+		"Select_file": "Select file"
 	}
 }
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index 08cc1369f7938..105cedb160d0e 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -149,5 +149,12 @@
 	},
 	"error": {
 		"Not_found_or_not_allowed": "Não encontrado ou não permitido"
+	},
+	"avatar": {
+		"Use_service_avatar": "Use o avatar de %s",
+		"Login_with": "Login com %s",
+		"Select_an_avatar": "Selecione um avatar",
+		"Use_uploaded_avatar": "Use o avatar de upload",
+		"Select_file": "Selecione um arquivo"
 	}
 }

From bcf6b344136539710835f6968962fe9b3ae60ea7 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 20:09:19 -0300
Subject: [PATCH 09/10] Create url for avatar download

---
 lib/file.coffee | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/lib/file.coffee b/lib/file.coffee
index b91bdee6a21ce..7ec3d53593194 100644
--- a/lib/file.coffee
+++ b/lib/file.coffee
@@ -1,5 +1,7 @@
+uploadPath = "~/uploads"
+
 store = new FS.Store.FileSystem "images",
-	path: "~/uploads"
+	path: uploadPath
 	fileKeyMaker: (fileObj) ->
 		filename = fileObj.name()
 		filenameInStore = fileObj.name({store: 'images'})
@@ -13,4 +15,26 @@ store = new FS.Store.FileSystem "images",
 	insert: ->
 		return true
 	update: ->
-		return true
\ No newline at end of file
+		return true
+	download: ->
+		return true
+
+Meteor.startup ->
+	if Meteor.isServer
+		FS.HTTP.mount ['/avatar/:filename'], ->
+			self = this
+			opts = FS.Utility.extend({}, self.query || {}, self.params || {})
+
+			collectionName = opts.collectionName
+
+			collection = FS._collections['images']
+
+			file = if collection? then collection.findOne({ "copies.images.key": opts.filename }) else null
+
+			return {
+				collection: collection
+				file: file
+				storeName: 'images'
+				download: opts.download
+				filename: opts.filename
+			}

From 01122aadabddf5b75ef7d58c27e97175b97c1af6 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 31 May 2015 20:11:01 -0300
Subject: [PATCH 10/10] Rename image to avatars

---
 lib/file.coffee                            | 14 +++++++-------
 server/methods/setAvatarFromService.coffee |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/file.coffee b/lib/file.coffee
index 7ec3d53593194..589f03e744de6 100644
--- a/lib/file.coffee
+++ b/lib/file.coffee
@@ -1,17 +1,17 @@
 uploadPath = "~/uploads"
 
-store = new FS.Store.FileSystem "images",
+store = new FS.Store.FileSystem "avatars",
 	path: uploadPath
 	fileKeyMaker: (fileObj) ->
 		filename = fileObj.name()
-		filenameInStore = fileObj.name({store: 'images'})
+		filenameInStore = fileObj.name({store: 'avatars'})
 
 		return filenameInStore || filename
 
-@Images = new FS.Collection "images",
+@Avatars = new FS.Collection "avatars",
 	stores: [store]
 
-@Images.allow
+@Avatars.allow
 	insert: ->
 		return true
 	update: ->
@@ -27,14 +27,14 @@ Meteor.startup ->
 
 			collectionName = opts.collectionName
 
-			collection = FS._collections['images']
+			collection = FS._collections['avatars']
 
-			file = if collection? then collection.findOne({ "copies.images.key": opts.filename }) else null
+			file = if collection? then collection.findOne({ "copies.avatars.key": opts.filename }) else null
 
 			return {
 				collection: collection
 				file: file
-				storeName: 'images'
+				storeName: 'avatars'
 				download: opts.download
 				filename: opts.filename
 			}
diff --git a/server/methods/setAvatarFromService.coffee b/server/methods/setAvatarFromService.coffee
index 948cb37a51003..7f851d9bbc4e0 100644
--- a/server/methods/setAvatarFromService.coffee
+++ b/server/methods/setAvatarFromService.coffee
@@ -9,6 +9,6 @@ Meteor.methods
 		file.attachData image, ->
 			file.name user.username
 
-			Images.insert file, (err, fileObj) ->
+			Avatars.insert file, (err, fileObj) ->
 				Meteor.users.update {_id: user._id}, {$set: {avatarOrigin: service}}