From 1803ca06d394949ababd2a80c6e9a3585c9be1d6 Mon Sep 17 00:00:00 2001 From: cleverbeagle Date: Thu, 7 Sep 2017 10:59:21 -0500 Subject: [PATCH] improve ux on edit profile view for OAuth users --- imports/ui/pages/Profile/Profile.js | 11 +++++- imports/ui/pages/Profile/Profile.scss | 51 +++++++++++++++------------ public/facebook.svg | 13 +++++++ public/github.svg | 29 +++++++++++++++ public/google.svg | 15 ++++++++ 5 files changed, 96 insertions(+), 23 deletions(-) create mode 100644 public/facebook.svg create mode 100644 public/github.svg create mode 100644 public/google.svg diff --git a/imports/ui/pages/Profile/Profile.js b/imports/ui/pages/Profile/Profile.js index 321e62c..f8c5684 100644 --- a/imports/ui/pages/Profile/Profile.js +++ b/imports/ui/pages/Profile/Profile.js @@ -116,8 +116,17 @@ class Profile extends React.Component { return !loading ? (
{Object.keys(user.services).map(service => (
-
+ {service}

{`You're logged in with ${_.capitalize(service)} using the email address ${user.services[service].email}.`}

+
))}
) :
; diff --git a/imports/ui/pages/Profile/Profile.scss b/imports/ui/pages/Profile/Profile.scss index c1a8971..84b579f 100644 --- a/imports/ui/pages/Profile/Profile.scss +++ b/imports/ui/pages/Profile/Profile.scss @@ -2,38 +2,45 @@ .OAuthProfile { .LoggedInWith { - padding: 10px 20px; + padding: 20px; border-radius: 3px; color: #fff; + border: 1px solid $gray-lighter; + text-align: center; + + img { + width: 100px; + } + + &.github img { + width: 125px; + } p { - margin: 0; + margin: 20px 0 0 0; + color: $gray-light; } - .ServiceIcon { - float: left; - width: auto; - margin-right: 15px; - height: 30px; - text-align: center; + .btn { + margin-top: 20px; - i { - font-size: 30px; - position: relative; - top: 5px; + &.btn-facebook { + background: $facebook; + border-color: $facebook; + color: #fff; } - } - &.facebook { - background: $facebook; - } + &.btn-google { + background: $google; + border-color: $google; + color: #fff; + } - &.github { - background: $github; - } - - &.google { - background: $google; + &.btn-github { + background: $github; + border-color: $github; + color: #fff; + } } } } diff --git a/public/facebook.svg b/public/facebook.svg new file mode 100644 index 0000000..d8a6181 --- /dev/null +++ b/public/facebook.svg @@ -0,0 +1,13 @@ + + + + facebook-icon + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/public/github.svg b/public/github.svg new file mode 100644 index 0000000..ace7635 --- /dev/null +++ b/public/github.svg @@ -0,0 +1,29 @@ + + + + github-octocat + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/google.svg b/public/google.svg new file mode 100644 index 0000000..67dec77 --- /dev/null +++ b/public/google.svg @@ -0,0 +1,15 @@ + + + + google-icon + Created with Sketch. + + + + + + + + + + \ No newline at end of file