From 29db5c8c29c157503b1411c9bb10cf1866baa85c Mon Sep 17 00:00:00 2001 From: nickago Date: Fri, 24 Jul 2015 14:41:42 -0700 Subject: [PATCH 01/31] Removed popover on channel name and added ability to set channel descritption for 1-1 channels --- web/react/components/channel_header.jsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 7a129f2005..76dbe370b5 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -153,7 +153,7 @@ module.exports = React.createClass({ if (isDirect) { if (this.state.users.length > 1) { var contact = this.state.users[((this.state.users[0].id === currentId) ? 1 : 0)]; - channelTitle = ; + channelTitle = contact.nickname || contact.username; } } @@ -161,13 +161,13 @@ module.exports = React.createClass({ From 52bf726ddfaa0d5010ce7a80fe1f03a485df9279 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 24 Jul 2015 14:13:19 -0700 Subject: [PATCH 02/31] Fixes issue with images not displaying due to window.origin not being defined in IE10 --- web/react/components/file_preview.jsx | 2 +- web/react/components/post_body.jsx | 4 ++-- web/react/components/post_right.jsx | 4 ++-- web/react/components/view_image.jsx | 6 +++--- web/react/utils/utils.jsx | 10 ++++++++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx index fdd12feec4..7c1db3e10a 100644 --- a/web/react/components/file_preview.jsx +++ b/web/react/components/file_preview.jsx @@ -24,7 +24,7 @@ module.exports = React.createClass({ if (filename.indexOf("/api/v1/files/get") != -1) { filename = filename.split("/api/v1/files/get")[1]; } - filename = window.location.origin + "/api/v1/files/get" + filename; + filename = utils.getWindowLocationOrigin() + "/api/v1/files/get" + filename; if (type === "image") { previews.push( diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 7871f52b7d..a71fa9e8f0 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -32,7 +32,7 @@ module.exports = React.createClass({ if (fileInfo.path.indexOf("/api/v1/files/get") != -1) { fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1]; } - fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path; + fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path; if (type === "image") { $('').attr('src', fileInfo.path+'_thumb.jpg').load(function(path, name){ return function() { @@ -112,7 +112,7 @@ module.exports = React.createClass({ if (fileInfo.path.indexOf("/api/v1/files/get") != -1) { fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1]; } - fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path; + fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path; if (type === "image") { if (i < Constants.MAX_DISPLAY_FILES) { diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 567be19621..8097a181e9 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -98,7 +98,7 @@ RootPost = React.createClass({ if (fileInfo.path.indexOf("/api/v1/files/get") != -1) { fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1]; } - fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path; + fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path; if (ftype === "image") { var url = fileInfo.path.replace(re1, '%20').replace(re2, '%28').replace(re3, '%29'); @@ -208,7 +208,7 @@ CommentPost = React.createClass({ if (fileInfo.path.indexOf("/api/v1/files/get") != -1) { fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1]; } - fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path; + fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path; if (type === "image") { var url = fileInfo.path.replace(re1, '%20').replace(re2, '%28').replace(re3, '%29'); diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index c107de4d79..7b096c6298 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -40,7 +40,7 @@ module.exports = React.createClass({ if (fileInfo.path.indexOf("/api/v1/files/get") !== -1) { fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1]; } - fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path; + fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path; src = fileInfo['path'] + '_preview.jpg'; } @@ -148,7 +148,7 @@ module.exports = React.createClass({ if (info.path.indexOf("/api/v1/files/get") !== -1) { info.path = info.path.split("/api/v1/files/get")[1]; } - info.path = window.location.origin + "/api/v1/files/get" + info.path; + info.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + info.path; preview_filename = info['path'] + '_preview.jpg'; } @@ -166,7 +166,7 @@ module.exports = React.createClass({ if (download_link.indexOf("/api/v1/files/get") !== -1) { download_link = download_link.split("/api/v1/files/get")[1]; } - download_link = window.location.origin + "/api/v1/files/get" + download_link; + download_link = utils.getWindowLocationOrigin() + "/api/v1/files/get" + download_link; return ( ); @@ -461,14 +475,16 @@ SendInivtesPage = React.createClass({ return (
- -

Send Invitations

- { emails } -
-
 
- -

{"If you'd prefer, you can send invitations after you finish setting up the "+ strings.Team + "."}

-
Skip this step
+ +

Invite Team Members

+ { emails } +
Add Invitation
+
+ +

if you prefer, you can invite team members later
and skip this step for now.

+
+ Back to previous step +
); } @@ -512,19 +528,24 @@ UsernamePage = React.createClass({
-

Choose a username

-
-
-
- +

Your username

+
Select a memorable username that makes it easy for teammates to identify you:
+
+
+
+
+
Choose your username
+ +
Usernames must begin with a letter and contain 3 to 15 characters made up of lowercase letters, numbers, and the symbols '.', '-' and '_'
+
+
+ { name_error }
- { name_error } + + -

{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others."}

-

It can be made of lowercase letters and numbers.

-   -
); @@ -600,24 +621,32 @@ PasswordPage = React.createClass({
-

Choose a password

-

You'll use your email address ({this.props.state.team.email}) and password to log into {config.SiteName}.

-
-
-
- +

Your password

+
Select a password that you'll use to login with your email address:
+
+
Email
+
{this.props.state.team.email}
+
+
+
+
Choose your password
+ +
Passwords must contain 5 to 50 characters. Your password will be strongest if it contains a mix of symbols, numbers, and upper and lowercase characters.
+
+
+ { name_error }
-
- { name_error }
-   - +

By proceeding to create your account and use { config.SiteName }, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {config.SiteName}.

+
); diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index bbf1f670c2..36fa27ad74 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -104,8 +104,8 @@ module.exports = React.createClass({ var yourEmailIs = this.state.user.email == "" ? "" : Your email address is { this.state.user.email }. var email = ( -
- +
+
What's your email address?
{ email_error } @@ -124,29 +124,34 @@ module.exports = React.createClass({ return (
-

Signup to { config.SiteName }

-
- -
+
Welcome to:
+

"teamDisplayName"

+

on { config.SiteName }

+

Let's create your account

{ signup_message } - -
- - { name_error } -

Your username can be made of lowercase letters and numbers.

-

{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others"}

-
- { email } - -
- - { password_error } -
-

{ yourEmailIs } You’ll use this address to sign in to {config.SiteName}.

-
-

+
+ { email } +

{ yourEmailIs } You’ll use this address to sign in to {config.SiteName}.

+
+
Choose your username
+
+ + { name_error } +

Username must begin with a letter, and contain between 3 to 15 lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'"

+
+
+
+
Choose your password
+
+ + { password_error } +
+
+
+
+

{ server_error } -

By proceeding to create your account and use { config.SiteName }, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {config.SiteName}.

+

By creating an account and using Mattermost you are agreeing to our Terms of Service. If you do not agree, you cannot use this service.

); } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 2d78cf242d..7199346386 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -426,13 +426,15 @@ } body { &.white { - .row.content { + .inner__wrap { + >.row.content { margin-bottom: -185px; } + } } } .footer, .footer-pane, .footer-push { - height: auto; + height: 187px; } .footer-pane { .footer-link { diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 5996306d2e..1a0c55f396 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -9,65 +9,108 @@ max-width: 380px; margin: 0 auto; position: relative; + &.padding--less { + padding-top: 50px; + } + h1, h2, h3, h4, h5, h6, p { line-height: 1.3; } + + h1 { + font-weight: 600; + } + h2 { font-weight: 600; - margin-bottom: 0.5em; + margin-bottom: 0.8em; letter-spacing: -0.5px; font-size: em(30px); } + h3 { font-weight: 600; margin: 0 0 1.3em 0; font-size: 1.5em; - &.extra-margin { - margin-bottom: 2.5em; - } } + h4 { font-size: em(20px); font-weight: 600; margin-bottom: 1em; - &.text--light { - font-weight: 300; - color: #999; - } } + + h5 { + font-size: em(16px); + } + + hr { + margin: 2em 0; + } + p { color: #555; line-height: 1.5; margin-bottom: 1em; - .black, &.black { - color: #000; - } } + + .inner__content { + padding: 0 15px; + margin: 30px 0 20px; + } + + .block--gray { + background: #f2f2f2; + display: inline-block; + padding: 0.85em 1.2em; + font-weight: 600; + @include border-radius(3px); + } + form { margin-bottom: 0.8em; } + .form__hint { font-size: 0.95em; color: #999; margin: 10px 0; } - .external-link { - position: absolute; - bottom: 0; - left: 0; + + .signup-team-confirm__container { + padding: 100px 0px 100px 0px; } + + .signup-team-logo { + display: none; + width: 210px; + margin: 0 0 2em 0; + } + + .signup-team-login { + padding-bottom: 10px; + font-weight: 700; + } + .signup-team__name { + margin: 0.5em 0 0; font-size: 2.2em; font-weight: 600; + padding-left: 1rem; + } + + .signup-team__subdomain { + margin: 0.2em 0 1.2em; + font-size: 1.5em; + padding-left: 1rem; + font-weight: 300; text-transform: uppercase; } - .signup-team__subdomain { - font-size: 1.5em; - padding-left: 1em; - } + .form-control { height: em(38px); } + .or__container { height: 1px; background: #dddddd; @@ -84,6 +127,12 @@ display: inline-block; } } + + ul { + margin-bottom: 0; + padding-left: 18px; + } + .btn { padding: em(7px) em(15px); font-weight: 600; @@ -121,8 +170,8 @@ } .glyphicon { &.glyphicon-ok, &.glyphicon-refresh { - margin-right: 0.3em; - left: -5px; + margin-right: 0.5em; + left: -2px; font-size: 0.9em; } &.glyphicon-chevron-right { @@ -137,6 +186,7 @@ } } } + .has-error { .control-label { background: #f2f2f2; @@ -148,13 +198,14 @@ color: #999; width: 100%; &:before { - @extend .fa; - content: "\f071"; - margin-right: 4px; - color: #aaa; + @extend .fa; + content: "\f071"; + margin-right: 4px; + color: #aaa; } } } + .reset-form { @include border-radius(3px); position: relative; @@ -163,19 +214,49 @@ color: inherit; } } -} -.signup-team-confirm__container { - padding: 100px 0px 100px 0px; -} + // Modifier Styles + h1, h2, h3, h4, h5, h6 { + &.margin--top-none { + margin-top: 0; + } + &.margin--bottom-none { + margin-bottom: 0; + } + &.margin--less { + margin-bottom: 0.3em; + } + &.sub-heading { + font-weight: 400; + margin-bottom: 0; + } + &.color--light { + font-weight: 300; + } + } -.signup-team-logo { - display: none; - width: 210px; - margin: 0 0 2em 0; -} + p { + &.margin--extra { + margin-bottom: 1.5em; + } + &.margin--less { + margin-bottom: 0.3em; + } + .black, &.black { + color: #000; + } + } + + .color--light { + color: #777; + } + + .margin--extra { + margin-top: 3em; + } + + .margin--extra-2x { + margin-top: 6em; + } -.signup-team-login { - padding-bottom: 10px; - font-weight: 700; } diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html index b865905891..b84b8e4864 100644 --- a/web/templates/signup_team.html +++ b/web/templates/signup_team.html @@ -9,8 +9,8 @@
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html index 176ca77b14..e9f6bafcfb 100644 --- a/web/templates/signup_user_complete.html +++ b/web/templates/signup_user_complete.html @@ -7,7 +7,7 @@
- From ff362b77929cbb65f941e14144472f7d6ca9d430 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 28 Jul 2015 11:36:33 -0400 Subject: [PATCH 09/31] updates to sign-up flow, remove company name and marketing checkbox --- api/team.go | 7 ------ web/react/components/signup_team.jsx | 16 +------------ web/react/components/signup_team_complete.jsx | 23 ++++++++----------- web/react/pages/signup_team_complete.jsx | 4 ++-- web/react/utils/client.jsx | 4 ++-- web/templates/signup_team_complete.html | 2 +- web/web.go | 1 - 7 files changed, 16 insertions(+), 41 deletions(-) diff --git a/api/team.go b/api/team.go index 1145e6e81c..c9fe42eccf 100644 --- a/api/team.go +++ b/api/team.go @@ -35,25 +35,18 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { m := model.MapFromJson(r.Body) email := strings.ToLower(strings.TrimSpace(m["email"])) - displayName := strings.TrimSpace(m["display_name"]) if len(email) == 0 { c.SetInvalidParam("signupTeam", "email") return } - if len(displayName) == 0 { - c.SetInvalidParam("signupTeam", "display_name") - return - } - subjectPage := NewServerTemplatePage("signup_team_subject", c.GetSiteURL()) bodyPage := NewServerTemplatePage("signup_team_body", c.GetSiteURL()) bodyPage.Props["TourUrl"] = utils.Cfg.TeamSettings.TourLink props := make(map[string]string) props["email"] = email - props["display_name"] = displayName props["time"] = fmt.Sprintf("%v", model.GetMillis()) data := model.MapToJson(props) diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx index 6fde7f8b56..edd48e0b9b 100644 --- a/web/react/components/signup_team.jsx +++ b/web/react/components/signup_team.jsx @@ -20,21 +20,12 @@ module.exports = React.createClass({ state.email_error = ""; } - team.display_name = this.refs.name.getDOMNode().value.trim(); - if (!team.display_name) { - state.name_error = "This field is required"; - state.inValid = true; - } - else { - state.name_error = ""; - } - if (state.inValid) { this.setState(state); return; } - client.signupTeam(team.email, team.display_name, + client.signupTeam(team.email, function(data) { if (data["follow_link"]) { window.location.href = data["follow_link"]; @@ -55,7 +46,6 @@ module.exports = React.createClass({ render: function() { var email_error = this.state.email_error ? : null; - var name_error = this.state.name_error ? : null; var server_error = this.state.server_error ?
: null; return ( @@ -64,10 +54,6 @@ module.exports = React.createClass({ { email_error }
-
- - { name_error } -
{ server_error }
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index ee85342ce2..450a95dd03 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -134,6 +134,7 @@ TeamDisplayNamePage = React.createClass({ this.props.state.wizard = "team_url"; this.props.state.team.display_name = display_name; + this.props.state.team.name = utils.cleanUpUrlable(display_name); this.props.updateParent(this.props.state); }, getInitialState: function() { @@ -563,15 +564,15 @@ PasswordPage = React.createClass({ var password = this.refs.password.getDOMNode().value.trim(); if (!password || password.length < 5) { - this.setState({name_error: "Please enter at least 5 characters"}); + this.setState({password_error: "Please enter at least 5 characters"}); return; } - this.setState({name_error: ""}); + this.setState({password_error: null, server_error: null}); $('#finish-button').button('loading'); var teamSignup = JSON.parse(JSON.stringify(this.props.state)); teamSignup.user.password = password; - teamSignup.user.allow_marketing = this.refs.email_service.getDOMNode().checked; + teamSignup.user.allow_marketing = true; delete teamSignup.wizard; var ctl = this; @@ -603,7 +604,7 @@ PasswordPage = React.createClass({ }, 5000); }.bind(this), function(err) { - this.setState({name_error: err.message}); + this.setState({server_error: err.message}); $('#sign-up-button').button('reset'); }.bind(this) ); @@ -615,7 +616,8 @@ PasswordPage = React.createClass({ client.track('signup', 'signup_team_07_password'); - var name_error = this.state.name_error ? : null; + var password_error = this.state.password_error ? : null; + var server_error = this.state.server_error ? : null; return (
@@ -626,7 +628,7 @@ PasswordPage = React.createClass({
Email
{this.props.state.team.email}
-
+
Choose your password
@@ -634,12 +636,10 @@ PasswordPage = React.createClass({
Passwords must contain 5 to 50 characters. Your password will be strongest if it contains a mix of symbols, numbers, and upper and lowercase characters.
- { name_error } + { password_error } + { server_error }
-
- -
@@ -669,9 +669,6 @@ module.exports = React.createClass({ props.wizard = "welcome"; props.team = {}; props.team.email = this.props.email; - props.team.display_name = this.props.name; - props.team.company_name = this.props.name; - props.team.name = utils.cleanUpUrlable(this.props.name); props.team.allowed_domains = ""; props.invites = []; props.invites.push(""); diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx index 346f2ab5ab..71806c2ea7 100644 --- a/web/react/pages/signup_team_complete.jsx +++ b/web/react/pages/signup_team_complete.jsx @@ -3,9 +3,9 @@ var SignupTeamComplete =require('../components/signup_team_complete.jsx'); -global.window.setup_signup_team_complete_page = function(email, name, data, hash) { +global.window.setup_signup_team_complete_page = function(email, data, hash) { React.render( - , + , document.getElementById('signup-team-complete') ); }; diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 1c31dc5ed7..b8eda00756 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -341,13 +341,13 @@ module.exports.updateTeamDisplayName = function(data, success, error) { module.exports.track('api', 'api_teams_update_name'); }; -module.exports.signupTeam = function(email, display_name, success, error) { +module.exports.signupTeam = function(email, success, error) { $.ajax({ url: "/api/v1/teams/signup", dataType: 'json', contentType: 'application/json', type: 'POST', - data: JSON.stringify({email: email, display_name: display_name}), + data: JSON.stringify({email: email}), success: success, error: function(xhr, status, err) { e = handleError("singupTeam", xhr, status, err); diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html index 674e54ee2f..0418894356 100644 --- a/web/templates/signup_team_complete.html +++ b/web/templates/signup_team_complete.html @@ -19,7 +19,7 @@
diff --git a/web/web.go b/web/web.go index 1d59ef946e..68e2a5226f 100644 --- a/web/web.go +++ b/web/web.go @@ -219,7 +219,6 @@ func signupTeamComplete(c *api.Context, w http.ResponseWriter, r *http.Request) page := NewHtmlTemplatePage("signup_team_complete", "Complete Team Sign Up") page.Props["Email"] = props["email"] - page.Props["DisplayName"] = props["display_name"] page.Props["Data"] = data page.Props["Hash"] = hash page.Render(c, w) From 0bfc769b4dc03538b5ee1897a33febf7a45226a2 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 28 Jul 2015 11:41:44 -0400 Subject: [PATCH 10/31] updated user sign up page and login page with new UI details --- web/react/components/login.jsx | 2 +- web/react/components/signup_user_complete.jsx | 5 ++--- web/react/pages/signup_user_complete.jsx | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 45b558dca4..fe0a47777b 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -105,7 +105,7 @@ module.exports = React.createClass({
Sign in to:

{ teamDisplayName }

-

on { teamName }

+

on { config.SiteName }

{ server_error } diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 36fa27ad74..670aab943e 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -40,7 +40,7 @@ module.exports = React.createClass({ this.setState({name_error: "", email_error: "", password_error: "", server_error: ""}); - this.state.user.allow_marketing = this.refs.email_service.getDOMNode().checked; + this.state.user.allow_marketing = true; client.createUser(this.state.user, this.state.data, this.state.hash, function(data) { @@ -125,7 +125,7 @@ module.exports = React.createClass({
Welcome to:
-

"teamDisplayName"

+

{ this.props.teamDisplayName }

on { config.SiteName }

Let's create your account

{ signup_message } @@ -147,7 +147,6 @@ module.exports = React.createClass({ { password_error }
-

{ server_error } diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx index 60c3a609aa..8f9be1f946 100644 --- a/web/react/pages/signup_user_complete.jsx +++ b/web/react/pages/signup_user_complete.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. -var SignupUserComplete =require('../components/signup_user_complete.jsx'); +var SignupUserComplete = require('../components/signup_user_complete.jsx'); global.window.setup_signup_user_complete_page = function(email, name, ui_name, id, data, hash, auth_services) { React.render( From 95123302419c2ea73e239ef5a62d1a0148d801dc Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 28 Jul 2015 11:49:45 -0400 Subject: [PATCH 11/31] updated changing email in sign up flow to work properly --- web/react/components/signup_team_complete.jsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 450a95dd03..559009f44d 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -42,11 +42,15 @@ WelcomePage = React.createClass({ state.email_error = ""; } - client.signupTeam(email, this.props.state.team.name, + client.signupTeam(email, function(data) { - this.props.state.wizard = "finished"; - this.props.updateParent(this.props.state); - window.location.href = "/signup_team_confirm/?email=" + encodeURI(email); + if (data["follow_link"]) { + window.location.href = data["follow_link"]; + } else { + this.props.state.wizard = "finished"; + this.props.updateParent(this.props.state); + window.location.href = "/signup_team_confirm/?email=" + encodeURIComponent(team.email); + } }.bind(this), function(err) { this.state.server_error = err.message; From 3d94d047c00eecfaa5d61ce077aec33d6e25b3b3 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 11:57:25 -0400 Subject: [PATCH 12/31] Adding rest of directories to eslint list --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 01986bf645..14a6ffc7d7 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,10 @@ install: check: install @echo Running ESLint... @$(ESLINT) web/react/components/* + @$(ESLINT) web/react/dispatcher/* + @$(ESLINT) web/react/pages/* + @$(ESLINT) web/react/stores/* + @$(ESLINT) web/react/utils/* test: install @mkdir -p logs From 5a4b736c8a60e3662e2f020af444274a3fb083e8 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 12:10:14 -0400 Subject: [PATCH 13/31] Adding style guide --- STYLE-GUIDE.md | 161 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 STYLE-GUIDE.md diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md new file mode 100644 index 0000000000..345fe6cdca --- /dev/null +++ b/STYLE-GUIDE.md @@ -0,0 +1,161 @@ +# Mattermost Style Guide + +1. [GO](#go) +2. [Javascript](#javascript) +3. [React/JSX](#jsx) + + +## Go + +All go code must follow the golang official [Style Guide](https://golang.org/doc/effective_go.html) + +In addition all code must be run though the official go formater tool [gofmt](https://golang.org/cmd/gofmt/) + + +## Javascript + +Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) + +Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) + +The following is an abriged version of the [Airbnb Javascript Style Guide](https://github.com/airbnb/javascript/blob/master/README.md#airbnb-javascript-style-guide-), with modifications. Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. + +### Whitespace + +- Indentaiton is four spaces +- Use a space before the leading brace +- Use one space between the comma and the next argument in a bracketed list. No other space. +- Use whitespace to make code more readable. +- Do not use more than one newline to separate code blocks. +- Do not use a newline as the first line of a function + +```javascript +// Correct +function myFunction(parm1, parm2) { + stuff...; + + morestuff; +} + +// Incorrect +function myFunction ( parm1, parm2 ){ + stuff...; + + + morestuff; +} + +``` + +### Semicolons + +- You must use them always + +```javascript +// Correct +var x = 1; + +// Incorrect +var x = 1 +``` + +### Variables + +- Declarations must always use var, let or const. +- Perfer let or const over var. + +```javascript +// Correct +let x = 4; + +// OK +var x = 4; + +// Incorrect +x = 4; +``` + +### Blocks + +- Braces must be used on all multi-line blocks. +- Braces must start on the same line as the statment starting the block. +- Else and else if must be on the same line as the if block closing brace. + +```javascript +// Correct +if (somthing) { + stuff...; +} else if (otherthing) { + stuff...; +} + +// Incorrect +if (somthing) +{ + stuff...; +} +else +{ + stuff...; +} + +// Incorrect +if (somthing) stuff...; +if (somthing) + stuff...; + +``` + +### Strings + +- Use template strings instead of concatenation. + +```javascript +// Correct +function getStr(stuff) { + return "This is the ${stuff} string"; +} + +// Incorrect +function wrongGetStr(stuff) { + return "This is the " + stuff + " string"; +} +``` + +## React/JSX + +This is an abriged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. + +### General + +- Include only one React component per file. +- Use class \ extends React.Componet over React.createClass unless you need mixins +- CapitalCamelCase with .jsx extension for component filenames. +- Filenames should be the component name. + +### Alignment + +- Follow alignment styles shown below: +```xml +// Correct + + + + +// Correct + +``` + +### Nameing + +- Property names use camelCase. +- React component names use CapitalCamelCase. +- Do not use an understore for internal methods in a react component. + +```xml +// Correct + +``` From bf5548ad6da9dc4a12ffde56658f7d9a9748cb80 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 12:14:40 -0400 Subject: [PATCH 14/31] Minor tweaks to style guide --- STYLE-GUIDE.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md index 345fe6cdca..a370e7d746 100644 --- a/STYLE-GUIDE.md +++ b/STYLE-GUIDE.md @@ -2,7 +2,7 @@ 1. [GO](#go) 2. [Javascript](#javascript) -3. [React/JSX](#jsx) +3. [React-JSX](#react-jsx) ## Go @@ -122,7 +122,11 @@ function wrongGetStr(stuff) { } ``` -## React/JSX +## React-JSX + +Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) + +Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) This is an abriged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. From 2e4d51b08f22b74802d4897a127685c162a2bef0 Mon Sep 17 00:00:00 2001 From: nickago Date: Tue, 28 Jul 2015 09:20:07 -0700 Subject: [PATCH 15/31] Fixed typo in delete_post_modal --- web/react/components/delete_post_modal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx index 11970bc2b3..f0cb809af0 100644 --- a/web/react/components/delete_post_modal.jsx +++ b/web/react/components/delete_post_modal.jsx @@ -98,7 +98,7 @@ module.exports = React.createClass({ : "" }
- +
From f084188010ccc0b82f17b99e5cacde74e732c318 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 29 Jul 2015 07:52:11 -0400 Subject: [PATCH 16/31] added use of strings.Team to replace hardcoded mentions of 'team' --- web/react/components/signup_team_complete.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 559009f44d..ebb40f17f0 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -481,12 +481,12 @@ SendInivtesPage = React.createClass({
-

Invite Team Members

+

{"Invite " + utils.toTitleCase(strings.Team) + " Members"}

{ emails }
-

if you prefer, you can invite team members later
and skip this step for now.

+

{"if you prefer, you can invite " + strings.Team + " members later"}
and skip this step for now.

@@ -534,7 +534,7 @@ UsernamePage = React.createClass({

Your username

-
Select a memorable username that makes it easy for teammates to identify you:
+
{"Select a memorable username that makes it easy for " + strings.Team + "mates to identify you:"}
From 9e64500e316199287a305a93d7ac6d12d78ea435 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 29 Jul 2015 08:20:26 -0400 Subject: [PATCH 17/31] Fixing spelling and clarifying a few parts of style guide. --- STYLE-GUIDE.md | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md index a370e7d746..e3fe2addfe 100644 --- a/STYLE-GUIDE.md +++ b/STYLE-GUIDE.md @@ -9,20 +9,20 @@ All go code must follow the golang official [Style Guide](https://golang.org/doc/effective_go.html) -In addition all code must be run though the official go formater tool [gofmt](https://golang.org/cmd/gofmt/) +In addition all code must be run though the official go formatter tool [gofmt](https://golang.org/cmd/gofmt/) ## Javascript -Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) +Part of the build process is running ESLint. ESLint is the final authority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) -The following is an abriged version of the [Airbnb Javascript Style Guide](https://github.com/airbnb/javascript/blob/master/README.md#airbnb-javascript-style-guide-), with modifications. Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. +The following is an abridged version of the [Airbnb Javascript Style Guide](https://github.com/airbnb/javascript/blob/master/README.md#airbnb-javascript-style-guide-), with modifications. Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. ### Whitespace -- Indentaiton is four spaces +- Indentation is four spaces - Use a space before the leading brace - Use one space between the comma and the next argument in a bracketed list. No other space. - Use whitespace to make code more readable. @@ -62,23 +62,25 @@ var x = 1 ### Variables - Declarations must always use var, let or const. -- Perfer let or const over var. +- Prefer let or const over var. +- camelCase for all variable names. ```javascript // Correct -let x = 4; +let myVariable = 4; // OK -var x = 4; +var myVariable = 4; // Incorrect -x = 4; +myVariable = 4; +var my_variable = 4; ``` ### Blocks -- Braces must be used on all multi-line blocks. -- Braces must start on the same line as the statment starting the block. +- Braces must be used on all blocks. +- Braces must start on the same line as the statement starting the block. - Else and else if must be on the same line as the if block closing brace. ```javascript @@ -124,16 +126,16 @@ function wrongGetStr(stuff) { ## React-JSX -Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) +Part of the build process is running ESLint. ESLint is the final authority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) -This is an abriged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. +This is an abridged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. ### General - Include only one React component per file. -- Use class \ extends React.Componet over React.createClass unless you need mixins +- Use class \ extends React.Component over React.createClass unless you need mixins - CapitalCamelCase with .jsx extension for component filenames. - Filenames should be the component name. @@ -153,7 +155,7 @@ This is an abriged version of the [Airbnb React/JSX Style Guide](https://github. ``` -### Nameing +### Naming - Property names use camelCase. - React component names use CapitalCamelCase. From b0105bc1ed034af76fa2289e7a54920c56039e63 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 19:29:57 +0500 Subject: [PATCH 18/31] mm-1762 - Search improvements with some other minor Ui changes --- web/react/components/search_bar.jsx | 11 +++-- web/react/components/sidebar_header.jsx | 10 ++++- web/sass-files/sass/partials/_headers.scss | 42 ++++++++++++++---- web/sass-files/sass/partials/_responsive.scss | 44 +++++++++++-------- web/sass-files/sass/partials/_search.scss | 39 ++++++++++------ 5 files changed, 101 insertions(+), 45 deletions(-) diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index f21f0cd588..e39cf5d46f 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -36,6 +36,9 @@ module.exports = React.createClass({ } } }, + clearFocus: function(e) { + $('.search-bar__container').removeClass('focused'); + }, handleClose: function(e) { e.preventDefault(); @@ -57,6 +60,7 @@ module.exports = React.createClass({ }, handleUserFocus: function(e) { e.target.select(); + $('.search-bar__container').addClass('focused'); }, performSearch: function(terms, isMentionSearch) { if (terms.length) { @@ -92,13 +96,14 @@ module.exports = React.createClass({ render: function() { return (
-
Cancel
- +
+ Cancel + -
  • +
  • @@ -107,6 +107,12 @@ module.exports = React.createClass({ }; }, + toggleDropdown: function(e) { + e.preventDefault(); + e.stopPropagation(); + $('.team__header').find('.dropdown-toggle').trigger('click'); + }, + render: function() { var me = UserStore.getCurrentUser(); @@ -116,7 +122,7 @@ module.exports = React.createClass({ return (
    - + { me.last_picture_update ? .nav { > li { @@ -250,10 +276,10 @@ vertical-align: top; display: inline-block; width: 15px; - margin: 9px 4px 3px 0; + margin: 9px 6px 3px 0; &:hover { svg { - fill: #888; + fill: #777; } } a { @@ -263,6 +289,6 @@ svg { vertical-align: top; margin-top: 8px; - fill: #AAA; + fill: #aaa; } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 7199346386..f3f9cd477e 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -448,28 +448,39 @@ } } .search-bar__container { - padding: 10px 8px 13px; + padding: 0; + height: 45px; background: $primary-color; color: #fff; + &.focused { + .sidebar__collapse { + @include translateX(-45px); + } + .search__form { + padding-left: 10px; + padding-right: 67px; + } + .search__clear { + display: block; + } + } .search__form { border: none; - padding: 0 60px 0 35px; + padding: 7px 20px 0 45px; + height: 45px; + position: relative; + @include single-transition(all, 0.2s, linear); .form-control { - line-height: normal; - background: none; + border: none; + padding: 0 10px 0 31px; + background: rgba(black, 0.2); + @include border-radius(3px); color: #fff; - border-radius: 0; - padding: 0; - border-bottom: 1px solid #FFF; - border-bottom: 1px solid rgba(#fff, 0.4); - &:focus { - border-bottom: 1px solid rgba(#fff, 0.8); - } } input[type=text] { - @include input-placeholder { + @include input-placeholder { color: #fff; - color: rgba(#fff, 0.6); + color: rgba(#fff, 0.5); } } } @@ -550,11 +561,6 @@ .sidebar--right__close { display: none; } - .search__form { - .glyphicon { - color: #fff; - } - } } .inner__wrap { &.move--right { @@ -650,7 +656,7 @@ display: block; } .access__report { - margin: 0 0 15px 15px; + margin: 0 0 15px 15px; } .access__date { div { diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 7943583206..0d005bfe25 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,23 +1,37 @@ .search-bar__container { padding: 8px 8px 8px 0; } -.sidebar__collapse { - width: auto; - height: auto; +.search__clear { + display: none; position: absolute; - top: 1px; - right: 15px; - cursor: pointer; - padding: 1em 0; + right: 0; + line-height: 45px; + margin-right: 13px; z-index: 5; + cursor: pointer; +} +.sidebar__collapse { + cursor: pointer; + z-index: 5; + fill: #FFF; + position: absolute; + left: 0; + font-size: 33px; + width: 45px; + @include single-transition(all, 0.2s, linear); + @include translateX(0px); + text-align: center; + padding-right: 2px; + line-height: 42px; display: none; } .sidebar__search-icon { position: absolute; - left: 15px; - top: 18px; - font-size: 16px; - @include opacity(0.8); + top: 15px; + margin-left: 10px; + font-size: 14px; + color: #fff; + color: rgba(#fff, 0.5); display: none; } .search__form { @@ -30,9 +44,8 @@ .sidebar--right & { width: 100%; } - .search-bar-box { + .search-bar { height: 40px; - border: 1px solid #ddd; padding-right: 30px; box-shadow: none; .search-bar__container & { From bcc068e719efe0dd5fa2108e298ea5caaeea36e9 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 19:38:44 +0500 Subject: [PATCH 19/31] Fixing error markup in signup flow --- web/react/components/signup_team_complete.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 21f9edef14..e7b37ef396 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -620,8 +620,8 @@ PasswordPage = React.createClass({ client.track('signup', 'signup_team_07_password'); - var password_error = this.state.password_error ? : null; - var server_error = this.state.server_error ? : null; + var password_error = this.state.password_error ?
    : null; + var server_error = this.state.server_error ?
    : null; return (
    From 41dc0a3e3c68e610e5f67bcdfe49aeb4cc436d81 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 19:40:22 +0500 Subject: [PATCH 20/31] Improving css for form hints in signup flow --- web/sass-files/sass/partials/_signup.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 1a0c55f396..4b6ee79a16 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -74,7 +74,7 @@ .form__hint { font-size: 0.95em; color: #999; - margin: 10px 0; + margin: 10px 0 0; } .signup-team-confirm__container { From 1e0abf74a3cfea6a540e922abf6e038018160fc4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 20:24:28 +0500 Subject: [PATCH 21/31] Removing unused id on LHS dropdown --- web/react/components/sidebar_header.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index b6ca8c1a51..0156dc01a6 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -75,7 +75,7 @@ var NavbarDropdown = React.createClass({ return (
      -
    • +
    • @@ -108,8 +108,6 @@ module.exports = React.createClass({ }, toggleDropdown: function(e) { - e.preventDefault(); - e.stopPropagation(); $('.team__header').find('.dropdown-toggle').trigger('click'); }, From 7b776fbb781e89670273283e82614aa9c5954040 Mon Sep 17 00:00:00 2001 From: nickago Date: Mon, 27 Jul 2015 14:29:49 -0700 Subject: [PATCH 22/31] Removed timeout originally set on team creation --- web/react/components/signup_team_complete.jsx | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 21f9edef14..2387145023 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -587,25 +587,23 @@ PasswordPage = React.createClass({ var props = this.props; - setTimeout(function() { - $('#sign-up-button').button('reset'); - props.state.wizard = "finished"; - props.updateParent(props.state, true); + $('#sign-up-button').button('reset'); + props.state.wizard = "finished"; + props.updateParent(props.state, true); - window.location.href = utils.getWindowLocationOrigin() + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); + window.location.href = window.location.origin + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); - // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password, - // function(data) { - // TeamStore.setLastName(teamSignup.team.domain); - // UserStore.setLastEmail(teamSignup.team.email); - // UserStore.setCurrentUser(data); - // window.location.href = '/channels/town-square'; - // }.bind(ctl), - // function(err) { - // this.setState({name_error: err.message}); - // }.bind(ctl) - // ); - }, 5000); + // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password, + // function(data) { + // TeamStore.setLastName(teamSignup.team.domain); + // UserStore.setLastEmail(teamSignup.team.email); + // UserStore.setCurrentUser(data); + // window.location.href = '/channels/town-square'; + // }.bind(ctl), + // function(err) { + // this.setState({name_error: err.message}); + // }.bind(ctl) + // ); }.bind(this), function(err) { this.setState({server_error: err.message}); From 2775225e0dba77ab2c47286d5c225575cadc8834 Mon Sep 17 00:00:00 2001 From: nickago Date: Wed, 29 Jul 2015 08:32:26 -0700 Subject: [PATCH 23/31] Added IE friendly window origin function in place of unwrapped call --- web/react/components/signup_team_complete.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 2387145023..b342f3a3ca 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -591,7 +591,7 @@ PasswordPage = React.createClass({ props.state.wizard = "finished"; props.updateParent(props.state, true); - window.location.href = window.location.origin + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); + window.location.href = utils.getWindowLocationOrigin() + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password, // function(data) { From beef8f776f4a47169ce03783b2985b40d30572f2 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 29 Jul 2015 12:01:23 -0400 Subject: [PATCH 24/31] updated channel error messages to reflect proper naming --- api/channel_test.go | 4 ++-- store/sql_channel_store.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/channel_test.go b/api/channel_test.go index ae77813026..a8d53c4b52 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -56,7 +56,7 @@ func TestCreateChannel(t *testing.T) { rchannel.Data.(*model.Channel).Id = "" if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err != nil { - if err.Message != "A channel with that name already exists" { + if err.Message != "A channel with that handle already exists" { t.Fatal(err) } } @@ -67,7 +67,7 @@ func TestCreateChannel(t *testing.T) { Client.DeleteChannel(savedId) if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err != nil { - if err.Message != "A channel with that name was previously created" { + if err.Message != "A channel with that handle was previously created" { t.Fatal(err) } } diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index f64558a922..ce1a8c6fad 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -84,9 +84,9 @@ func (s SqlChannelStore) Save(channel *model.Channel) StoreChannel { dupChannel := model.Channel{} s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name = :Name AND DeleteAt > 0", map[string]interface{}{"TeamId": channel.TeamId, "Name": channel.Name}) if dupChannel.DeleteAt > 0 { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name was previously created", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { result.Err = model.NewAppError("SqlChannelStore.Save", "We couldn't save the channel", "id="+channel.Id+", "+err.Error()) @@ -122,9 +122,9 @@ func (s SqlChannelStore) Update(channel *model.Channel) StoreChannel { dupChannel := model.Channel{} s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name= :Name AND DeleteAt > 0", map[string]interface{}{"TeamId": channel.TeamId, "Name": channel.Name}) if dupChannel.DeleteAt > 0 { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name was previously created", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { result.Err = model.NewAppError("SqlChannelStore.Update", "We encounted an error updating the channel", "id="+channel.Id+", "+err.Error()) From 5fa374e4eb423652d502d1785feb214cb687a2ea Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 21:18:49 +0500 Subject: [PATCH 25/31] Fixing LHS Header css --- web/sass-files/sass/partials/_headers.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 2c5f845d2c..52c6c2d988 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -85,6 +85,7 @@ .sidebar--left, .sidebar--menu { .team__header { position: relative; + padding: 10px; @include legacy-pie-clearfix; &:before { @include single-transition(all, 0.05s, linear); @@ -145,7 +146,7 @@ } .header__info { color: #fff; - padding: 10px 10px 10px 14px; + padding-left: 4px; z-index: 1; position: relative; } From 8c14a16d0126a32c0f45f9d9a172cc06f867cc23 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 28 Jul 2015 09:28:00 -0700 Subject: [PATCH 26/31] Access History and Active Sessions are now lazy-loaded upon opening instead of loaded at start; added loading screens to Access History and Active Sessions --- web/react/components/access_history_modal.jsx | 16 +++++++++++++--- web/react/components/activity_log_modal.jsx | 17 +++++++++++++++-- web/react/stores/user_store.jsx | 4 ++-- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx index 462f046f65..6cc8ec8a91 100644 --- a/web/react/components/access_history_modal.jsx +++ b/web/react/components/access_history_modal.jsx @@ -3,7 +3,8 @@ var UserStore = require('../stores/user_store.jsx'); var AsyncClient = require('../utils/async_client.jsx'); -var Utils = require('../utils/utils.jsx'); +var LoadingScreen = require('./loading_screen.jsx'); +var utils = require('../utils/utils.jsx'); function getStateFromStoresForAudits() { return { @@ -14,7 +15,9 @@ function getStateFromStoresForAudits() { module.exports = React.createClass({ componentDidMount: function() { UserStore.addAuditsChangeListener(this._onChange); - AsyncClient.getAudits(); + $(this.refs.modal.getDOMNode()).on('shown.bs.modal', function (e) { + AsyncClient.getAudits(); + }); var self = this; $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) { @@ -25,7 +28,10 @@ module.exports = React.createClass({ UserStore.removeAuditsChangeListener(this._onChange); }, _onChange: function() { - this.setState(getStateFromStoresForAudits()); + var newState = getStateFromStoresForAudits(); + if (!utils.areStatesEqual(newState.audits, this.state.audits)) { + this.setState(newState); + } }, handleMoreInfo: function(index) { var newMoreInfo = this.state.moreInfo; @@ -87,9 +93,13 @@ module.exports = React.createClass({

      Access History

    + { !this.state.audits.loading ? { accessList } + : + + }
    • diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 90f139e8b1..f28f0d5f1d 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -4,6 +4,8 @@ var UserStore = require('../stores/user_store.jsx'); var Client = require('../utils/client.jsx'); var AsyncClient = require('../utils/async_client.jsx'); +var LoadingScreen = require('./loading_screen.jsx'); +var utils = require('../utils/utils.jsx'); function getStateFromStoresForSessions() { return { @@ -29,7 +31,9 @@ module.exports = React.createClass({ }, componentDidMount: function() { UserStore.addSessionsChangeListener(this._onChange); - AsyncClient.getSessions(); + $(this.refs.modal.getDOMNode()).on('shown.bs.modal', function (e) { + AsyncClient.getSessions(); + }); var self = this; $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) { @@ -40,7 +44,10 @@ module.exports = React.createClass({ UserStore.removeSessionsChangeListener(this._onChange); }, _onChange: function() { - this.setState(getStateFromStoresForSessions()); + var newState = getStateFromStoresForSessions(); + if (!utils.areStatesEqual(newState.sessions, this.state.sessions)) { + this.setState(newState); + } }, handleMoreInfo: function(index) { var newMoreInfo = this.state.moreInfo; @@ -106,10 +113,16 @@ module.exports = React.createClass({

    Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the "Logout" button below to end a session.

    + { !this.state.sessions.loading ? +
    { activityList } { server_error } +
    + : + + }
    diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 001162f47c..aff5a0bed3 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -164,13 +164,13 @@ var UserStore = assign({}, EventEmitter.prototype, { BrowserStore.setItem("sessions", sessions); }, getSessions: function() { - return BrowserStore.getItem("sessions", []); + return BrowserStore.getItem("sessions", {loading: true}); }, setAudits: function(audits) { BrowserStore.setItem("audits", audits); }, getAudits: function() { - return BrowserStore.getItem("audits", []); + return BrowserStore.getItem("audits", {loading: true}); }, setTeams: function(teams) { BrowserStore.setItem("teams", teams); From a9da77908a1c4a01b7f0ce7cb253a77e3eebb407 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 21:36:24 +0500 Subject: [PATCH 27/31] Updating color of hover on LHS Header --- web/sass-files/sass/partials/_headers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 52c6c2d988..fb37c43eb4 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -99,7 +99,7 @@ } &:hover { &:before { - background: rgba(black, 0.05); + background: rgba(black, 0.1); } .user__name { color: #fff; From 3866358c0a59b32ced42bce9aaaf3a0091968f07 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 22:09:08 +0500 Subject: [PATCH 28/31] Minor Ui updates regarding the search and the center channel header on mobile. --- web/sass-files/sass/partials/_navbar.scss | 14 +++++++------- web/sass-files/sass/partials/_responsive.scss | 2 +- web/sass-files/sass/partials/_search.scss | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss index e5e67a9e02..905907d843 100644 --- a/web/sass-files/sass/partials/_navbar.scss +++ b/web/sass-files/sass/partials/_navbar.scss @@ -5,15 +5,15 @@ .navbar-default { position: absolute; border: none; - min-height: 50px; + min-height: 45px; background: $primary-color; .navbar-nav { > li { > a { - height: 50px; + height: 45px; padding: 0 1.3em; i { - line-height: 50px; + line-height: 45px; } } } @@ -24,8 +24,8 @@ border-radius: 0; margin: 0; padding: 0 10px; - line-height: 53px; - height: 50px; + line-height: 48px; + height: 44px; z-index: 5; fill: #fff; .icon-bar { @@ -38,8 +38,8 @@ } .navbar-brand { padding: 0 0.5em; - height: 50px; - line-height: 50px; + height: 45px; + line-height: 45px; float: none; font-size: 16px; .heading { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index f3f9cd477e..81b94ab5a2 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -466,7 +466,7 @@ } .search__form { border: none; - padding: 7px 20px 0 45px; + padding: 7px 20px 0 49px; height: 45px; position: relative; @include single-transition(all, 0.2s, linear); diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 0d005bfe25..e2168ef757 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -16,13 +16,13 @@ fill: #FFF; position: absolute; left: 0; - font-size: 33px; - width: 45px; + font-size: 35px; + width: 49px; @include single-transition(all, 0.2s, linear); @include translateX(0px); text-align: center; - padding-right: 2px; - line-height: 42px; + padding-left: 1px; + line-height: 40px; display: none; } .sidebar__search-icon { From 5954a83a149f87f01333c5f4715aa648cc5fb555 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 29 Jul 2015 23:55:45 -0800 Subject: [PATCH 29/31] Fixes mm-1564 adds release to travis and git --- .travis.yml | 61 +++++++++++++++++++++++++++-------------------------- Makefile | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc2fb7646d..898cbf812e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,39 @@ language: go - go: - - 1.4.2 - +- 1.4.2 before_install: - - gem install compass - - "sudo apt-get update -qq" - - - "sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5" - - "sudo apt-get autoremove" - - "sudo apt-get install libaio1" - - "wget -O mysql-5.6.17.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.17-debian6.0-x86_64.deb" - - "sudo dpkg -i mysql-5.6.17.deb" - - "sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server" - - "sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/" - # some config values were changed since 5.5 - - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf" - - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf" - - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf" - - "sudo /etc/init.d/mysql.server start" - +- gem install compass +- sudo apt-get update -qq +- sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 + mysql-client-core-5.5 +- sudo apt-get autoremove +- sudo apt-get install libaio1 +- wget -O mysql-5.6.17.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.17-debian6.0-x86_64.deb +- sudo dpkg -i mysql-5.6.17.deb +- sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server +- sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/ +- sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf +- sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf +- sudo sed -i'' 's/basedir[^=]\+=.*$/basedir = \/opt\/mysql\/server-5.6/' /etc/mysql/my.cnf +- sudo /etc/init.d/mysql.server start install: - - export PATH=$PATH:$HOME/gopath/bin - - go get github.com/tools/godep - - godep restore - +- export PATH=$PATH:$HOME/gopath/bin +- go get github.com/tools/godep +- godep restore before_script: - - mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot - - mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot - - mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot - +- mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot +- mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot +- mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot services: - - redis-server - +- redis-server addons: hosts: - - 127.0.0.1 dockerhost \ No newline at end of file + - 127.0.0.1 dockerhost +deploy: + provider: releases + api_key: + secure: ma8Y0oimU+LB6LTAh8to2E1/ghaDPhcsAFXBrODsHpd4JgxA6HYoEwSEBCJFHSpu/JteclsxSTfp9hcuzw/IOtlwlSAiVoBZ60s24MRKTIAQNtrJ4QrX5wyfAZi+Bcuk/E8NynmoIW5qpaElSAdjgocyjAJIQ5ChMEztglL0cAEBXQRWbWMqSZ0hVLPrKDCIkWIyv3pFxqdLOxktkzxW07r2dlT0hppXR3dCaPJo0nelArS2H3LdN/3Iv6cAddfS27RaZkqDj/PDh6OZr4EguC99TxlVNChIr7nPr3/OiAssbkvEnhlSLeABFO9+7KfutL2WhAjpFXTjtPVq6Qalc8UW0K0gxq//sVfhb1MzjenmdOf06uB2bilQ8kgwHo7dDdRZBqqAtxQ6Q0Ht3SFMj6v/1zVD3s+YX/kWCEbUTHm6r2G/eF794ozcJyU+6j1L8hm6mvf8Mr9XCqBfgpZy6FCLX+9OKdMvX2jY8reo3Xz1PA9R6yzhN08vjku+jW+fsoYrBLd0fY1UGK2uOuvBByCeJzXupd3YpBMjEyRupVxqEj7K0GWOJeml65mkqKSNsHdDSeSjMpb8mwneZyTbdjsxCFQRLcLgpAajFrkk4G2Yz3KfhXSo29XKEGX+EbY5NuP8KmDsBsguPI0zfwv/co0hAY8PIIcehxcdoR9Vb2c= + file: dist/mattermost.tar.gz + skip_cleanup: true + on: + repo: mattermost/platform diff --git a/Makefile b/Makefile index 14a6ffc7d7..947e2d3670 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,12 @@ ifeq ($(BUILD_NUMBER),) BUILD_NUMBER := dev endif +ifeq ($(TRAVIS_BUILD_NUMBER),) + BUILD_NUMBER := dev +else + BUILD_NUMBER := $(TRAVIS_BUILD_NUMBER) +endif + DIST_ROOT=dist DIST_PATH=$(DIST_ROOT)/mattermost DIST_RESULTS=$(DIST_ROOT)/results @@ -29,6 +35,7 @@ travis: @cd web/react/ && npm install @$(GO) build $(GOFLAGS) ./... + @$(GO) install $(GOFLAGS) -a ./... @mkdir -p logs @@ -38,6 +45,38 @@ travis: @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1 + mkdir -p $(DIST_PATH)/bin + cp $(GOPATH)/bin/platform $(DIST_PATH)/bin + + cp -RL config $(DIST_PATH)/config + touch $(DIST_PATH)/config/build.txt + echo $(BUILD_NUMBER) | tee -a $(DIST_PATH)/config/build.txt + + mkdir -p $(DIST_PATH)/logs + + mkdir -p web/static/js + cd web/react && npm run build + + cd web/sass-files && compass compile + + mkdir -p $(DIST_PATH)/web + cp -RL web/static $(DIST_PATH)/web + cp -RL web/templates $(DIST_PATH)/web + + mkdir -p $(DIST_PATH)/api + cp -RL api/templates $(DIST_PATH)/api + + mv $(DIST_PATH)/web/static/js/bundle.min.js $(DIST_PATH)/web/static/js/bundle-$(BUILD_NUMBER).min.js + + @sed -i'.bak' 's|react-with-addons-0.13.1.js|react-with-addons-0.13.1.min.js|g' $(DIST_PATH)/web/templates/head.html + @sed -i'.bak' 's|jquery-1.11.1.js|jquery-1.11.1.min.js|g' $(DIST_PATH)/web/templates/head.html + @sed -i'.bak' 's|bootstrap-3.3.1.js|bootstrap-3.3.1.min.js|g' $(DIST_PATH)/web/templates/head.html + @sed -i'.bak' 's|perfect-scrollbar.js|perfect-scrollbar.min.js|g' $(DIST_PATH)/web/templates/head.html + @sed -i'.bak' 's|bundle.js|bundle-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html + rm $(DIST_PATH)/web/templates/*.bak + + tar -C dist -czf $(DIST_PATH).tar.gz mattermost + build: @$(GO) build $(GOFLAGS) ./... From e8f0ca7a29ac38f50fba89c3f067d1453c25695e Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 30 Jul 2015 00:02:48 -0800 Subject: [PATCH 30/31] removing flaky unit test --- store/sql_post_store_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index bad6408b87..d1639aa03f 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -445,12 +445,12 @@ func TestPostStoreSearch(t *testing.T) { t.Fatal("returned wrong serach result") } - if utils.Cfg.SqlSettings.DriverName == "mysql" { - r2 := (<-store.Post().Search(teamId, userId, "new york", false)).Data.(*model.PostList) - if len(r2.Order) >= 1 && r2.Order[0] != o2.Id { - t.Fatal("returned wrong serach result") - } - } + // if utils.Cfg.SqlSettings.DriverName == "mysql" { + // r2 := (<-store.Post().Search(teamId, userId, "new york", false)).Data.(*model.PostList) + // if len(r2.Order) >= 1 && r2.Order[0] != o2.Id { + // t.Fatal("returned wrong serach result") + // } + // } r3 := (<-store.Post().Search(teamId, userId, "new", false)).Data.(*model.PostList) if len(r3.Order) != 2 && r3.Order[0] != o1.Id { From 80b6f34f9ab82abc1e0d3b0ae502112f78c5306a Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 30 Jul 2015 00:06:15 -0800 Subject: [PATCH 31/31] fixing travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 898cbf812e..359de244eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,4 +36,4 @@ deploy: file: dist/mattermost.tar.gz skip_cleanup: true on: - repo: mattermost/platform + tags: true
    - { !isDirect ?
    {channelTitle} + { !isDirect ?
    • View Info
      • { !ChannelStore.isDefault(channel) ? @@ -193,12 +193,14 @@ module.exports = React.createClass({ : null }
    + : + + }
    {description}
    - : - {channelTitle} - }