From 8fd26d1c409d027273e6b887a690a18fc9f737de Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Wed, 14 Mar 2018 11:00:57 -0300 Subject: [PATCH 01/44] welcome --- .meteor/packages | 1 + .meteor/versions | 1 + .../rocketchat-lib/server/startup/settings.js | 5 ++ .../client/setupWizard.html | 34 +++++++++ .../client/setupWizard.js | 34 +++++++++ packages/rocketchat-setup-wizard/package.js | 17 +++++ .../imports/components/setup-wizard.css | 62 ++++++++++++++++ packages/rocketchat-theme/client/main.css | 1 + .../rocketchat-ui-master/client/main.html | 70 ++++++++++--------- packages/rocketchat-ui-master/client/main.js | 3 + 10 files changed, 195 insertions(+), 33 deletions(-) create mode 100644 packages/rocketchat-setup-wizard/client/setupWizard.html create mode 100644 packages/rocketchat-setup-wizard/client/setupWizard.js create mode 100644 packages/rocketchat-setup-wizard/package.js create mode 100644 packages/rocketchat-theme/client/imports/components/setup-wizard.css diff --git a/.meteor/packages b/.meteor/packages index f6da7829fd40..547adfe54a51 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -185,3 +185,4 @@ todda00:friendly-slugs yasaricli:slugify yasinuslu:blaze-meta rocketchat:version-check +rocketchat:setup-wizard diff --git a/.meteor/versions b/.meteor/versions index fe345b2e9cbd..f5aca306129e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -200,6 +200,7 @@ rocketchat:postcss@1.0.0 rocketchat:push-notifications@0.0.1 rocketchat:reactions@0.0.1 rocketchat:sandstorm@0.0.1 +rocketchat:setup-wizard@0.0.1 rocketchat:slackbridge@0.0.1 rocketchat:slashcommands-archive@0.0.1 rocketchat:slashcommands-asciiarts@0.0.1 diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js index 771d298bc0b3..062704257ec9 100644 --- a/packages/rocketchat-lib/server/startup/settings.js +++ b/packages/rocketchat-lib/server/startup/settings.js @@ -601,6 +601,11 @@ RocketChat.settings.addGroup('OAuth', function() { }); RocketChat.settings.addGroup('General', function() { + this.add('Server_First_Access', true, { + type: 'boolean', + public: true, + blocked: true + }); this.add('Site_Url', typeof __meteor_runtime_config__ !== 'undefined' && __meteor_runtime_config__ !== null ? __meteor_runtime_config__.ROOT_URL : null, { type: 'string', i18nDescription: 'Site_Url_Description', diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.html b/packages/rocketchat-setup-wizard/client/setupWizard.html new file mode 100644 index 000000000000..7b915ebc490e --- /dev/null +++ b/packages/rocketchat-setup-wizard/client/setupWizard.html @@ -0,0 +1,34 @@ + + + diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js new file mode 100644 index 000000000000..11bc18bb130f --- /dev/null +++ b/packages/rocketchat-setup-wizard/client/setupWizard.js @@ -0,0 +1,34 @@ +Template.setupWizard.onCreated(function() { + this.setupStep = new ReactiveVar(0); + this.maxSteps = 7; +}); + +Template.setupWizard.events({ + 'click .setup-wizard-button-next'(e, t) { + const current = t.setupStep.get(); + + if (current === t.maxSteps) { + return false; + } + + t.setupStep.set(current + 1); + }, + 'click .setup-wizard-button-back'(e, t) { + const current = t.setupStep.get(); + + if (current === 0) { + return false; + } + + t.setupStep.set(current - 1); + } +}); + +Template.setupWizard.helpers({ + currentStepTemplate() { + return `setup-wizard-step${ Template.instance().setupStep.get() }`; + }, + currentStep() { + return Template.instance().setupStep.get(); + } +}); diff --git a/packages/rocketchat-setup-wizard/package.js b/packages/rocketchat-setup-wizard/package.js new file mode 100644 index 000000000000..11102cfaaed7 --- /dev/null +++ b/packages/rocketchat-setup-wizard/package.js @@ -0,0 +1,17 @@ +Package.describe({ + name: 'rocketchat:setup-wizard', + version: '0.0.1', + summary: '', + git: '' +}); + +Package.onUse(function(api) { + api.use('ecmascript'); + api.use('templating', 'client'); + // api.use('rocketchat:lib'); + api.use('rocketchat:theme'); + // api.use('rocketchat:ui-master'); + + api.addFiles('client/setupWizard.html', 'client'); + api.addFiles('client/setupWizard.js', 'client'); +}); diff --git a/packages/rocketchat-theme/client/imports/components/setup-wizard.css b/packages/rocketchat-theme/client/imports/components/setup-wizard.css new file mode 100644 index 000000000000..23cc78d2898e --- /dev/null +++ b/packages/rocketchat-theme/client/imports/components/setup-wizard.css @@ -0,0 +1,62 @@ +.setup-wizard { + display: flex; + + width: 510px; + height: 100%; + margin: 0 auto; + align-items: center; + + &-wrapper { + display: flex; + flex-direction: column; + } + + &-header { + margin-bottom: 2.5rem; + + &-logo { + width: 167px; + } + } + + &-content { + margin-bottom: 2.75rem; + + &-ilustration { + width: 100%; + height: 262px; + background: lightgray; + margin-bottom: 3.5rem; + } + + &-title { + margin-bottom: 1.25rem; + + color: var(--rc-color-primary); + + font-size: 1.375rem; + font-weight: 400; + } + + &-text { + color: var(--rc-color-primary-light); + + font-size: 0.875rem; + + line-height: 1.25rem; + + &:not(:last-child) { + margin-bottom: 1.25rem; + } + } + } + + &-footer { + display: flex; + justify-content: space-between; + } + + &-button-next { + margin-left: auto; + } +} diff --git a/packages/rocketchat-theme/client/main.css b/packages/rocketchat-theme/client/main.css index ad0867b2a50d..3cb21600adc8 100644 --- a/packages/rocketchat-theme/client/main.css +++ b/packages/rocketchat-theme/client/main.css @@ -24,6 +24,7 @@ @import 'imports/components/sidebar/rooms-list.css'; /* Main */ +@import 'imports/components/setup-wizard.css'; @import 'imports/components/flex-nav.css'; @import 'imports/components/header.css'; @import 'imports/components/memberlist.css'; diff --git a/packages/rocketchat-ui-master/client/main.html b/packages/rocketchat-ui-master/client/main.html index 4b9ddfe0b466..70172e9a4144 100644 --- a/packages/rocketchat-ui-master/client/main.html +++ b/packages/rocketchat-ui-master/client/main.html @@ -24,44 +24,48 @@ + + diff --git a/packages/rocketchat-theme/client/imports/components/setup-wizard.css b/packages/rocketchat-theme/client/imports/components/setup-wizard.css index 23cc78d2898e..7e81cb9a2a14 100644 --- a/packages/rocketchat-theme/client/imports/components/setup-wizard.css +++ b/packages/rocketchat-theme/client/imports/components/setup-wizard.css @@ -1,14 +1,17 @@ .setup-wizard { display: flex; - width: 510px; + width: 100%; height: 100%; - margin: 0 auto; align-items: center; + background-color: var(--color-white); + &-wrapper { display: flex; flex-direction: column; + width: 510px; + margin: 0 auto; } &-header { @@ -59,4 +62,8 @@ &-button-next { margin-left: auto; } + + & .rc-input:not(:last-child) { + margin-bottom: 2rem; + } } From 7a54d4077e925a2f578472451a70d205e67c79fb Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Tue, 27 Mar 2018 11:24:53 -0300 Subject: [PATCH 03/44] stylelint --- .../client/imports/components/setup-wizard.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-theme/client/imports/components/setup-wizard.css b/packages/rocketchat-theme/client/imports/components/setup-wizard.css index 7e81cb9a2a14..897318b5edbf 100644 --- a/packages/rocketchat-theme/client/imports/components/setup-wizard.css +++ b/packages/rocketchat-theme/client/imports/components/setup-wizard.css @@ -3,13 +3,14 @@ width: 100%; height: 100%; - align-items: center; background-color: var(--color-white); + align-items: center; &-wrapper { display: flex; flex-direction: column; + width: 510px; margin: 0 auto; } @@ -28,8 +29,9 @@ &-ilustration { width: 100%; height: 262px; - background: lightgray; margin-bottom: 3.5rem; + + background: lightgray; } &-title { From b46f0f5325af56a98ee7ae2473092f953b366974 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Wed, 4 Apr 2018 13:38:48 -0300 Subject: [PATCH 04/44] new ilustration --- .../client/setupWizard.html | 355 +++++++++++++++++- .../imports/components/setup-wizard.css | 11 +- .../client/imports/forms/input.css | 4 + .../client/imports/forms/select.css | 4 +- public/images/setup-wizard-intro.png | Bin 0 -> 17059 bytes 5 files changed, 371 insertions(+), 3 deletions(-) create mode 100644 public/images/setup-wizard-intro.png diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.html b/packages/rocketchat-setup-wizard/client/setupWizard.html index 1d973e832d04..54a2d849cda2 100644 --- a/packages/rocketchat-setup-wizard/client/setupWizard.html +++ b/packages/rocketchat-setup-wizard/client/setupWizard.html @@ -22,7 +22,9 @@ + + + + + + diff --git a/packages/rocketchat-theme/client/imports/components/setup-wizard.css b/packages/rocketchat-theme/client/imports/components/setup-wizard.css index 897318b5edbf..a5fa604337c2 100644 --- a/packages/rocketchat-theme/client/imports/components/setup-wizard.css +++ b/packages/rocketchat-theme/client/imports/components/setup-wizard.css @@ -27,11 +27,16 @@ margin-bottom: 2.75rem; &-ilustration { + + display: flex; width: 100%; height: 262px; margin-bottom: 3.5rem; + justify-content: center; - background: lightgray; + & img { + height: 100%; + } } &-title { @@ -68,4 +73,8 @@ & .rc-input:not(:last-child) { margin-bottom: 2rem; } + + & .rc-select { + margin: 0.5rem 0; + } } diff --git a/packages/rocketchat-theme/client/imports/forms/input.css b/packages/rocketchat-theme/client/imports/forms/input.css index 311df58cad28..86ced2606030 100644 --- a/packages/rocketchat-theme/client/imports/forms/input.css +++ b/packages/rocketchat-theme/client/imports/forms/input.css @@ -180,6 +180,10 @@ display: none; } + &__description { + font-size: 0.875rem; + color: var(--color-gray); + } } select.rc-input { diff --git a/packages/rocketchat-theme/client/imports/forms/select.css b/packages/rocketchat-theme/client/imports/forms/select.css index 9a8d5efcf24d..09d1fa5fd1a9 100644 --- a/packages/rocketchat-theme/client/imports/forms/select.css +++ b/packages/rocketchat-theme/client/imports/forms/select.css @@ -19,7 +19,8 @@ &__arrow { position: absolute; - z-index: -1; + + /* z-index: -1; */ margin: 0 -5px; @@ -29,6 +30,7 @@ } &__element { + width: 100%; padding: 0.75rem 2rem 0.75rem 1rem; text-transform: capitalize; diff --git a/public/images/setup-wizard-intro.png b/public/images/setup-wizard-intro.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec16ccf7793ab3d7c3b977814ff3f2408bdbbe4 GIT binary patch literal 17059 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 SY21zg0000 Date: Thu, 19 Apr 2018 16:45:25 -0300 Subject: [PATCH 05/44] new layout --- packages/rocketchat-assets/server/assets.js | 7 +- .../rocketchat-lib/server/startup/settings.js | 12 +- .../client/setupWizard.html | 40 ++- .../client/setupWizard.js | 34 ++- packages/rocketchat-setup-wizard/package.js | 2 + .../server/lib/getWizardSettings.js | 9 + .../imports/components/setup-wizard.css | 243 +++++++++++++++++- public/images/logo/logo-black.svg | 1 + 8 files changed, 330 insertions(+), 18 deletions(-) create mode 100644 packages/rocketchat-setup-wizard/server/lib/getWizardSettings.js create mode 100644 public/images/logo/logo-black.svg diff --git a/packages/rocketchat-assets/server/assets.js b/packages/rocketchat-assets/server/assets.js index 69bce7af9e03..297efb79ea47 100644 --- a/packages/rocketchat-assets/server/assets.js +++ b/packages/rocketchat-assets/server/assets.js @@ -22,6 +22,10 @@ const assets = { extensions: ['svg', 'png', 'jpg', 'jpeg'], width: undefined, height: undefined + }, + wizard: { + step: 3, + order: 2 } }, favicon_ico: { @@ -296,7 +300,8 @@ function addAssetToSetting(key, value) { fileConstraints: value.constraints, i18nLabel: value.label, asset: key, - public: true + public: true, + wizard: value.wizard }); } diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js index d175543ca560..d7c3e8770e8d 100644 --- a/packages/rocketchat-lib/server/startup/settings.js +++ b/packages/rocketchat-lib/server/startup/settings.js @@ -640,11 +640,19 @@ RocketChat.settings.addGroup('General', function() { }); this.add('Site_Name', 'Rocket.Chat', { type: 'string', - 'public': true + 'public': false, + wizard: { + step: 3, + order: 1 + } }); this.add('Language', '', { type: 'language', - 'public': true + 'public': true, + wizard: { + step: 3, + order: 1 + } }); this.add('Allow_Invalid_SelfSigned_Certs', false, { type: 'boolean' diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.html b/packages/rocketchat-setup-wizard/client/setupWizard.html index 54a2d849cda2..d67c4ed8a0d6 100644 --- a/packages/rocketchat-setup-wizard/client/setupWizard.html +++ b/packages/rocketchat-setup-wizard/client/setupWizard.html @@ -1,5 +1,6 @@