Merge 7958b8dc1d into 4bb0a7b300

.editorconfig

@@ -8,3 +8,13 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 indent_style = tab
+tab_width = 2
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.{md}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false

.github/CONTRIBUTING.md

@@ -1,32 +1,27 @@
+# Contributing
+
 ## Submitting issues
 
-* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+- Please search the existing issues first, it's likely that your issue was already reported or even fixed.
   - Go to "Issues" and type any word in the top search/command bar.
   - Consider to search on closed issues. To do that just remove "is:open" from the search field.
-  - More info on [search syntax within github](https://help.github.com/articles/searching-issues)
+  - More info on [search syntax within github](https://help.github.com/articles/searching-issues).
-* Report the issue using our [template][template], it includes all the information we need to track down the issue.
+- Report the issue using our [template](https://github.com/saenzramiro/rambox/blob/master/.github/ISSUE_TEMPLATE.md), it includes all the information we need to track down the issue.
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
-[template]: https://github.com/saenzramiro/rambox/blob/master/.github/ISSUE_TEMPLATE.md
-
 ## Share your Custom Services
 
-If you consider there are other users that can use your Custom Service, we have a repo for this: [Rambox Services Contrib][rambox-services-contrib].
+If you consider there are other users that can use your Custom Service, we have a repo for this: [Rambox Services Contrib](https://github.com/saenzramiro/rambox-services-contrib)
-
-[rambox-services-contrib]: https://github.com/saenzramiro/rambox-services-contrib
 
 ## Ask for help
 
-We have a great community in [Gitter][gitter] that can help you with any doubt or problem.
+We have a great community in [Slack (Prefered)](https://rambox.typeform.com/to/t7jc4C) or [Gitter](https://gitter.im/saenzramiro/rambox) (Gitter channel is mirroring into Slack `general` room) that can help you with any doubt or problem.
-
-[gitter]: https://gitter.im/saenzramiro/rambox
 
 ## Contributing to Source Code
 
 Feel free to create pull requests to help us offer a great and complete software. :wink:
 
 ## Translations
-Please submit translations via [Transifex][transifex].
 
-[transifex]: https://www.transifex.com/rambox/rambox-app/
+Please submit translations via [Crowdin](https://crowdin.com/project/rambox/).

.gitignore

@@ -1,10 +1,10 @@
 # Sencha (ExtJS)
-/build/development
+build/development/
-/build/production
+build/production/
-/build/temp
+build/temp/
 .sass-cache/
 .sass_cache/
-/dist
+dist/
 
 # OS generated files #
 ######################
@@ -18,20 +18,22 @@ Thumbs.db
 
 # IDE generated files #
 ######################
-.project
+.project/
-.idea
+.idea/
 
 # bootstrap files are regenerated by Sencha CMD on every build or refresh
 bootstrap.js
 bootstrap.css
 bootstrap.json
+bootstrap.jsonp
 
 # Electron
-node_modules
+node_modules/
 npm-debug.log
 
 # Vagrant
-/.vagrant
+.vagrant/
+
 env.js
 rambox_cfg.json
 languages.js

.sencha/app/Boot.js

@@ -537,9 +537,33 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
 
             init: function () {
                 var scriptEls = doc.getElementsByTagName('script'),
+                    script = scriptEls[0],
                     len = scriptEls.length,
                     re = /\/ext(\-[a-z\-]+)?\.js$/,
-                    entry, script, src, state, baseUrl, key, n, origin;
+                    entry, src, state, baseUrl, key, n, origin;
+
+                // No check for script definedness because there always should be at least one
+                Boot.hasReadyState = ("readyState" in script);
+                Boot.hasAsync = ("async" in script);
+                Boot.hasDefer = ("defer" in script);
+                Boot.hasOnLoad = ("onload" in script);
+                
+                // Feature detecting IE
+                Boot.isIE8 = Boot.hasReadyState && !Boot.hasAsync && Boot.hasDefer && !Boot.hasOnLoad;
+                Boot.isIE9 = Boot.hasReadyState && !Boot.hasAsync && Boot.hasDefer && Boot.hasOnLoad;
+                Boot.isIE10p = Boot.hasReadyState && Boot.hasAsync && Boot.hasDefer && Boot.hasOnLoad;
+
+                if (Boot.isIE8) {
+                    Boot.isIE10 = false;
+                    Boot.isIE10m = true;
+                }
+                else {
+                    Boot.isIE10 = (new Function('/*@cc_on return @_jscript_version @*/')()) === 10;
+                    Boot.isIE10m = Boot.isIE10 || Boot.isIE9 || Boot.isIE8;
+                }
+                
+                // IE11 does not support conditional compilation so we detect it by exclusion
+                Boot.isIE11 = Boot.isIE10p && !Boot.isIE10;
 
                 // Since we are loading after other scripts, and we needed to gather them
                 // anyway, we track them in _scripts so we don't have to ask for them all
@@ -552,12 +576,8 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
                     state = script.readyState || null;
 
                     // If we find a script file called "ext-*.js", then the base path is that file's base path.
-                    if (!baseUrl) {
+                    if (!baseUrl && re.test(src)) {
-                        if (re.test(src)) {
+                        baseUrl = src;
-                            Boot.hasReadyState = ("readyState" in script);
-                            Boot.hasAsync = ("async" in script) || !Boot.hasReadyState;
-                            baseUrl = src;
-                        }
                     }
 
                     if (!Boot.scripts[key = Boot.canonicalUrl(src)]) {
@@ -578,8 +598,6 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
                 if (!baseUrl) {
                     script = scriptEls[scriptEls.length - 1];
                     baseUrl = script.src;
-                    Boot.hasReadyState = ('readyState' in script);
-                    Boot.hasAsync = ("async" in script) || !Boot.hasReadyState;
                 }
 
                 Boot.baseUrl = baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1);
@@ -1394,27 +1412,36 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
 
         createLoadElement: function(callback) {
             var me = this,
-                el = me.getElement(),
+                el = me.getElement();
-                readyStateChange = function(){
+            
+            me.preserve = true;
+            
+            el.onerror = function() {
+                me.error = true;
+                
+                if (callback) {
+                    callback();
+                    callback = null;
+                }
+            };
+            
+            if (Boot.isIE10m) {
+                el.onreadystatechange = function() {
                     if (this.readyState === 'loaded' || this.readyState === 'complete') {
-                        if(callback) {
+                        if (callback) {
                             callback();
+                            callback = this.onreadystatechange = this.onerror = null;
                         }
                     }
-                },
-                errorFn = function() {
-                    me.error = true;
-                    if(callback) {
-                        callback();
-                    }
                 };
-            me.preserve = true;
-            el.onerror = errorFn;
-            if(Boot.hasReadyState) {
-                el.onreadystatechange = readyStateChange;
-            } else {
-                el.onload = callback;
             }
+            else {
+                el.onload = function() {
+                    callback();
+                    callback = this.onload = this.onerror = null;
+                };
+            }
+            
             // IE starts loading here
             el[me.prop] = me.getLoadUrl();
         },
@@ -1541,8 +1568,11 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
                 // for async modes, we have some options
                 if (!sync) {
                     // if cross domain, just inject the script tag and let the onload
-                    // events drive the progression
+                    // events drive the progression.
-                    if(me.isCrossDomain()) {
+                    // IE10 also needs sequential loading because of a bug that makes it
+                    // fire readystate event prematurely:
+                    // https://connect.microsoft.com/IE/feedback/details/729164/ie10-dynamic-script-element-fires-loaded-readystate-prematurely
+                    if (Boot.isIE10 || me.isCrossDomain()) {
                         return me.loadCrossDomain();
                     }
                     // for IE, use the readyStateChange allows us to load scripts in parallel

.sencha/app/Microloader.js

@@ -51,15 +51,24 @@ Ext.Microloader = Ext.Microloader || (function () {
                             ? manifest
                             : manifest + ".json";
 
-                    Boot.fetch(url, function(result){
+                    if (location.href.indexOf('file:/') === 0) {
-                        manifest = Ext.manifest = JSON.parse(result.content);
+                        Boot.load(url + 'p');
-                        Microloader.load(manifest);
+                    }
-                    });
+                    else {
+                        Boot.fetch(url, function(result){
+                            Microloader.setManifest(JSON.parse(result.content));
+                        });
+                    }
                 } else {
                     Microloader.load(manifest);
                 }
             },
 
+            setManifest: function(cfg) {
+                manifest = Ext.manifest = cfg;
+                Microloader.load(manifest);
+            },
+
             /**
              *
              * @param manifestDef

.sencha/app/app.defaults.json

@@ -135,7 +135,7 @@
      */
     "production": {
         "compressor": {
-            "type": "yui"
+            "type": "cmd"
         }
     },
 
@@ -170,7 +170,7 @@
      *  to adjust the base path for all bootstrap objects, or expanded into object form:
      *
      *      "bootstrap": {
-     *          "base": "${app.dir},
+     *          "base": "${app.dir}",
      *          "manifest": "bootstrap.json",
      *          "microloader": "bootstrap.js",
      *          "css": "bootstrap.css"

.sencha/app/build-impl.xml

@@ -244,9 +244,15 @@ this file in most cases.
     <target name="watch"
             depends="-watch-init,development,init"
             description="Starts Watch to keep your app ready for dev mode">
+        <local name="watch.lock.file"/>
+        <condition property="watch.lock.file" value="${build.id}.watch.lock">
+            <isset property="build.id"/>
+        </condition>
+        <property name="watch.lock.file" value="app.watch.lock"/>
         <x-ant-call>
             <param name="build.id" value="${build.id}"/>
             <param name="build.name" value="${build.name}"/>
+            <param name="watch.lock.file" value="${build.dir}/${watch.lock.file}"/>
             <target name="-before-watch"/>
             <target name="-watch"/>
             <target name="-after-watch"/>
@@ -463,6 +469,33 @@ this file in most cases.
             depends="init,-before-publish,-publish,-after-publish"
             description="Publish app to Sencha Web Application Manager"/>
 
+    <!--
+    ===============================================================
+    Build Dependencies
+    uses the compiler to build metadata files for all detected
+    file-to-file dependencies
+    ===============================================================
+    -->
+    <target name="build-dependencies" depends="init, -detect-app-build-properties">
+        <x-compile refid="${compiler.ref.id}">
+            <![CDATA[
+            restore
+                page
+            and
+            meta
+                -infoType=Dependencies
+                -basePath=${build.dir}
+                -tpl={0}
+                -out=${build.dir}/dependencies.json
+            and
+            meta
+                -infoType=AppManifest
+                -basePath=${build.dir}
+                -tpl={0}
+                -out=${build.dir}/bootsequence.json
+            ]]>
+        </x-compile>
+    </target>
 
     <!--
     ===============================================================

.sencha/app/defaults.properties

@@ -1,7 +1,7 @@
 # =============================================================================
 # This file defines properties used by build-impl.xml and the associated
 # *-impl.xml files (sass-impl.xml, js-impl.xml, etc.), which are the core of
-# the applications build process.
+# the applications build process. 
 #
 # This file represents the lowest priority file for defining these properties
 # as well as the place to look for documentation and learning what properties
@@ -48,7 +48,7 @@
 # See "sencha help app build" for details.
 #
 # The corresponding properties files:
-# (production.properties, testing.properties, etc.) provide examples of
+# (production.properties, testing.properties, etc.) provide examples of 
 # overriding sets of properties depending on the selected environment
 # NOTE: this replaces the deprecated args.environment
 app.environment=production
@@ -120,6 +120,8 @@ app.output.cache.path=${app.output.cache}
 app.output.cache.enable=true
 app.output.appCache.enable=${app.output.cache.enable}
 app.output.appCache.path=${app.output.cache.path}
+app.output.progressive=false
+app.output.progressive.enable=${app.output.progressive}
 
 build.out.base.path=${app.output.base}
 build.out.page.path=${build.out.base.path}/${app.output.page.path}
@@ -236,13 +238,13 @@ build.options=logger:${build.options.logger},debug:${build.options.debug},produc
 # This property can be modified to change general build options
 # such as excluding files from the set.  The format expects newlines
 # for each argument, for example:
-#
+#            
 #   build.operations=\
 #       exclude\n \
 #       -namespace=Ext\n
 #
-# NOTE: modifications to build.operations are intended to be
+# NOTE: modifications to build.operations are intended to be 
-# placed in an override of the "-after-init" target, where it
+# placed in an override of the "-after-init" target, where it 
 # can be calculated based on other
 # ant properties
 #
@@ -268,7 +270,7 @@ build.optimize.enable=\
 build.optimize.disable=
 build.optimize=${build.optimize.disable}
 
-# enables / disables removing text references from
+# enables / disables removing text references from 
 # package js build files
 build.remove.references=true
 
@@ -280,12 +282,12 @@ build.remove.requirement.nodes=true
 # like mixin references
 build.optimize.string.references=true
 
-# enables / disables yui compression
+# enables / disables cmd compression
-build.compression.yui=${app.output.js.compress}
+build.compression.cmd=${app.output.js.compress}
 
 # enables / disables closure compression
 build.compression.closure=0
-
+ 
 # enables / disables uglify compression
 build.compression.ugilfy=0
 
@@ -296,8 +298,8 @@ build.compile.temp.dir.keep=true
 
 # ------------------------------------------
 # DOC ONLY - Do Not Set
-# this variable will be set to the appropriate compressor
+# this variable will be set to the appropriate compressor 
-# option, and is calculated in init-impl.xml, but may be overridded in
+# option, and is calculated in init-impl.xml, but may be overridded in 
 # app.properties, <environment>.properties, or via command line
 #
 # build.compression=
@@ -312,8 +314,8 @@ build.compile.temp.dir.keep=true
 # markup, or left as a separate resource
 build.enable.embedded.microloader=${app.output.microloader.embed}
 
-# whether to include the page's manifest.json code with the
+# whether to include the page's manifest.json code with the 
-# microloader content. Production.properties files should set this to
+# microloader content. Production.properties files should set this to 
 # false to have manifest.json exist as a server resource.
 build.enable.embedded.manifest=${app.output.manifest.embed}
 
@@ -348,18 +350,18 @@ app.microloader=${app.microloader.dir}/${app.microloader.name}
 app.microloader.path=${app.microloader}
 
 # specifies how to embed the microloader code into the output markup
-# {0} is replaced with the content of the microloader file specified
+# {0} is replaced with the content of the microloader file specified 
 # by app.microloader.path
 build.microloader.code.tpl={0}
 
 # the template to use when generating a stand-alone json manifest file
 build.microloader.json.tpl.standalone={0}
 
-# the template to use when embedding the manifest json directly next to the
+# the template to use when embedding the manifest json directly next to the 
 # microloader in the output microloader content
 build.microloader.json.tpl.embedded=Ext.blink({0});
 
-# the template to use in the output microloader content when supplying
+# the template to use in the output microloader content when supplying 
 # the manifest json as a separate server-side resource ('production' builds)
 build.microloader.json.tpl.external=Ext.blink('{'id:''${app.id}'''}');
 
@@ -368,7 +370,7 @@ build.microloader.json.tpl.external=Ext.blink('{'id:''${app.id}'''}');
 build.embedded.microloader.tpl=<script id="microloader" data-app="${app.id}" type="text/javascript">{0}</script>
 
 # the compressor to use when embedding the microloader into a page
-# can be -closure or -yui, or leave empty to disable compression
+# can be -closure or -cmd, or leave empty to disable compression
 build.embedded.microloader.compressor=
 
 # the path to the microloader content file, if external to the outpout markup
@@ -383,7 +385,7 @@ build.external.microloader.markup=<script  id="microloader" data-app="${app.id}"
 # currently unused : is a placeholder for future microloader interactions
 build.microloader.mode=${build.environment}
 
-# the tag name to use when generating the compiler save set for
+# the tag name to use when generating the compiler save set for 
 # the page's js code
 build.tag.name=full-page
 
@@ -485,7 +487,7 @@ enable.ext42.themes=false
 enable.touch.themes=false
 # --------------------
 
-# selector count threshold to use when
+# selector count threshold to use when 
 # splitting a single css file into multiple
 # css files (IE selector limit workaround)
 #
@@ -497,7 +499,7 @@ build.css.selector.limit=${app.output.css.split}
 build.css.preprocess=${app.output.css.preprocess}
 
 # sets the css preprocessor options, in the form:
-# name1:value1,name2:value2,...
+# name1:value1,name2:value2,...                                                            
 build.css.preprocessor.opts=
 
 # enables / disable css compressor (enable.ext42.themes only)
@@ -580,32 +582,32 @@ theme.name=default
 # *****************************************************************************
 
 # the resources directory of the application
-# note: this property is currently only used for building ext 4.1 style themes
+# note: this property is currently only used for building ext 4.1 style themes 
 # (used by x-build-theme and x-copy-resources in slice-impl.xml)
 app.resources.dir=${app.dir}/resources
 
 # the directory containing the slicer widget example page
 app.example.dir=${app.dir}/sass/example
 
+# this is the directory used for intermediate build artifacts used 
+# by the slicer for generating theme images
+app.example.build.dir=${build.temp.dir}/slicer-temp
+
 # properties to control the recirect css file that is
 # generated for the slicer example page
 app.example.css.name=example.css
-app.example.css.file=${app.example.dir}/${app.example.css.name}
+app.example.css.file=${app.example.build.dir}/${app.example.css.name}
 
-# the base path for generating the bootstrap code for the
+# the base path for generating the bootstrap code for the 
 # slicer page
-bootstrap.base.path=${app.example.dir}
+bootstrap.base.path=${app.example.build.dir}
 
 # the full file name of the slicer page's bootstrap js file
-bootstrap.example.js=${app.example.dir}/bootstrap.js
+bootstrap.example.js=${app.example.build.dir}/bootstrap.js
 
 # the full file name of the slicer page's bootstrap js file
 bootstrap.example.json.name=bootstrap.json
-bootstrap.example.json=${app.example.dir}/${bootstrap.example.json.name}
+bootstrap.example.json=${app.example.build.dir}/${bootstrap.example.json.name}
-
-# this is the directory used for intermediate build artifacts used
-# by the slicer for generating theme images
-app.example.build.dir=${build.temp.dir}/slicer-temp
 
 # the name of the intermediate screenshot file used for image slicing
 build.capture.png=${app.example.build.dir}/theme-capture.png
@@ -615,8 +617,8 @@ build.capture.json=${app.example.build.dir}/theme-capture.json
 
 # the location of the slicer widget page
 app.example.theme.html.name=theme.html
+app.example.theme.html=${cmd.dir}/ant/build/slicer/${app.example.theme.html.name}
 app.example.fashion.html.name=fashion.html
-app.example.theme.html=${app.example.dir}/${app.example.theme.html.name}
 app.example.fashion.html=${app.example.dir}/${app.example.fashion.html.name}
 
 # a name prefix used for slicer page temporary artifacts
@@ -644,7 +646,7 @@ build.slice.options=
 
 # *****************************************************************************
 # Packager
-# these properties control features of the native packaging phase of the
+# these properties control features of the native packaging phase of the 
 # build process
 # *****************************************************************************
 
@@ -655,13 +657,13 @@ enable.desktop.packager=false
 # skips packaging the built application with cordova/phonegap
 skip.native-package=false
 
-# a property that controls whether a standalone manifest.json file will be
+# a property that controls whether a standalone manifest.json file will be 
 # generated for the native packaged application
 enable.standalone.manifest=false
 
 # *****************************************************************************
 # Resolve
-# these properties control aspects of the dynamic dependency resolver, which
+# these properties control aspects of the dynamic dependency resolver, which 
 # uses phantomjs to load the application and extract Ext.Loader class load
 # history.
 # *****************************************************************************
@@ -691,7 +693,7 @@ build.resolve.mode=references
 # the output file for the detected dynamic dependencies
 build.resolve.file=${build.temp.dir}/resolve.json
 
-# controls whether unmatched external references in the specified file will
+# controls whether unmatched external references in the specified file will 
 # generate build warnings or build failures
 build.resolve.allow.unmatched=true
 
@@ -704,4 +706,4 @@ build.resolve.allow.unmatched=true
 build.trigger.targets=refresh,resources,sass
 
 # the watcher targets to run that monitor for code changes
-build.watcher.targets=-watch-compiler
+build.watcher.targets=-watch-fashion,-watch-compiler

.sencha/app/init-impl.xml

@@ -19,11 +19,13 @@
         <script language="javascript">
             <![CDATA[
             var f = new java.io.File(project.getProperty("basedir"));
-            var sub = ".sencha/workspace/sencha.cfg";
+            var sub = ".sencha/workspace/sencha.cfg"
+            var sub2 = "workspace.json";
 
             for (var p = f; p; p = p.getParentFile()) {
                 var t = new java.io.File(p, sub);
-                if (t.exists()) {
+                var t2 = new java.io.File(p, sub2);
+                if (t.exists() || t2.exists()) {
                     // we found the workspace folder!
 
                     t = new java.io.File(p, "local.properties");
@@ -87,13 +89,20 @@
         <!--
         calculate the appropriate build.compression value
         -->
-        <condition property="build.compression" value="-yui">
+        <condition property="build.compression" value="-cmd">
             <or>
                 <x-is-true value="${build.compression.yui}"/>
                 <equals arg1="yui" arg2="${app.compressor.type}"/>
             </or>
         </condition>
 
+        <condition property="build.compression" value="-cmd">
+            <or>
+                <x-is-true value="${build.compression.cmd}"/>
+                <equals arg1="cmd" arg2="${app.compressor.type}"/>
+            </or>
+        </condition>
+
         <condition property="build.compression" value="-closure">
             <or>
                 <x-is-true value="${build.compression.closure}"/>
@@ -144,6 +153,8 @@
         <property name="app.sass.fashion" value="false"/>
         <property name="app.sass.rhino" value="false"/>
         <property name="app.sass.dynamic" value="false"/>
+        <property name="app.sass.generated.var" value="${app.sass.save}"/>
+
     </target>
     <target name="-after-init"/>
 
@@ -219,6 +230,23 @@
             </else>
         </if>
 
+        <if>
+            <or>
+                <equals arg1="${app.output.js.filter}" arg2="all"/>
+                <equals arg1="${app.output.js.filter}" arg2="minimum"/>
+            </or>
+            <then>
+                <property name="enable.used.deps" value="false"/>
+            </then>
+        </if>
+        
+        <if>
+            <equals arg1="${app.output.js.filter}" arg2="used"/>
+            <then>
+                <property name="enable.used.deps" value="true"/>
+            </then>
+        </if>
+        
         <if>
             <equals arg1="${app.toolkit}" arg2="modern"/>
             <then>
@@ -239,6 +267,18 @@
             </then>
         </if>
 
+        <if>
+            <or>
+                <x-is-false value="${app.output.progressive.enable}"/>
+                <not>
+                    <isset property="${app.output.progressive.enable}"/>
+                </not>
+            </or>
+            <then>
+                <property name="${skip.progressive}" value="1"/>
+            </then>
+        </if>
+        
         <if>
             <!--If Deltas are FALSE, deltas do not exist, or caching is disabled then skip delta patching-->
             <or>
@@ -340,6 +380,19 @@
         </condition>
         <property name="enable.split.framework" value="false"/>
 
+        <if>
+            <equals arg1="${app.output.js.filter}" arg2="used"/>
+            <then>
+                <property name="include.used.package.deps">
+                    include
+                        -usedPackagesDeps
+                    and
+                </property>
+            </then>
+        </if>
+        <property name="include.used.package.deps">
+            # no-op
+        </property> 
 
         <x-compile refid="${compiler.ref.id}"
                    dir="${app.dir}"
@@ -372,6 +425,7 @@
                 ${build.operations}
                 and
                 ${exclude.boot}
+                ${include.used.package.deps}
                 save
                     page
             ]]>
@@ -391,6 +445,7 @@
                 ${build.operations}
                 and
                 ${exclude.boot}
+                ${include.used.package.deps}
                 save
                     page
             ]]>
@@ -403,7 +458,9 @@
                   defaultSassFile="${app.out.scss}"
                   defaultCssFile="${app.out.css}"
                   refid="app.web.server"
-                  saveVariablesProp="app.sass.save"
+                  saveVariablesProp="app.sass.generated.var"
+                  uiDirProp="app.sass.generated.src"
+                  sassNamespaceProp="app.sass.namespace"
                   j2eeMode="${use.webxml}">
             <mapping name="~cmd" path="${cmd.dir}"/>
             <mapping name="" path="${build.web.root}"/>

.sencha/app/js-impl.xml

@@ -10,18 +10,121 @@
             splitModePropName="enable.split.mode"
             pageModePropName="app.page.mode"
             hasJsSdkPropName="app.has.js.sdk"
-            hasCssSdkPropName="app.has.css.sdk"/>
+            hasCssSdkPropName="app.has.css.sdk"
+            hasUsesPackagesPropName="app.has.uses" />
     </target>
 
     <!--    
     this is the standard js compile target that builds the output js file(s)
     -->
     <target name="-compile-js" depends="-detect-app-build-properties">
+
+        <property name="app.output.framework.include"
+                  value="package-sencha-core,framework,toolkit,package-core"/>
+
+        <property name="enable.used.deps" value="${app.has.uses}"/>
+        
+        <if>
+            <x-is-true value="${enable.used.deps}"/>
+            <then>
+                <x-compile refid="${compiler.ref.id}">
+                    # determine the base set of framework files
+                    exclude
+                        -all
+                    and
+                    include
+                        -tag=${app.output.framework.include}
+                    and
+                    save
+                        allframework
+                </x-compile>
+
+                <for param="file">
+                    <fileset dir="${workspace.build.dir}/temp" includes="**/deps.json"/>
+                    <sequential>
+                        <x-compile refid="${compiler.ref.id}">
+                            # now load the transitive set based on the json data
+                            exclude
+                                -all
+                            and
+                            include
+                                -json-data=@{file}
+                                -r
+                            and
+                            save
+                                deps
+                            and
+                            
+                            # add any needed deps to the page save set
+                            include
+                                -set=page
+                            and
+                            save
+                                page
+                        </x-compile>
+                    </sequential>
+                </for>
+            </then>
+            <else>
+                <if>
+                    <equals arg1="${app.output.js.filter}" arg2="all"/>
+                    <then>
+                        <x-compile refid="${compiler.ref.id}">
+                            # if filtering requirements is configured for 'all'
+                            # then just include all js content on the classpath to 
+                            # ensure all dependencies are provided for the used packages
+                            include 
+                                -all
+                            and
+                            save
+                                page
+                        </x-compile>
+                    </then>
+                </if>
+            </else>
+        </if>
+        
+        
         <if>
             <x-is-true value="${enable.split.mode}"/>
             <then>
-                <property name="app.output.framework.include"
+                <local name="build.js.framework.fwset" />
-                          value="package-sencha-core,framework,toolkit,package-core"/>
+                <local name="build.js.framework.rtl" />
+                <if>
+                    <or>
+                        <x-is-true value="${app.output.framework.all}" />
+                        <isset property="app.has.uses" />
+                    </or>
+                    <then>
+                        <property name="build.include.all.scss" value="true" />
+                        <property name="build.js.framework.fwset"> </property>
+                        <if>
+                            <x-is-false value="${app.output.framework.rtl}" />
+                            <then>
+                                <property name="build.js.framework.rtl">
+                                    <![CDATA[
+                                        exclude
+                                            -namespace=Ext.rtl
+                                        and
+                                    ]]>
+                                </property>
+                            </then>
+                            <else>
+                                <property name="build.js.framework.rtl"> </property>
+                            </else>
+                        </if>
+                    </then>
+                    <else>
+                        <property name="build.js.framework.fwset">
+                            <![CDATA[
+                                intersect
+                                    -set=page,allframework
+                                and
+                            ]]>
+                        </property>
+                        <property name="build.js.framework.rtl"> </property>
+                    </else>
+                </if>
 
                 <x-compile refid="${compiler.ref.id}">
                     <![CDATA[
@@ -40,12 +143,11 @@
                         save
                             allframework
                         and
-                        intersect
+                        ${build.js.framework.fwset}
-                            -set=page,allframework
-                        and
                         save
                             frameworkdeps
                         and
+                        ${build.js.framework.rtl}
                         include
                             -tag=Ext.cmd.derive
                         and
@@ -80,6 +182,7 @@
                 </x-compile>
             </then>
             <else>
+                <local name="framework.include.filter"/>
                 <x-compile refid="${compiler.ref.id}">
                     <![CDATA[
                         # build an all-classes.js file that contains

.sencha/app/native.defaults.properties

@@ -18,8 +18,8 @@ build.options.logger=no
 
 build.options.debug=false
 
-# enable yui compression
+# enable cmd compression
-build.compression.yui=1
+build.compression.cmd=1
 
 enable.standalone.manifest=true
 

.sencha/app/package.defaults.properties

@@ -21,7 +21,7 @@ build.options.logger=no
 
 build.options.debug=false
 
-# enable yui compression
+# enable cmd compression
-build.compression.yui=1
+build.compression.cmd=1
 
 app.microloader.name=testing.js

.sencha/app/page-impl.xml

@@ -2,15 +2,22 @@
 
     <macrodef name="x-build-microload-markup">
         <sequential>
-            <x-sencha-command dir="${app.dir}" inheritall="true">
+            <if>
-                <![CDATA[
+                <not>
-                fs
+                    <equals arg1="${build.compression}" arg2=""/>
-                    minify
+                </not>
-                        ${build.embedded.microloader.compressor}
+                <then>
-                        -from=${build.microloader.path}
+                    <x-sencha-command dir="${app.dir}" inheritall="true">
-                        -to=${build.microloader.path}
+                        <![CDATA[
-                ]]>
+                    fs
-            </x-sencha-command>
+                        minify
+                            ${build.embedded.microloader.compressor}
+                            -from=${build.microloader.path}
+                            -to=${build.microloader.path}
+                    ]]>
+                    </x-sencha-command>
+                </then>
+            </if>
             <if>
                 <x-is-true value="${build.enable.embedded.microloader}"/>
                 <then>
@@ -55,6 +62,7 @@
                         # generate json file
                         microload
                             -operation=manifest
+                            -jsonp=Ext.Microloader.setManifest
                             -fashion=${use.fashion}
                             -tpl=${build.microloader.json.tpl.embedded}
                             -out=${build.microloader.path}
@@ -77,6 +85,7 @@
                         # generate json file
                         microload
                             -operation=manifest
+                            -jsonp=Ext.Microloader.setManifest
                             -fashion=${use.fashion}
                             -tpl=${build.microloader.json.tpl.standalone}
                             -out=${build.out.json.path}
@@ -307,11 +316,44 @@
                  value="&lt;html"/>
     </target>
 
+    <target name="-generate-progressive-webapp" depends="-init-compiler">
+        <if>
+            <x-is-false value="${skip.progressive}"/>
+            <then>
+                <x-compile refid="${compiler.ref.id}">
+                    <![CDATA[
+                    progressive-webapp
+                        -buildDir=${build.out.base.path}
+                    ]]>
+                </x-compile>
+            </then>
+        </if>
+    </target>
+    
+    
+    <target name="-generate-service-worker" depends="-init-compiler">
+        <if>
+            <x-is-false value="${skip.progressive}"/>
+            <then>
+                <x-compile refid="${compiler.ref.id}">
+                    <![CDATA[
+                    progressive-webapp
+                        -buildDir=${build.out.base.path}
+                        +serviceWorker
+                    ]]>
+                </x-compile>
+            </then>
+        </if>
+    </target>
+    
+    
     <target name="-before-page"/>
     <target name="-page"
             depends="-copy-app-resources,
+                     -generate-progressive-webapp,
                      -generate-deltas,
                      -build-output-page,
-                     -generate-cache-manifest"/>
+                     -generate-cache-manifest,
+                     -generate-service-worker"/>
     <target name="-after-page"/>
 </project>

.sencha/app/refresh-impl.xml

@@ -19,6 +19,9 @@
                 <not>
                     <isset property="app.watch.enabled"/>
                 </not>
+                <not>
+                    <isset property="app.uses"/>
+                </not>
             </and>
         </condition>
         <property name="manifest.root.excludes" value=""/>
@@ -41,6 +44,9 @@
                         exclude
                             -tag=${refresh.file.filter}
                         and
+                        exclude
+                            -file=Boot.js
+                        and
                         save
                             bootstrap
                     ]]>
@@ -52,6 +58,9 @@
                         include
                             -all
                         and
+                        exclude
+                            -file=Boot.js
+                        and
                         save
                             bootstrap
                     ]]>
@@ -63,9 +72,9 @@
                              to="${build.json.bootstrap.path}"
                              property="build.json.bootstrap.rel.path"/>
 
-<echo file="${app.bootstrap.js}">var Ext = Ext || {};
+<x-file-write file="${app.bootstrap.js}">var Ext = Ext || {};
 Ext.manifest = Ext.manifest || "${build.json.bootstrap.rel.path}";
-</echo>
+</x-file-write>
 
         <x-compile refid="${compiler.ref.id}">
             <![CDATA[
@@ -78,6 +87,7 @@ Ext.manifest = Ext.manifest || "${build.json.bootstrap.rel.path}";
                 and
                 microload
                     -operation=manifest
+                    -jsonp=Ext.Microloader.setManifest
                     -fashion=${use.fashion}
                     -bootstrap
                     +ignoreDisabled
@@ -104,13 +114,13 @@ Ext.manifest = Ext.manifest || "${build.json.bootstrap.rel.path}";
         by the default development.js microloader
         -->
 
-<echo file="${build.json.bootstrap.path}">
+<x-file-write file="${build.json.bootstrap.path}">
 /**
  * This file is generated by Sencha Cmd and should NOT be edited. It is a
  * combination of content from app.json, and all required package's package.json
  * files.  Customizations should be placed in app.json.
  */
-</echo>
+</x-file-write>
         <x-compile refid="${compiler.ref.id}">
             <![CDATA[
             microload
@@ -129,9 +139,14 @@ Ext.manifest = Ext.manifest || "${build.json.bootstrap.rel.path}";
     '-detect-app-build-properties' is defined in js-impl.xml
     -->
     <target name="-refresh-app" 
-            depends="-detect-app-build-properties,
+            depends="-detect-app-build-properties">
-                     -refresh-app-manifest,
+        <if>
-                     -refresh-app-bootstrap"/>
+            <equals arg1="development" arg2="${build.environment}"/>
+            <then>
+                <x-ant-call target="-refresh-app-manifest,-refresh-app-bootstrap"/>
+            </then>
+        </if>
+    </target>
     
     <!--
     Refresh app

.sencha/app/sass-impl.xml

@@ -15,7 +15,10 @@
             property="image.search.path"/>
         
         <if>
-            <x-is-true value="${build.include.all.scss}"/>
+            <or>
+                <x-is-true value="${app.has.uses}" />
+                <x-is-true value="${build.include.all.scss}"/>
+            </or>
             <then>
                 <property name="sass.name.filter">
                     include
@@ -107,18 +110,21 @@
 				<copy file="${app.out.scss.tmp}" tofile="${app.out.scss}" overwrite="true"/>
 			</then>
 		</if>
-		
+    
-        <!--
+        <if>
-        app.out.css.path is relative to the app output index.html file
+            <equals arg1="development" arg2="${build.environment}"/>
-        -->
+            <then>
-        <x-get-relative-path
+                <!--
-            from="${app.dir}"
+                app.out.css.path is relative to the app output index.html file
-            to="${app.out.css}"
+                -->
-            property="app.out.css.path"
+                <x-get-relative-path
-        />
+                    from="${app.dir}"
+                    to="${app.out.css}"
+                    property="app.out.css.path"
+                />
       
 <!--update the application's bootstrap.css file to point to the build output-->
-<echo file="${build.bootstrap.css.path}">
+<x-file-write file="${build.bootstrap.css.path}">
 <![CDATA[
 /*
  * This file is generated by Sencha Cmd and should NOT be edited. It redirects
@@ -127,7 +133,9 @@
  */
 @import '${app.out.css.path}';
 ]]>
-</echo>
+</x-file-write>
+            </then>
+        </if>
     </target>
 
     <!--
@@ -186,73 +194,130 @@
     scss file, then running compass with the css, sass, and config options set
     -->
     <target name="-compass-compile-theme-package" depends="-load-sass-page">
-        <x-run-if-true value="${enable.ext42.themes}">
+        <if>
-            <local name="compress.uptodate"/>
+            <x-is-true value="${skip.sass.rebuild}"/>
-            
+            <then>
-            <x-ant-call target="-compile-sass"/>
+                <x-run-if-true value="${enable.ext42.themes}">
+                    <x-ant-call target="-compile-sass"/>
+                </x-run-if-true>
+            </then>
+            <else>
+                <x-run-if-true value="${enable.ext42.themes}">
+                    <local name="compress.uptodate"/>
+
+                    <x-ant-call target="-compile-sass"/>
 
-            <if>
-                <x-is-true value="${app.sass.fashion}"/>
-                <then>
                     <if>
-                        <x-is-true value="${app.sass.rhino}"/>
+                        <x-is-true value="${app.sass.fashion}"/>
                         <then>
-                            <x-fashion-compile
+                            <if>
-                                    file="${app.out.scss}"
+                                <x-is-true value="${app.sass.rhino}"/>
-                                    toFile="${app.out.css}"/>
+                                <then>
-                        </then>
+                                    <x-fashion-compile
-                        <else>
+                                            file="${app.out.scss}"
-                            <x-fashion-live-update input="${app.out.scss}"
+                                            toFile="${app.out.css}"/>
-                                                   output="${app.out.css}"
+                                </then>
-                                                   refId="app.web.server"
+                                <else>
-                                                   split="${build.css.selector.limit}"
+                                    <x-fashion-live-update input="${app.out.scss}"
-                                                   compress="${build.css.compress}"
+                                                           output="${app.out.css}"
-                                                   compilerRefId="${compiler.ref.id}"/>
+                                                           refId="app.web.server"
+                                                           split="${build.css.selector.limit}"
+                                                           compress="${build.css.compress}"
+                                                           compilerRefId="${compiler.ref.id}"/>
 
-                            <x-sencha-command>
+                                    <x-compile refid="${compiler.ref.id}">
-                                fashion
+                                        <![CDATA[
-                                    -compress=${build.css.compress}
+                                microload
-                                    -split=${build.css.selector.limit}
+                                    -operation=manifest
-                                    -saveFile=${app.dir}/${app.sass.save}
+                                    -fashion=false
-                                    ${app.out.scss}
+                                    -tpl=${build.microloader.json.tpl.standalone}
-                                    ${app.out.css}
+                                    -out=${build.out.json.path}
-                            </x-sencha-command>
+                                    -resourcePath=${build.out.base.path}
+                                    -basePath=${build.out.metadata.dir}
+                                ]]>
+                                    </x-compile>
 
-                            <x-update-css-array input="${app.out.css}"
+                                    <x-sencha-command>
-                                                compilerRefId="${compiler.ref.id}"/>
+                                        fashion
-                        </else>
+                                        -config=${build.out.json.path}
-                    </if>
+                                        -compress=${build.css.compress}
-                </then>
+                                        -split=${build.css.selector.limit}
-                <else>
+                                        -saveFile=${app.dir}/${app.sass.generated.var}
-                    <x-compass-compile
+                                        -slicer=false
-                            rubyPath="${build.ruby.path}"
+                                        ${app.out.scss}
-                            dir="${compass.working.dir}"
+                                        ${app.out.css}
-                            trace="${compass.compile.trace}"
+                                    </x-sencha-command>
-                            boring="${compass.compile.boring}"
-                            force="${compass.compile.force}"
-                            sassdir="${compass.sass.dir}"
-                            cssdir="${compass.css.dir}"
-                            config="${compass.config.file}"/>
 
-                    <uptodate property="compress.uptodate"
+                                    <x-update-css-array input="${app.out.css}"
-                              value="true"
+                                                        compilerRefId="${compiler.ref.id}"/>
-                              srcfile="${app.out.scss}.tmp"
-                              targetfile="${app.out.css}"/>
 
-                    <if>
+                                    <if>
-                        <x-is-true value="${compress.uptodate}"/>
+                                        <and>
-                        <!--<x-is-true value="true"/>-->
+                                            <available file="${build.out.css.dir}/css-vars.js"/>
-                        <then>
+                                        </and>
-                            <x-compress-css-files dir="${build.out.css.dir}"
+                                        <then>
-                                                  prefix="${app.out.base.debug}"
+
-                                                  outprefix="${app.out.base}"
+                                            <if>
-                                                  preprocess="${build.css.preprocess}"
+                                                <not>
-                                                  compress="${build.css.compress}"/>
+                                                    <equals arg1="${build.compression}" arg2=""/>
+                                                </not>
+                                                <then>
+                                                    <x-compress-js srcFile="${build.out.css.dir}/css-vars.js"
+                                                                   outFile="${build.out.css.dir}/css-vars.js"/>
+                                                </then>
+                                            </if>
+
+                                            <if>
+                                                <not>
+                                                    <equals arg1="${build.environment}" arg2="development"/>
+                                                </not>
+                                                <then>
+                                                    <concat destfile="${build.out.js.path}" append="true">
+                                                        <fileset dir="${build.out.css.dir}">
+                                                            <include name="css-vars.js"/>
+                                                        </fileset>
+                                                    </concat>
+                                                </then>
+                                            </if>
+
+                                        </then>
+                                    </if>
+                                </else>
+                            </if>
                         </then>
+                        <else>
+                            <x-compass-compile
+                                    rubyPath="${build.ruby.path}"
+                                    dir="${compass.working.dir}"
+                                    trace="${compass.compile.trace}"
+                                    boring="${compass.compile.boring}"
+                                    force="${compass.compile.force}"
+                                    sassdir="${compass.sass.dir}"
+                                    cssdir="${compass.css.dir}"
+                                    config="${compass.config.file}"/>
+
+                            <uptodate property="compress.uptodate"
+                                      value="true"
+                                      srcfile="${app.out.scss}.tmp"
+                                      targetfile="${app.out.css}"/>
+
+                            <if>
+                                <x-is-true value="${compress.uptodate}"/>
+                                <!--<x-is-true value="true"/>-->
+                                <then>
+                                    <x-compress-css-files dir="${build.out.css.dir}"
+                                                          prefix="${app.out.base.debug}"
+                                                          outprefix="${app.out.base}"
+                                                          preprocess="${build.css.preprocess}"
+                                                          compress="${build.css.compress}"/>
+                                </then>
+                            </if>
+                        </else>
                     </if>
-                </else>
+                </x-run-if-true>
-            </if>
+            </else>
-        </x-run-if-true>
+        </if>
+        
     </target>
 
     <!--

.sencha/app/sencha.cfg

@@ -42,4 +42,5 @@ app.resource.paths=${app.dir}/resources
 
 app.framework.version=5.1.1.451
 
-app.cmd.version=6.1.2.15
+
+app.cmd.version=6.6.0.13

.sencha/app/slice-impl.xml

@@ -40,6 +40,7 @@
                     -all
                 and
                 sass
+                    +skipWatch
                     +class-name-vars
                     +etc
                     +vars
@@ -54,6 +55,7 @@
                     page
                 and
                 sass
+                    +skipWatch
                     +ruby
                     -output=${app.example.out.ruby}
             ]]>
@@ -68,7 +70,7 @@
             </then>
         </if>
 
-        <x-get-relative-path from="${app.example.dir}"
+        <x-get-relative-path from="${app.example.build.dir}"
                              to="${app.example.css}"
                              property="app.example.css.path"/>
         
@@ -97,12 +99,15 @@
                     <x-is-true value="${app.sass.rhino}"/>
                     <then>
                         <x-fashion-compile
+                                slicer="true"
                                 file="${app.example.build.dir}"
                                 toFile="${app.example.build.dir}"/>
                     </then>
                     <else>
                         <x-sencha-command>
                             fashion
+                            -config=${app.dir}/app.json
+                            -slicer=true
                             -compress=${build.css.compress}
                             -split=${build.css.selector.limit}
                             ${app.example.build.dir}
@@ -127,10 +132,22 @@
     <!-- Produces a bootstrap.js file for ext 4.2 slicer pages -->
     <target name="-generate-slicer-bootstrap" unless="framework.isV5">
         <local name="relpath"/>
+        <local name="cmd.dir.normalized"/>
         <x-get-relative-path from="${bootstrap.base.path}"
                              to="${framework.packages.dir}"
                              property="relpath"/>
 
+        <script language="javascript">
+            <![CDATA[
+                var dir = project.getProperty("cmd.dir") + '';
+                dir = dir.replace(/\\/g, '/');
+                if (dir.indexOf('/') !== 0) {
+                    dir = '/' + dir; 
+                }
+                project.setProperty("cmd.dir.normalized", dir);
+            ]]>
+        </script>
+        
         <x-bootstrap file="${bootstrap.example.js}"
                      basedir="${bootstrap.base.path}"
                      includeBoot="true"
@@ -140,7 +157,7 @@
                      overrideExcludeTags="">
 <![CDATA[
 Ext.Boot.loadSync([
-    "render.js",
+    "${cmd.dir.normalized}/ant/build/slicer/render.js",
     "${relpath}/ext-theme-base/sass/example/manifest.js",
     "${relpath}/ext-theme-base/sass/example/shortcuts.js",
     "custom.js"
@@ -182,6 +199,7 @@ Ext.Boot.loadSync([
             <![CDATA[
                 slicer-manifest
                     -exclude=${manifest.root.excludes}
+                    -jsonp=Ext.Microloader.setManifest
                     -removeBootstrapCssEntries=${remove.slicer.css.bootstrap.entries}
                     +ignoreDisabled
                     -basePath=${bootstrap.base.path}
@@ -201,12 +219,13 @@ Ext.Boot.loadSync([
         <echo>Capture theme image to ${build.capture.png}</echo>
         <x-sencha-command>
             <![CDATA[
-                        theme
+                theme
-                            capture
+                    capture
-                                -page=${app.example.theme.html}
+                        -base=${app.example.build.dir}
-                                -image=${build.capture.png}
+                        -page=${app.example.theme.html}
-                                -manifest=${build.capture.json}
+                        -image=${build.capture.png}
-                    ]]>
+                        -manifest=${build.capture.json}
+            ]]>
         </x-sencha-command>
     </target>
 

.sencha/app/watch-impl.xml

@@ -27,6 +27,24 @@
             fork="true"/>
     </target>
 
+    <target name="-watch-fashion" if="framework.isV6">
+        <x-fashion-watch
+                refName="fashion-watch"
+                inputFile="${app.out.scss}"
+                outputFile="${app.out.css}"
+                split="${build.css.selector.limit}"
+                compress="${build.css.compress}"
+                configFile="${build.out.json.path}"
+                saveFile="${app.dir}/${app.sass.generated.var}"
+                fork="true"/>
+    </target>
+
+    <target name="-stop-fashion-watch">
+        <x-fashion-watch
+                refName="fashion-watch"
+                stop="true"/>
+    </target>
+
     <macrodef name="x-run-compass-watch">
         <attribute name="directory"/>
         <sequential>
@@ -58,18 +76,35 @@
 
     <target name="-before-watch"/>
     <target name="-watch" depends="-init-web-server">
-        <x-ant-call target="${build.trigger.targets}"/>
+        <local name="skip.sass.rebuild"/>
-        <x-ant-call target="web-start" unless="skip.web.start">
+        <condition property="skip.sass.rebuild" value="true">
-            <param name="enable.background.server" value="true"/>
+            <isset property="framework.isV6"/>
-        </x-ant-call>
+        </condition>
-        <x-ant-call target="${build.watcher.targets}">
+        <property name="skip.sass.rebuild" value="false"/>
-            <param name="build.id" value="${build.id}"/>
+        <if>
-            <param name="build.name" value="${build.name}"/>
+            <x-lock-file file="${watch.lock.file}" refId="lock.ref"/>
-        </x-ant-call>
+            <then>
-        <x-ant-call target="web-stop" unless="skip.web.start">
+                <x-ant-call target="${build.trigger.targets}"/>
-            <param name="enable.background.server" value="true"/>
+                <x-ant-call target="web-start" unless="skip.web.start">
-        </x-ant-call>
+                    <param name="enable.background.server" value="true"/>
-        <x-ant-call target="-stop-compass-watch"/>
+                </x-ant-call>
+                <x-ant-call target="${build.watcher.targets}">
+                    <param name="build.id" value="${build.id}"/>
+                    <param name="build.name" value="${build.name}"/>
+                    <param name="skip.sass.rebuild" value="${skip.sass.rebuild}"/>
+                </x-ant-call>
+                <x-ant-call target="web-stop" unless="skip.web.start">
+                    <param name="enable.background.server" value="true"/>
+                </x-ant-call>
+                <x-ant-call target="-stop-compass-watch"/>
+                <x-ant-call target="-stop-fashion-watch"/>
+                <x-unlock-file refId="lock.ref"/>
+            </then>
+            <else>
+                <echo level="error" 
+                      message="App watch is already running for this build profile."/>
+            </else>
+        </if>
     </target>
     <target name="-after-watch" depends="init"/>
 </project>

.travis.yml

@@ -1,81 +1,46 @@
-sudo: required
+matrix:
-language: node_js
+  include:
-node_js:
+    - os: osx
-  - "8"
+      osx_image: xcode9.4
+      language: node_js
+      node_js: "10"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
+    - os: linux
+      sudo: required
+      services: docker
+      language: generic
 branches:
   only:
     - master
-
-os:
-  - linux
-  - osx
-
 cache:
   directories:
-    - node_modules
+  - node_modules
-    - $HOME/.electron
+  - $HOME/.cache/electron
-
+  - $HOME/.cache/electron-builder
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-
 before_install:
-  # native dependencies
+  - |
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      sudo apt-get update -qq;
+      mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.3.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
-      sudo apt-get install -qq libxml2-dev;
+      export PATH="/tmp/git-lfs:$PATH"
-      sudo apt-get install -qq libappindicator1;
-      sudo apt-get install -qq rpm;
     fi
 install:
   - git config --global core.autocrlf input
-  - git reset --hard HEAD
-  - npm run sencha:clean
   - git clone https://github.com/saenzramiro/rambox-build.git $TRAVIS_BUILD_DIR/build/production/Rambox/
-  - npm install
+before_script:
-  - npm uninstall electron-prebuilt
+  - git lfs pull
-  - npm i electron@$ELECTRON
-  - npm --prefix $TRAVIS_BUILD_DIR/build/production/Rambox/ install $TRAVIS_BUILD_DIR/build/production/Rambox/
 script:
-  - echo $TRAVIS_OS_NAME
+  - |
-  - node --version
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-  - npm --version
+      docker run --rm -ti \
-  - npm run build:$TRAVIS_OS_NAME
+        --env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
-
+        -v ${PWD}:/project \
-deploy:
+        -v ~/.cache/electron:/root/.cache/electron \
-  provider: releases
+        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
-  api_key:
+        electronuserland/builder \
-    secure: F7z4j9xzhpVyfovrf33jbVdW9dwgpIgbn85dxe8y/kZbQ9sAVU8LzoBZ3PlfeXmoV5CnSUa5j/fe8BmPKiG31kgAH7cktsCOgyOLggO1Sy+vnx7RQwwE/jzb7PzEqI2BP6TG/eOfylBxGBInWeaoSRfK3IRAvLHvvxY1eL4Wq/KRaanzMvh+JdCaStIKJSnI/rc9noI7vtOtgHot+F162s1G1k5/UcdbsfXWzotMVsonhlGgB/Jz9srnJpMpxYxaknR8UFPVRzOM5UzzMo64hXRUDnCFlYcTHcSAkvgKHI0SIPIS3kOdvgrYGavPLK2CAteQk7Dy1lHnEixmKPxG7eVAFwleUo8ePR82WXFkv5gacCvcrGrRLQ9nC/ygeMVgC5XxcHq3ykkcrstu5yjC1yEYFs23gA1Z4DIctwq1diyO72/FNxghV5ckN5WtJQs1QTT+Ec2NjLrWgFYuaEHYgAGopzTPN8gT9fyIv/lAq1S/l4P/z3EDS42UL+UTM77gyXSYShCKneDnFC34ATlYNDhJFRzLZ6qJG5UlOwrfXxUYeGUpQZlV41jg+VFWmPDAeQTMjGP5fRA3w1hFobBotBVyrtbcovTb4TFVTKJWOC/0wyiwku7YTY/nqMU/hR4IluTyRh9Z4NMn5xT5UW63OZd4DJvE573JxmJmnPc0fbo=
+        /bin/bash -c "npm i && npm i [email protected] && npm run build:linux"
-  file_glob: true
+    else
-  file:
+      npm run build:osx
-    - "dist/*.zip"
+    fi
-    - "dist/*.deb"
-    - "dist/*.tar.gz"
-    - "dist/*.AppImage"
-    - "dist/*.rpm"
-    - "dist/mac/*.zip"
-    - "dist/mac/*.dmg"
-  skip_cleanup: true
-  overwrite: true
-  prerelease: true
-  on:
-    repo: saenzramiro/rambox
-    tags: true
-    all_branches: true
-
-notifications:
-  email:
-    recipients:
-      - [email protected]
-    on_success: always
-    on_failure: always
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/0f214eb0d0017d3c5561
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always

CONTRIBUTING.md

@@ -0,0 +1,229 @@
+# Contributor's Guide
+
+We welcome pull requests! Follow these steps to contribute:
+
+1. Find an [issue](https://github.com/saenzramiro/rambox/issues) that needs assistance.
+1. Let us know you are working on it by posting a comment on the issue.
+1. Follow the [Contribution Guidelines](#contribution-guidelines) to start working on the issue.
+
+Working on your first Pull Request? You can learn how from this *free* series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
+
+##### If you've found a bug that is not on the board, [follow these steps](README.md#found-a-bug).
+
+---
+
+## Contribution Guidelines
+
+### Setup
+
+- [Prerequisites](#prerequisites)
+- [Forking the Project](#forking-the-project)
+- [Create a Branch](#create-a-branch)
+- [Set Up rambox](#set-up-rambox)
+
+### Create
+
+- [Make Changes](#make-changes)
+- [Run The Test Suite](#run-the-test-suite)
+
+### Submit
+
+- [Creating a Pull Request](#creating-a-pull-request)
+- [Common Steps](#common-steps)
+- [How We Review and Merge Pull Requests](#how-we-review-and-merge-pull-requests)
+- [How We Close Stale Issues](#how-we-close-stale-issues)
+- [Next Steps](#next-steps)
+- [Other Resources](#other-resources)
+
+### Prerequisites
+
+| Prerequisite                                                  | Version |
+| ------------------------------------------------------------- | ------- |
+| [Sencha](https://www.sencha.com/products/extjs/cmd-download/) | `=6.1.2.15`  |
+| [Ruby](https://www.ruby-lang.org/en/downloads/)               | `=2.3` |
+| [Node.js](https://nodejs.org)                                 | `~ ^4.0.0`  |
+| npm (comes with Node)                                         | `~ ^3.8.7`  |
+
+> _Updating to the latest releases is recommended_.
+
+If Node.js, ruby, or sencha cmd is already installed on your machine, run the following commands to validate the versions:
+
+```shell
+node -v
+ruby -v
+sencha
+```
+
+If your versions are lower than the prerequisite versions, you should update.
+
+### Forking the Project
+
+#### Setting Up Your System
+
+1. Install [Git](https://git-scm.com/) or your favorite Git client.
+1. (Optional) [Setup an SSH Key](https://help.github.com/articles/generating-an-ssh-key/) for GitHub.
+
+#### Forking rambox
+
+1. Go to the top level rambox repository: <https://github.com/saenzramiro/rambox>
+1. Click the "Fork" Button in the upper right hand corner of the interface ([More Details Here](https://help.github.com/articles/fork-a-repo/))
+1. After the repository (repo) has been forked, you will be taken to your copy of the rambox repo at <https://github.com/yourUsername/rambox>
+
+#### Cloning Your Fork
+
+1. Open a Terminal / Command Line / Bash Shell in your projects directory (_i.e.: `/yourprojectdirectory/`_)
+1. Clone your fork of rambox
+    - `git clone https://github.com/yourUsername/rambox.git`
+
+**(make sure to replace `yourUsername` with your GitHub username)**
+
+This will download the entire rambox repo to your projects directory.
+
+#### Setup Your Upstream
+
+1. Change directory to the new rambox directory (`cd rambox`)
+1. Add a remote to the official rambox repo:
+    - `git remote add upstream https://github.com/saenzramiro/rambox.git`
+
+Congratulations, you now have a local copy of the rambox repo! :tada:
+
+### Create a Branch
+
+Before you start working, you will need to create a separate branch specific to the issue / feature you're working on. You will push your work to this branch.
+
+#### Naming Your Branch
+
+Name the branch something like `fix/xxx` or `feature/xxx` where `xxx` is a short description of the changes or feature you are attempting to add. For example
+
+`fix/email-login` would be a branch where you fix something specific to email login.
+
+#### Adding Your Branch
+
+To create a branch on your local machine (and switch to this branch):
+
+```shell
+git checkout -b [name_of_your_new_branch]
+```
+
+and to push to GitHub:
+
+```shell
+git push origin [name_of_your_new_branch]
+```
+
+**If you need more help with branching, take a look at [this](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches).**
+
+### Set Up rambox
+
+Once you have rambox cloned, before you start the application, you first need to install all of the dependencies:
+
+```bash
+# Install NPM dependencies
+npm install
+```
+
+Then you need to add the private environment variables (API Keys):
+
+```bash
+# Copy `env-sample.js` with a name of env.js
+# Populate it with Auth0 clientid and domain e.g. test.auth0.com
+# You can get these details from one of your "apps" here https://manage.auth0.com/#/clients/
+
+# macOS / Linux
+cp env-sample.js env.js
+
+# Windows
+copy env-sample.js env.js
+```
+
+Then edit the `env.js` file and modify the API keys only for services that you will use.
+
+```bash
+# Compile the files...
+sencha app watch
+npm start # in a new terminal
+```
+
+### Make Changes
+
+This bit is up to you!
+
+#### How to find the code in the rambox codebase to fix/edit
+
+The best way to find out any code you wish to change/add or remove is using the GitHub search bar at the top of the repository page.
+For example, you could search for a challenge name and the results will display all the files along with line numbers.
+Then you can proceed to the files and verify this is the area that you were looking forward to edit.
+Always feel free to reach out to the chat room when you are not certain of any thing specific in the code.
+
+#### Adding or Editing Services
+
+The services are stored inside the file `./app/store/ServicesList.js`.  Add your service to the *BOTTOM* of the array.
+The logo it's referencing is located in `./resources/icons/`.
+To see these changes you'll need to stop your `npm start` and `sencha app watch`, and then rerun those.
+
+### Creating a Pull Request
+
+#### What is a Pull Request?
+
+A pull request (PR) is a method of submitting proposed changes to the rambox repo (or any repo, for that matter).
+You will make changes to copies of thefiles which make up rambox in a personal fork, then apply to have them accepted by rambox proper.
+
+#### Important: ALWAYS EDIT ON A BRANCH
+
+Take away only one thing from this document: Never, **EVER** make edits to the `staging` branch.
+ALWAYS make a new branch BEFORE you edit files.
+This is critical, because if your PR is not accepted, your copy of staging will be forever sullied and the only way to fix it is to delete your fork and re-fork.
+
+### Common Steps
+
+1. Once the edits have been committed, you will be prompted to create a pull request on your fork's GitHub Page.
+1. By default, all pull requests should be against the rambox main repo, `staging` branch.
+    - **Make sure that your Base Fork is set to saenzramiro/rambox when raising a Pull Request.**
+1. Submit a pull request.
+1. The title (also called the subject) of your PR should be descriptive of your changes and succinctly indicates what is being fixed.
+    - **Do not add the issue number in the PR title or commit message.**
+    - Examples: `Added Service servicename` `Correct typo in menu`
+1. In the body of your PR include a more detailed summary of the changes you made and why.
+    - If the PR is meant to fix an existing bug/issue then, at the end of your PR's description, append the keyword `closes` and #xxxx (where xxxx is the issue number).
+        - Example: `closes #1337`. This tells GitHub to automatically close the existing issue, if the PR is merged.
+1. Indicate if you have tested on a local copy of the site or not.
+
+### How We Review and Merge Pull Requests
+
+Rambox has a team of volunteer Issue Moderators. These Issue Moderators routinely go through open pull requests in a process called [Quality Assurance](https://en.wikipedia.org/wiki/Quality_assurance) (QA).
+
+1. If an Issue Moderator QA's a pull request and confirms that the new code does what it is supposed without seeming to introduce any new bugs, they will comment: `"LGTM" which means "Looks good to me."`
+1. Another Issue Moderator will QA the same pull request.
+    - Once they have also confirmed that the new code does what it is supposed to without seeming to introduce any new bugs, they will merge the pull request.
+
+If you would like to apply to join our Issue Moderator team - which is a Core Team position - message [@BerkeleyTrue](https://gitter.im/berkeleytrue) with links to 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commenting or QA'ing.
+
+### How We Close Stale Issues
+
+We will close any issues or pull requests that have been inactive for more than 15 days, except those that match the following criteria:
+
+- Bugs that are confirmed
+- Pull requests that are waiting on other pull requests to be merged
+- Features that are a part of a GitHub project
+
+### Next Steps
+
+#### If your PR is accepted
+
+Once your PR is accepted, you may delete the branch you created to submit it.
+This keeps your working fork clean.
+
+You can do this with a press of a button on the GitHub PR interface. You can delete the local copy of the branch with: `git branch -D branch/to-delete-name`
+
+#### If your PR is rejected
+
+Don't despair! You should receive solid feedback as to why it was rejected and what changes are needed.
+
+Many Pull Requests, especially first Pull Requests, require correction or updating.
+If you have used the GitHub interface to create your PR, you will need to close your PR, create a new branch, and re-submit.
+
+If you have a local copy of the repo, you can make the requested changes and amend your commit with: `git commit --amend`
+This will update your existing commit.
+When you push it to your fork you will need to do a force push to overwrite your old commit: `git push --force`
+
+Be sure to post in the PR conversation that you have made the requested changes.

README.md

@@ -1,165 +1,167 @@
-<h1 align="center">
+<div align="center">
-  <br>
+  <h1>
-  <a href="http://rambox.pro"><img src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/Icon.png" width="256px" alt="Rambox"></a>
+    <br />
-  <br>
+    <a href="https://rambox.pro"><img src="./resources/Icon.png" width="256px" alt="Rambox" /></a><br />
-  Rambox
+    Rambox CE
-  <br>
+    <br /><br/>
-  <br>
+  </h1>
-</h1>
+
-
+  <h4>Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.</h4>
-<h4 align="center">Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.</h4>
+
-
+  <p>
-<p align="center">
+    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-green.svg" alt="Donate with PayPal" /></a>
-  <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-green.svg" alt="Donate with PayPal"></a>
+    <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/github/license/saenzramiro/rambox.svg" alt="GNU GPL v3" /></a>
-  <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/github/license/saenzramiro/rambox.svg" alt="GNU GPL v3"></a>
+    <a href="https://gitter.im/saenzramiro/rambox" target="_blank"><img src="https://badges.gitter.im/saenzramiro/rambox.svg" alt="Gitter" /></a>
-  <a href="https://gitter.im/saenzramiro/rambox" target="_blank"><img src="https://badges.gitter.im/saenzramiro/rambox.svg" alt="Gitter"></a>
+    <a href="https://github.com/saenzramiro/rambox/releases/latest" target="_blank">
-  <a href="https://github.com/saenzramiro/rambox/releases/latest" target="_blank"><img src="https://img.shields.io/github/release/saenzramiro/rambox.svg" alt="Release"></a>
+      <img src="https://img.shields.io/github/release/saenzramiro/rambox.svg" alt="Release" />
-  <a target="_blank" href="https://crowdin.com/project/rambox"><img src="https://d322cqt584bo4o.cloudfront.net/rambox/localized.svg"></a>
+    </a>
-</p>
+    <a target="_blank" href="https://crowdin.com/project/rambox"><img src="https://d322cqt584bo4o.cloudfront.net/rambox/localized.svg" /></a>
-<p align="center">
+  </p>
-  <a href="https://travis-ci.org/saenzramiro/rambox" target="_blank"><img src="https://travis-ci.org/saenzramiro/rambox.svg?branch=master" alt="Travis CI"></a>
+  <p>
-  <a href="https://ci.appveyor.com/project/saenzramiro/rambox" target="_blank"><img src="https://ci.appveyor.com/api/projects/status/3kk9ixjgxwrh7yfy?svg=true" alt="AppVeyor CI"></a>
+    <a href="https://travis-ci.org/saenzramiro/rambox" target="_blank"><img src="https://travis-ci.org/saenzramiro/rambox.svg?branch=master" alt="Travis CI" /></a>
-  <a href="https://david-dm.org/saenzramiro/rambox" title="Dependency status"><img src="https://david-dm.org/saenzramiro/rambox.svg"/></a>
+    <a href="https://ci.appveyor.com/project/saenzramiro/rambox" target="_blank"><img src="https://ci.appveyor.com/api/projects/status/3kk9ixjgxwrh7yfy?svg=true" alt="AppVeyor CI" /></a>
-  <a href="https://david-dm.org/saenzramiro/rambox#info=devDependencies" title="devDependency status"><img src="https://david-dm.org/saenzramiro/rambox/dev-status.svg"/></a>
+    <a href="https://david-dm.org/saenzramiro/rambox" title="Dependency status"><img src="https://david-dm.org/saenzramiro/rambox.svg" /></a>
-</p>
+    <a href="https://david-dm.org/saenzramiro/rambox#info=devDependencies" title="devDependency status"><img src="https://david-dm.org/saenzramiro/rambox/dev-status.svg" /></a>
-
+  </p>
-<h5 align="center">Available for Windows, Mac and Linux.</h5>
+
-
+  <h5>Available for Windows, Mac and Linux.</h5>
-<h5 align="center"><a href="http://rambox.pro/#download" target="_blank"><img src="https://cdn.rawgit.com/saenzramiro/rambox/gh-pages/images/img-download.svg" width="250" alt="DOWNLOAD HERE"></a></h5>
+
-
+  <h5><a href="https://rambox.pro/#download" target="_blank"><img src="https://cdn.rawgit.com/saenzramiro/rambox/gh-pages/images/img-download.svg" width="250" alt="DOWNLOAD HERE" /></a></h5>
-<h6 align="center">Logo designed by <a href="http://andyur.com/" target="_blank">Andriy Yurchenko</a></h6>
+
-
+  <h6>Logo designed by <a href="https://www.linkedin.com/in/andriyyurchenko/" target="_blank">Andriy Yurchenko</a></h6>
-----------
+</div>
+
+---
 
 ## Table of Contents
 
+- [Table of Contents](#table-of-contents)
 - [Screenshot](#screenshot)
-- [Services available - 89](#services-available---95)
+- [Services available - 99](#services-available---99)
 - [Features](#features)
 - [Privacy](#privacy)
 - [Donations](#donations)
 - [Translations](#translations)
 - [Install on Linux - Steps](#install-on-linux---steps)
-- [To Do](#to-do)
+- [Contributing](#contributing)
-- [Getting Involved](#getting-involved)
+  - [Quickstart](#quickstart)
-- [Getting Started](#getting-started)
-    - [Technologies](#technologies)
-    - [Environment](#environment)
-    - [Quickstart](#quickstart)
-    - [Compile on Ubuntu](#compile-on-ubuntu)
 - [Disclosure](#disclosure)
 - [Licence](#licence)
 
-----------
+---
 
 ## Screenshot
 
-![Rambox](https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/screenshots/mac.png)
+![Rambox](./resources/screenshots/mac.png)
-
+
-
+## Services available - 100
-## Services available - 95
+
-
+<img width="80" align="left" src="./resources/icons/whatsapp.png" alt="WhatsApp" title="WhatsApp" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/whatsapp.png" alt="WhatsApp" title="WhatsApp">
+<img width="80" align="left" src="./resources/icons/messenger.png" alt="Messenger" title="Messenger" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/messenger.png" alt="Messenger" title="Messenger">
+<img width="80" align="left" src="./resources/icons/skype.png" alt="Skype" title="Skype" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/skype.png" alt="Skype" title="Skype">
+<img width="80" align="left" src="./resources/icons/slack.png" alt="Slack" title="Slack" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/slack.png" alt="Slack" title="Slack">
+<img width="80" align="left" src="./resources/icons/hangouts.png" alt="Hangouts" title="Hangouts" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hangouts.png" alt="Hangouts" title="Hangouts">
+<img width="80" align="left" src="./resources/icons/telegram.png" alt="Telegram" title="Telegram" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/telegram.png" alt="Telegram" title="Telegram">
+<img width="80" align="left" src="./resources/icons/wechat.png" alt="WeChat" title="WeChat" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/wechat.png" alt="WeChat" title="WeChat">
+<img width="80" align="left" src="./resources/icons/gmail.png" alt="Gmail" title="Gmail" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/gmail.png" alt="Gmail" title="Gmail">
+<img width="80" align="left" src="./resources/icons/inbox.png" alt="Inbox" title="Inbox" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/inbox.png" alt="Inbox" title="Inbox">
+<img width="80" align="left" src="./resources/icons/hipchat.png" alt="HipChat" title="HipChat" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hipchat.png" alt="HipChat" title="HipChat">
+<img width="80" align="left" src="./resources/icons/allo.png" alt="Allo" title="Allo" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/allo.png" alt="Allo" title="Allo">
+
-
+<img width="80" align="left" src="./resources/icons/chatwork.png" alt="ChatWork" title="ChatWork"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/chatwork.png" alt="ChatWork" title="ChatWork">
+<img width="80" align="left" src="./resources/icons/groupme.png" alt="GroupMe" title="GroupMe"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/groupme.png" alt="GroupMe" title="GroupMe">
+<img width="80" align="left" src="./resources/icons/grape.png" alt="Grape" title="Grape"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/grape.png" alt="Grape" title="Grape">
+<img width="80" align="left" src="./resources/icons/gitter.png" alt="Gitter" title="Gitter"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/gitter.png" alt="Gitter" title="Gitter">
+<img width="80" align="left" src="./resources/icons/steam.png" alt="Steam" title="Steam"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/steam.png" alt="Steam" title="Steam">
+<img width="80" align="left" src="./resources/icons/discord.png" alt="Discord" title="Discord"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/discord.png" alt="Discord" title="Discord">
+<img width="80" align="left" src="./resources/icons/noysi.png" alt="Noysi" title="Noysi"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/noysi.png" alt="Noysi" title="Noysi">
+<img width="80" align="left" src="./resources/icons/outlook.png" alt="Outlook" title="Outlook"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/outlook.png" alt="Outlook" title="Outlook">
+<img width="80" align="left" src="./resources/icons/outlook365.png" alt="Outlook 365" title="Outlook 365"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/outlook365.png" alt="Outlook 365" title="Outlook 365">
+<img width="80" align="left" src="./resources/icons/tutanota.png" alt="TutaNota" title="TutaNota"/>
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/tutanota.png" alt="TutaNota" title="TutaNota">
+<img width="80" align="left" src="./resources/icons/hushmail.png" alt="Hushmail" title="Hushmail" />
-
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hushmail.png" alt="Hushmail" title="Hushmail">
+<img width="80" align="left" src="./resources/icons/bearychat.png" alt="BearyChat" title="BearyChat" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/bearychat.png" alt="BearyChat" title="BearyChat">
+<img width="80" align="left" src="./resources/icons/aol.png" alt="Aol" title="Aol" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/aol.png" alt="Aol" title="Aol">
+<img width="80" align="left" src="./resources/icons/sync.png" alt="Sync" title="Sync" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/sync.png" alt="Sync" title="Sync">
+<img width="80" align="left" src="./resources/icons/wire.png" alt="Wire" title="Wire" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/aim.png" alt="Aim" title="Aim">
+<img width="80" align="left" src="./resources/icons/rocketchat.png" alt="Rocket Chat" title="Rocket Chat" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/wire.png" alt="Wire" title="Wire">
+<img width="80" align="left" src="./resources/icons/missive.png" alt="Missive" title="Missive" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/rocketchat.png" alt="Rocket Chat" title="Rocket Chat">
+<img width="80" align="left" src="./resources/icons/yahoo.png" alt="Yahoo! Mail" title="Yahoo! Mail" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/missive.png" alt="Missive" title="Missive">
+<img width="80" align="left" src="./resources/icons/ryver.png" alt="Ryver" title="Ryver" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/yahoo.png" alt="Yahoo! Mail" title="Yahoo! Mail">
+<img width="80" align="left" src="./resources/icons/yandex.png" alt="Yandex Mail" title="Yandex Mail" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/ryver.png" alt="Ryver" title="Ryver">
+<img width="80" align="left" src="./resources/icons/dasher.png" alt="Dasher" title="Dasher" />
-
+<img width="80" align="left" src="./resources/icons/dingtalk.png" alt="DingTalk" title="DingTalk" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/yandex.png" alt="Yandex Mail" title="Yandex Mail">
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/dasher.png" alt="Dasher" title="Dasher">
+<img width="80" align="left" src="./resources/icons/flowdock.png" alt="FlowDock" title="FlowDock" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/dingtalk.png" alt="DingTalk" title="DingTalk">
+<img width="80" align="left" src="./resources/icons/mattermost.png" alt="Mattermost" title="Mattermost" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/flowdock.png" alt="FlowDock" title="FlowDock">
+<img width="80" align="left" src="./resources/icons/voxer.png" alt="Voxer" title="Voxer" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/mattermost.png" alt="Mattermost" title="Mattermost">
+<img width="80" align="left" src="./resources/icons/glip.png" alt="Glip" title="Glip" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/voxer.png" alt="Voxer" title="Voxer">
+<img width="80" align="left" src="./resources/icons/yahoomessenger.png" alt="Yahoo! Messenger" title="Yahoo! Messenger" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/glip.png" alt="Glip" title="Glip">
+<img width="80" align="left" src="./resources/icons/mysms.png" alt="mysms" title="mysms" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/yahoomessenger.png" alt="Yahoo! Messenger" title="Yahoo! Messenger">
+<img width="80" align="left" src="./resources/icons/icq.png" alt="ICQ" title="ICQ" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/mysms.png" alt="mysms" title="mysms">
+<img width="80" align="left" src="./resources/icons/tweetdeck.png" alt="TweetDeck" title="TweetDeck" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/icq.png" alt="ICQ" title="ICQ">
+<img width="80" align="left" src="./resources/icons/zinc.png" alt="Zinc" title="Zinc" />
-
+<img width="80" align="left" src="./resources/icons/freenode.png" alt="FreeNode" title="FreeNode" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/tweetdeck.png" alt="TweetDeck" title="TweetDeck">
+<img width="80" align="left" src="./resources/icons/mightytext.png" alt="MightyText" title="MightyText" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zinc.png" alt="Zinc" title="Zinc">
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/freenode.png" alt="FreeNode" title="FreeNode">
+<img width="80" align="left" src="./resources/icons/zohoemail.png" alt="Zoho Email" title="Zoho Email" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/mightytext.png" alt="MightyText" title="MightyText">
+<img width="80" align="left" src="./resources/icons/zohocliq.png" alt="Zoho Cliq" title="Zoho Cliq" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zohoemail.png" alt="Zoho Email" title="Zoho Email">
+<img width="80" align="left" src="./resources/icons/roundcube.png" alt="Roundcube" title="Roundcube" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zohochat.png" alt="Zoho Chat" title="Zoho Chat">
+<img width="80" align="left" src="./resources/icons/horde.png" alt="Horde" title="Horde" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/roundcube.png" alt="Roundcube" title="Roundcube">
+<img width="80" align="left" src="./resources/icons/squirrelmail.png" alt="SquirrelMail" title="SquirrelMail" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/horde.png" alt="Horde" title="Horde">
+<img width="80" align="left" src="./resources/icons/zimbra.png" alt="Zimbra" title="Zimbra" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/squirrelmail.png" alt="SquirrelMail" title="SquirrelMail">
+<img width="80" align="left" src="./resources/icons/hootsuite.png" alt="Hootsuite" title="Hootsuite" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zimbra.png" alt="Zimbra" title="Zimbra">
+<img width="80" align="left" src="./resources/icons/amium.png" alt="Amium" title="Amium" />
-
+<img width="80" align="left" src="./resources/icons/rainloop.png" alt="RainLoop" title="RainLoop" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hootsuite.png" alt="Hootsuite" title="Hootsuite">
+<img width="80" align="left" src="./resources/icons/icloud.png" alt="iCloud Mail" title="iCloud Mail" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/amium.png" alt="Amium" title="Amium">
+<img width="80" align="left" src="./resources/icons/irccloud.png" alt="IRC Cloud" title="IRC Cloud" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/rainloop.png" alt="RainLoop" title="RainLoop">
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/icloud.png" alt="iCloud Mail" title="iCloud Mail">
+<img width="80" align="left" src="./resources/icons/kiwi.png" alt="Kiwi IRC" title="Kiwi IRC" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/irccloud.png" alt="IRC Cloud" title="IRC Cloud">
+<img width="80" align="left" src="./resources/icons/smooch.png" alt="Smooch" title="Smooch" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/kiwi.png" alt="Kiwi IRC" title="Kiwi IRC">
+<img width="80" align="left" src="./resources/icons/crisp.png" alt="Crisp" title="Crisp" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/smooch.png" alt="Smooch" title="Smooch">
+<img width="80" align="left" src="./resources/icons/flock.png" alt="Flock" title="Flock" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/crisp.png" alt="Crisp" title="Crisp">
+<img width="80" align="left" src="./resources/icons/openmailbox.png" alt="Openmailbox" title="Openmailbox" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/flock.png" alt="Flock" title="Flock">
+<img width="80" align="left" src="./resources/icons/typetalk.png" alt="Typetalk" title="Typetalk" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/openmailbox.png" alt="Openmailbox" title="Openmailbox">
+<img width="80" align="left" src="./resources/icons/drift.png" alt="Drift" title="Drift" />
-
+<img width="80" align="left" src="./resources/icons/webexteams.png" alt="Cisco Webex Teams" title="Cisco Webex Teams" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/typetalk.png" alt="Typetalk" title="Typetalk">
+<img width="80" align="left" src="./resources/icons/fleep.png" alt="Fleep" title="Fleep" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/drift.png" alt="Drift" title="Drift">
+<img width="80" align="left" src="./resources/icons/socialcast.png" alt="Socialcast" title="Socialcast" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/spark.png" alt="Cisco Spark" title="Cisco Spark">
+<img width="80" align="left" src="./resources/icons/riot.png" alt="Riot" title="Riot" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/fleep.png" alt="Fleep" title="Fleep">
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/socialcast.png" alt="Socialcast" title="Socialcast">
+<img width="80" align="left" src="./resources/icons/pushbullet.png" alt="Pushbullet" title="Pushbullet" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/riot.png" alt="Riot" title="Riot">
+<img width="80" align="left" src="./resources/icons/movim.png" alt="Movim" title="Movim" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/pushbullet.png" alt="Pushbullet" title="Pushbullet">
+<img width="80" align="left" src="./resources/icons/kaiwa.png" alt="Kaiwa" title="Kaiwa" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/movim.png" alt="Movim" title="Movim">
+<img width="80" align="left" src="./resources/icons/zyptonite.png" alt="Zyptonite" title="Zyptonite" />
-
+<img width="80" align="left" src="./resources/icons/linkedin.png" alt="LinkedIn" title="LinkedIn" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/kaiwa.png" alt="Kaiwa" title="Kaiwa">
+<img width="80" align="left" src="./resources/icons/lounge.png" alt="The Lounge" title="The Lounge" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zyptonite.png" alt="Zyptonite" title="Zyptonite">
+<img width="80" align="left" src="./resources/icons/kezmo.png" alt="Kezmo" title="Kezmo" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/linkedin.png" alt="LinkedIn" title="LinkedIn">
+<img width="80" align="left" src="./resources/icons/teams.png" alt="Teams" title="Teams" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/lounge.png" alt="The Lounge" title="The Lounge">
+<img width="80" align="left" src="./resources/icons/xing.png" alt="Xing" title="Xing" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/kezmo.png" alt="Kezmo" title="Kezmo">
+<img width="80" align="left" src="./resources/icons/workplace.png" alt="Workplace" title="Workplace" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/teams.png" alt="Teams" title="Teams">
+<img width="80" align="left" src="./resources/icons/fastmail.png" alt="FastMail" title="FastMail" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/xing.png" alt="Xing" title="Xing">
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/workplace.png" alt="Workplace" title="Workplace">
+<img width="80" align="left" src="./resources/icons/hibox.png" alt="Hibox" title="Hibox" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/fastmail.png" alt="FastMail" title="FastMail">
+<img width="80" align="left" src="./resources/icons/jandi.png" alt="Jandi" title="Jandi" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hibox.png" alt="Hibox" title="Hibox">
+<img width="80" align="left" src="./resources/icons/threema.png" alt="Threema" title="Threema" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/jandi.png" alt="Jandi" title="Jandi">
+<img width="80" align="left" src="./resources/icons/messengerpages.png" alt="Messenger for Pages" title="Messenger for Pages" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/threema.png" alt="Threema" title="Threema">
+<img width="80" align="left" src="./resources/icons/vk.png" alt="VK Messenger" title="VK Messenger" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/messengerpages.png" alt="Messenger for Pages" title="Messenger for Pages">
+<img width="80" align="left" src="./resources/icons/mastodon.png" alt="Mastodon" title="Mastodon" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/vk.png" alt="VK Messenger" title="VK Messenger">
+<img width="80" align="left" src="./resources/icons/teamworkchat.png" alt="Teamwork Chat" title="Teamwork Chat" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/mastodon.png" alt="Mastodon" title="Mastodon">
+<img width="80" align="left" src="./resources/icons/clocktweets.png" alt="ClockTweets" title="ClockTweets" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/teamworkchat.png" alt="Teamwork Chat" title="Teamwork Chat">
+<img width="80" align="left" src="./resources/icons/intercom.png" alt="Intercom" title="Intercom" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/clocktweets.png" alt="ClockTweets" title="ClockTweets">
+<img width="80" align="left" src="./resources/icons/googlevoice.png" alt="Voice" title="Voice" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/intercom.png" alt="Intercom" title="Intercom">
+<img width="80" align="left" src="./resources/icons/sandstorm.png" alt="Sandstorm" title="Sandstorm" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/googlevoice.png" alt="Voice" title="Voice">
+
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/sandstorm.png" alt="Sandstorm" title="Sandstorm">
+<img width="80" align="left" src="./resources/icons/gadugadu.png" alt="Gadu-Gadu" title="Gadu-Gadu" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/gadugadu.png" alt="Gadu-Gadu" title="Gadu-Gadu">
+<img width="80" align="left" src="./resources/icons/mailru.png" alt="Mail.Ru" title="Mail.Ru" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/mailru.png" alt="Mail.Ru" title="Mail.Ru">
+<img width="80" align="left" src="./resources/icons/kune.png" alt="Kune" title="Kune" />
-<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/kune.png" alt="Kune" title="Kune">
+<img width="80" align="left" src="./resources/icons/zulip.png" alt="Zulip" title="Zulip" />
-
+<img width="80" align="left" src="./resources/icons/stride.png" alt="Stride" title="Stride" />
-<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+<img width="80" align="left" src="./resources/icons/hangoutschat.png" alt="Hangouts Chat" title="Hangouts Chat" />
+<img width="80" align="left" src="./resources/icons/messengerpages.png" alt="Messenger for Business" title="Messenger for Business" />
+<img width="80" align="left" src="./resources/icons/androidmessages.png" alt="Android Messages" title="Android Messages">
+<img width="80" align="left" src="./resources/icons/sococo.png" alt="Sococo" title="Sococo">
+<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 
 ## Features
 
@@ -183,78 +185,51 @@
 
 No personal information will be saved
 
-Sessions will persist using the [partition:persist](http://electron.atom.io/docs/api/web-view-tag/#partition) attribute for Webviews. So every time you open Rambox, your sessions will keep alive until you remove the service.
+Sessions will persist using the [partition:persist](https://electronjs.org/docs/api/webview-tag#partition) attribute for Webviews.
+So every time you open Rambox, your sessions will keep alive until you remove the service.
 
-Sync feature use Auth0 for Single Sign On & Token Based Authentication and to store the services that user is using (and the configuration for each service). You are always welcome to check the code! ;)
+Sync feature use Auth0 for Single Sign On & Token Based Authentication and to store the services that user is using (and the configuration for each service).
+You are always welcome to check the code! ;)
 
 ## Donations
 
-| Type          |                                         URL/Wallet                                         |
+| Type             | URL/Wallet                                                                                 |
-|---------------|:------------------------------------------------------------------------------------------:|
+| ---------------- | :----------------------------------------------------------------------------------------: |
-| PayPal        | [HERE](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA) |
+| Credit Cards     | [HERE](https://rambox.pro/#donate) |
-| Bitcoin       | 1BjR8dARsnuqz41FZM9R8pPtYTeHn9mLSs                                                         |
+| Cryptocurrencies | [HERE](https://www.vaulty.io/v/b6480279-af28-4855-868c-17e5cb0ae7fa)                       |
-| Bitcoin Cash  | 1BjR8dARsnuqz41FZM9R8pPtYTeHn9mLSs                                                         |
-| Ethereum      | 0xf3d15f9649c6da63fc3971d8c82804dd677fd151                                                 |
-| Litecoin      | Lf3CjUMhCVEvUjqMrNfRCkTbzRrd7KSdZn                                                         |
 
 ## Translations
 
-Help us translate Rambox on https://crowdin.com/project/rambox/invite.
+Help us translate Rambox on <https://crowdin.com/project/rambox/invite>.
 
 ## [Install on Linux - Steps](https://github.com/saenzramiro/rambox/wiki/Install-on-Linux)
 
-## [To Do](https://github.com/saenzramiro/rambox/blob/master/TODO.md)
+## [Contributing](./CONTRIBUTING.md)
 
-## Getting Involved
+Want to report a bug, request a feature, contribute to or translate Rambox?
+We need all the help we can get!
+Fork and work!
 
-Want to report a bug, request a feature, contribute to or translate Rambox? We need all the help we can get! Fork and work!
+### Quickstart
 
-## Getting Started
+```shell
+git clone https://github.com/saenzramiro/rambox.git
+cd rambox
+cp env-sample.js env.js
+# update env.js with your auth0 details.
+npm install
+sencha app watch
+npm start
+```
 
-If you're comfortable getting up and running from a `git clone`, this method is for you.
+See [Contributing.md](./CONTRIBUTING.md) for more detailed information about getting set up.
 
-#### Technologies:
+---
 
-* Sencha Ext JS 5.1.1.451
+## Disclosure
-* Electron
-* Node JS
-
-#### Environment:
-
-* Sencha Cmd 6.1.2.15 (make sure to check "Compass extension" during install if you don't have installed yet)
-* Ruby 2.3
-* NPM 3.8.7
-* Node.js 4.0.0
-
-#### Quickstart:
-
-1. `git clone https://github.com/saenzramiro/rambox.git`
-2. `npm install`
-3. Configure `env-sample.js` and rename it to `env.js`.
-4. `npm run sencha:compile`
-5. `npm start`
-
-#### Compile on Ubuntu:
-
-These instructions were tested with Ubuntu 17.04.
-1. Install dependencies: `sudo apt install nodejs-legacy npm git`
-2. Build and install electron: `sudo npm install electron-prebuilt -g`
-3. Install Sencha Cmd (non-free): https://www.sencha.com/products/extjs/cmd-download/
-4. Clone repository: `git clone https://github.com/saenzramiro/rambox.git`
-5. Install npm dependencies: `npm install`
-6. Configure `env-sample.js` and rename it to `env.js`.
-7. Compile: `npm run sencha:compile`
-8. Start program: `npm start`
-
-
--------------------
-
-Disclosure
--------------------
 
 Rambox is not affiliated with any of the messaging apps offered.
 
-Licence
+## Licence
--------------------
 
 [GNU GPL v3](https://github.com/saenzramiro/rambox/LICENSE)

TODO.md

@@ -1,6 +0,0 @@
-## To Do
-
-- Change theme.
-- Deeplink to add new service.
-- Dock Menu (http://electron.atom.io/docs/tutorial/desktop-environment-integration/#custom-dock-menu-os-x)
-- Crash Reporter.

app.js

@@ -15,6 +15,9 @@ Ext.application({
 
 // auto update logic
 const ipc = require('electron').ipcRenderer;
+
+require('electron-context-menu')();
+
 ipc.on('showAbout', function(event, message) {
 	!Ext.cq1('about') ? Ext.create('Rambox.view.main.About') : '';
 });
@@ -60,7 +63,7 @@ ipc.on('autoUpdater:update-downloaded', function(e, releaseNotes, releaseName, r
 				 xtype: 'button'
 				,text: 'Changelog'
 				,ui: 'decline'
-				,href: 'https://github.com/saenzramiro/rambox/releases/tag/'+releaseName
+				,href: 'https://github.com/ramboxapp/community-edition/releases/tag/'+releaseName
 			}
 			,'->'
 			,{
@@ -127,6 +130,14 @@ ipc.on('reloadCurrentService', function(e) {
 	var tab = Ext.cq1('app-main').getActiveTab();
 	if ( tab.id !== 'ramboxTab' ) tab.reloadService();
 });
+// Toggle Status Bar
+ipc.on('toggleStatusBar', function() {
+	var tab = Ext.cq1('app-main').getActiveTab();
+
+	if ( tab.id !== 'ramboxTab' ) {
+		tab.down('statusbar').closed ? tab.setStatusBar(tab.record.get('statusbar')) : tab.closeStatusBar();
+	}
+});
 // Focus the current service when Alt + Tab or click in webviews textfields
 window.addEventListener('focus', function() {
 	if(Ext.cq1("app-main")) Ext.cq1("app-main").getActiveTab().down('component').el.dom.focus();

app.json

@@ -110,7 +110,8 @@
             "path": "resources/js/loadscreen.js"
         },
         {
-            "path": "env.js"
+            "path": "env.js",
+			"remote": true
         },
         {
             "path": "app.js",
@@ -254,7 +255,7 @@
      *
      */
     "output": {
-        "base": "${workspace.build.dir}/${build.environment}/${app.name}",
+        "base": "../rambox-build",
         "appCache": {
             "enable": true
         }
@@ -290,6 +291,9 @@
      */
     "resources": [
 		"electron",
+		"env.js",
+		"package.json",
+		"package-lock.json",
 		"masterpassword.html"
     ],
 

app/Application.js

@@ -26,6 +26,21 @@ Ext.define('Rambox.Application', {
 	}
 
 	,launch: function () {
+		// Prevent track if the user have disabled this option (default: false)
+		if ( !ipc.sendSync('sendStatistics') ) {
+			ga_storage = {
+				 _enableSSL: Ext.emptyFn
+				,_disableSSL: Ext.emptyFn
+				,_setAccount: Ext.emptyFn
+				,_setDomain: Ext.emptyFn
+				,_setLocale: Ext.emptyFn
+				,_setCustomVar: Ext.emptyFn
+				,_deleteCustomVar: Ext.emptyFn
+				,_trackPageview: Ext.emptyFn
+				,_trackEvent: Ext.emptyFn
+			}
+		}
+
 		// Set Google Analytics events
 		ga_storage._setAccount('UA-80680424-1');
 		ga_storage._trackPageview('/index.html', 'main');
@@ -229,7 +244,7 @@ Ext.define('Rambox.Application', {
 	,checkUpdate: function(silence) {
 		console.info('Checking for updates...');
 		Ext.Ajax.request({
-			 url: 'http://rambox.pro/api/latestversion.json'
+			 url: 'https://rambox.pro/api/latestversion.json'
 			,method: 'GET'
 			,success: function(response) {
 				var json = Ext.decode(response.responseText);
@@ -244,12 +259,12 @@ Ext.define('Rambox.Application', {
 							'->'
 							,{
 								 xtype: 'label'
-								,html: '<b>'+locale['app.update[0]']+'</b> ('+json.version+')' + ( process.platform === 'win32' ? ' Is downloading in the background and you will notify when is ready to install it.' : '' )
+								,html: '<b>'+locale['app.update[0]']+'</b> ('+json.version+')' + ( process.platform === 'win32' ? ' is downloading in the background and you will be notified when it is ready to be installed.' : '' )
 							}
 							,{
 								 xtype: 'button'
 								,text: locale['app.update[1]']
-								,href: process.platform === 'darwin' ? 'https://getrambox.herokuapp.com/download/'+process.platform+'_'+process.arch : 'https://github.com/saenzramiro/rambox/releases/latest'
+								,href: process.platform === 'darwin' ? 'https://getrambox.herokuapp.com/download/'+process.platform+'_'+process.arch : 'https://github.com/ramboxapp/community-edition/releases/latest'
 								,hidden: process.platform === 'win32'
 							}
 							,{
@@ -257,7 +272,7 @@ Ext.define('Rambox.Application', {
 								,text: locale['app.update[2]']
 								,ui: 'decline'
 								,tooltip: 'Click here to see more information about the new version.'
-								,href: 'https://github.com/saenzramiro/rambox/releases/tag/'+json.version
+								,href: 'https://github.com/ramboxapp/community-edition/releases/tag/'+json.version
 							}
 							,'->'
 							,{

app/README.md

@@ -0,0 +1,29 @@
+# ./controller
+
+This folder contains the application's global controllers.
+ViewControllers are located alongside their respective view class in `./view`.
+These controllers are used for routing and other activities that span all views.
+
+# ./model
+
+This folder contains the application's (data) Model classes.
+
+# ./view
+
+This folder contains the views as well as ViewModels and ViewControllers depending on the application's architecture.
+Pure MVC applications may not have ViewModels, for example.
+For MVCVM applications or MVC applications that use ViewControllers, the following directory structure is recommended:
+
+```text
+./view/
+    foo/                    # Some meaningful grouping of one or more views
+        Foo.js              # The view class
+        FooController.js    # The controller for Foo (a ViewController)
+        FooModel.js         # The ViewModel for Foo
+```
+
+This structure helps keep these closely related classes together and easily identifiable in most tabbed IDE's or text editors.
+
+# ./store
+
+This folder contains any number of store instances or types that can then be reused in the application.

app/Readme.md

@@ -1,30 +0,0 @@
-# ./controller
-
-This folder contains the application's global controllers. ViewControllers are located
-alongside their respective view class in `"./view"`. These controllers are used for routing
-and other activities that span all views.
-
-# ./model
-
-This folder contains the application's (data) Model classes.
-
-# ./view
-
-This folder contains the views as well as ViewModels and ViewControllers depending on the
-application's architecture. Pure MVC applications may not have ViewModels, for example. For
-MVCVM applications or MVC applications that use ViewControllers, the following directory
-structure is recommended:
-
-    ./view/
-        foo/                    # Some meaningful grouping of one or more views
-            Foo.js              # The view class
-            FooController.js    # The controller for Foo (a ViewController)
-            FooModel.js         # The ViewModel for Foo
-
-This structure helps keep these closely related classes together and easily identifiable in
-most tabbed IDE's or text editors.
-
-# ./store
-
-This folder contains any number of store instances or types that can then be reused in the
-application.

app/model/README.md

@@ -15,13 +15,10 @@ Structure of a service entry:
 |note|Additional info to display when adding the service.|no|
 |manual_notifications|Set to `true` to let Rambox trigger notifications. Can be used for services that doesn't support browser notifications.|no|
 |js_unread|JavaScript code for setting the unread count (see below).|no|
-|dont_update_unread_from_title|Set to `true` to prevent updating the unread count from the window title (see below).|no|
 
 ### Setting the unread count
 
-While there is also a way to set the unread count by adding ` (COUNT)` to the window title, this describes the preferred way of doing it:
+While by default the unread count is determined by looking for ` (COUNT)` to the window title, this describes the preferred way of doing it:
-
-First set `dont_update_unread_from_title` in the service config to `true`.
 
 Code provided by `js_unread` will be injected into the service website.
 You can retrieve the unread count in this JavaScript code e.g. by parsing elements.

app/model/ServiceList.js

@@ -48,9 +48,5 @@ Ext.define('Rambox.model.ServiceList', {
 		 name: 'custom_domain'
 		,type: 'boolean'
 		,defaultValue: false
-	},{
-		 name: 'dont_update_unread_from_title'
-		,type: 'boolean'
-		,defaultValue: false
 	}]
 });

app/package.json

@@ -1,42 +0,0 @@
-{
-	"name": "Rambox",
-	"productName": "Rambox",
-	"version": "0.5.14",
-	"description": "Rambox",
-	"main": "electron/main.js",
-	"private": true,
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/saenzramiro/rambox.git"
-	},
-	"bugs": {
-		"url": "https://github.com/saenzramiro/rambox/issues"
-	},
-	"homepage": "http://rambox.pro",
-	"keywords": [
-		"Rambox",
-		"messaging",
-		"app",
-		"slack",
-		"whatsapp",
-		"facebook",
-		"messenger",
-		"telegram",
-		"google",
-		"hangouts",
-		"skype"
-	],
-	"author": "Ramiro Saenz <[email protected]>",
-	"license": "GPL-3.0",
-	"dependencies": {
-		"@exponent/electron-cookies": "2.0.0",
-		"auth0-js": "^8.10.1",
-		"auth0-lock": "^10.22.0",
-		"auto-launch-patched": "5.0.2",
-		"electron-config": "0.2.1",
-		"electron-is-dev": "^0.3.0",
-		"mime": "^1.4.0",
-		"rimraf": "2.6.1",
-		"tmp": "0.0.28"
-	}
-}

app/store/Services.js

@@ -29,6 +29,12 @@ Ext.define('Rambox.store.Services', {
 				// If the service is disabled, we dont add it to tab bar
 				if ( !service.get('enabled') ) return;
 
+				// Rebranded app
+				if ( service.get('type') === 'spark' ) {
+					service.set('type', 'webexteams');
+					service.set('logo', 'webexteams.png');
+				}
+
 				var cfg = {
 					 xtype: 'webview'
 					,id: 'tab_'+service.get('id')

app/store/ServicesList.js

@@ -28,8 +28,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: locale['services[0]']
 			,url: 'https://web.whatsapp.com/'
 			,type: 'messaging'
-			,js_unread: 'function checkUnread(){var i=0;document.querySelectorAll(".unread").forEach(function(e){0===e.querySelectorAll("[data-icon=muted]").length&&i++});updateBadge(i)}function updateBadge(count) { if (count && count >= 1) { rambox.setUnreadCount(count); } else { rambox.clearUnreadCount(); } }setInterval(checkUnread,1e3);'
+			,js_unread: 'function checkUnread(){const elements = document.querySelectorAll(\'.CxUIE, .unread\');let count = 0;for (let i = 0; i < elements.length; i++) {if (elements[i].querySelectorAll(\'*[data-icon="muted"]\').length === 0) {count++;}}updateBadge(count);}function updateBadge(count){if(count && count>=1){rambox.setUnreadCount(count);}else{rambox.clearUnreadCount();}}setInterval(checkUnread, 1e3);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'slack'
@@ -38,7 +37,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: locale['services[1]']
 			,url: 'https://___.slack.com/'
 			,type: 'messaging'
-			,js_unread: 'function checkUnread(){var e=$(".p-channel_sidebar__channel--unread:not(.p-channel_sidebar__channel--muted)").length,a=0;$(".p-channel_sidebar__badge").each(function(){a+=isNaN(parseInt($(this).html()))?0:parseInt($(this).html())}),updateBadge(e,a)}function updateBadge(e,a){var n=a>0?"("+a+") ":e>0?"(•) ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);'
+			,js_unread: 'function checkUnread(){var e=$(".p-channel_sidebar__channel--unread:not(.p-channel_sidebar__channel--muted)").length,n=0;$(".p-channel_sidebar__badge").each(function(){n+=isNaN(parseInt($(this).html()))?0:parseInt($(this).html())}),count=0<n?n:0<e?"•":0,updateBadge(count)}function updateBadge(e){1<=e||"•"===e?rambox.setUnreadCount(e):rambox.clearUnreadCount();}setInterval(checkUnread,3e3);'
 		},
 		{
 			 id: 'noysi'
@@ -77,7 +76,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,type: 'messaging'
 			,titleBlink: true
 			,manual_notifications: true
-			,dont_update_unread_from_title: true
 			,js_unread: 'function checkUnread(){updateBadge(document.getElementById("hangout-landing-chat").lastChild.contentWindow.document.body.getElementsByClassName("ee").length)}function updateBadge(e){e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3000);'
 		},
 		{
@@ -98,7 +96,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://web.telegram.org/'
 			,type: 'messaging'
 			,js_unread: 'function checkUnread(){var e=document.getElementsByClassName("im_dialog_badge badge"),t=0;for(i=0;i<e.length;i++)if(!e[i].classList.contains("im_dialog_badge_muted")){t+=parseInt(e[i].innerHTML.trim())}updateBadge(t)}function updateBadge(e){e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3000);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'wechat'
@@ -116,19 +113,18 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://mail.google.com/mail/'
 			,type: 'email'
 			,allow_popups: true
-			,js_unread: 'function checkUnread(){var a=document.getElementsByClassName("aim")[0];updateBadge(-1!=a.textContent.indexOf("(")&&(t=parseInt(a.textContent.replace(/[^0-9]/g,""))))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
+			,js_unread: 'function checkUnread(){var a=document.getElementsByClassName("aim")[0].textContent.split(":");updateBadge(parseInt(a[a.length-1].replace(/[^0-9]/g,"")))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
 			,note: 'To enable desktop notifications, you have to go to Settings inside Gmail. <a href="https://support.google.com/mail/answer/1075549?ref_topic=3394466" target="_blank">Read more...</a>'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'inbox'
 			,logo: 'inbox.png'
 			,name: 'Inbox'
 			,description: locale['services[10]']
-			,url: 'http://inbox.google.com/?cid=imp'
+			,url: 'https://inbox.google.com/?cid=imp'
 			,type: 'email'
 			,manual_notifications: true
-			,js_unread: 'function checkUnread(){updateBadge(document.getElementsByClassName("ss").length)}function updateBadge(a){a>=1?document.title="("+a+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);'
+			,js_unread: 'function checkUnread() {if(getComputedStyle(document.getElementsByClassName("sM")[0])["font-weight"] == "bold"){updateBadge(document.getElementsByClassName("ss").length)}} function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()};setInterval(checkUnread,3e3);'
 			,note: 'Please be sure to sign out of Hangouts inside Inbox, as it causes problems. <a href="https://github.com/saenzramiro/rambox/wiki/Inbox" target="_blank">Read more...</a>'
 		},
 		{
@@ -149,7 +145,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,type: 'messaging'
 			,note: 'To enable desktop notifications, you have to go to Options inside GroupMe. To count unread messages, be sure to be in Chats.'
 			,js_unread: 'function checkUnread(){var a=document.querySelectorAll(".badge-count:not(.ng-hide)"),b=0;for(i=0;i<a.length;i++)b+=parseInt(a[i].innerHTML.trim());updateBadge(b)}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'grape'
@@ -186,9 +181,8 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://discordapp.com/login'
 			,type: 'messaging'
 			,titleBlink: true
-			,js_unread: 'function checkUnread(){var a=document.getElementsByClassName("guild unread").length,b=0,c=document.getElementsByClassName("badge");for(i=0;i<c.length;i++)b+=parseInt(c[i].innerHTML.trim());updateBadge(a,b)}function updateBadge(a,b){var c=b>0?"("+b+") ":a>0?"(•) ":"";document.title=c+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);'
+			,js_unread: 'function getAlertCount(badges) {var alerts = 0;for(var i = 0; i<badges.length; i++) {var badge = badges[i];if (badge && badge.childNodes && badge.childNodes.length > 0) {var count = parseInt(badge.childNodes[0].nodeValue, 10);alerts += count.isNaN? 1: count;} else {alerts++;}}return alerts;}function checkUnread() {var direct = 0,indirect = document.querySelectorAll(\'.guilds-wrapper .unread\').length,guildDirect = document.querySelectorAll(\'.guilds-wrapper .badge\'),channelDirect = document.querySelectorAll(\'[class^="nameUnreadText-"]+div>div>div\');direct += getAlertCount(guildDirect);direct += getAlertCount(channelDirect);indirect += document.querySelectorAll(\'[class^="nameUnreadText-"]\').length;updateBadge(indirect, direct);}function updateBadge(ind, dir) { var n = dir > 0 ? "(" + dir + ") ": ind > 0? "(•) ": "";document.title = n + originalTitle;}var originalTitle = document.title;setInterval(checkUnread, 3e3);'
 			,note: 'To enable desktop notifications, you have to go to Options inside Discord.'
-			,dont_update_unread_from_title: true
 			,userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36'
 		},
 		{
@@ -206,10 +200,11 @@ Ext.define('Rambox.store.ServicesList', {
 			,logo: 'outlook365.png'
 			,name: 'Outlook 365'
 			,description: locale['services[18]']
-			,url: 'https://outlook.office.com/owa/'
+			,url: 'https://outlook.office.___/owa/'
 			,type: 'email'
 			,manual_notifications: true
 			,js_unread: 'function checkUnread(){var a=$(".subfolders [role=treeitem]:first .treeNodeRowElement").siblings().last().text();updateBadge(""===a?0:parseInt(a))}function updateBadge(a){a>=1?document.title="("+a+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);'
+			,note: 'Please insert the cloud region you want to use. Can be "com", "de", etc.'
 		},
 		{
 			 id: 'yahoo'
@@ -238,12 +233,21 @@ Ext.define('Rambox.store.ServicesList', {
 			,type: 'email'
 			,note: 'Read <a href="https://protonmail.com/support/knowledge-base/what-is-the-difference-between-protonmail-com-and-protonmail-ch/" target="_blank">HERE</a> to see the differences between protonmail.com and protonmail.ch.'
 		},
+		{
+			 id: 'protonmailonion'
+			,logo: 'protonmail.png'
+			,name: 'ProtonMail Onion'
+			,description: locale['services[20]']
+			,url: 'https://protonirockerxow.onion/inbox'
+			,type: 'email'
+			,note: 'Read <a href="https://protonmail.com/tor" target="_blank">HERE</a> to see the differences between protonmail.com and protonmail hidden service (over TOR).'
+		},
 		{
 			 id: 'tutanota'
 			,logo: 'tutanota.png'
 			,name: 'Tutanota'
 			,description: locale['services[21]']
-			,url: 'https://app.tutanota.de/'
+			,url: 'https://mail.tutanota.com/'
 			,type: 'email'
 		},
 		{
@@ -295,15 +299,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://___.bearychat.com/'
 			,type: 'messaging'
 		},
-		{
-			 id: 'yahoomessenger'
-			,logo: 'yahoomessenger.png'
-			,name: 'Yahoo! Messenger'
-			,description: locale['services[28]']
-			,url: 'https://messenger.yahoo.com/'
-			,type: 'messaging'
-			,js_unread: 'function checkUnread(){updateBadge(document.getElementsByClassName("list-item-unread-indicator").length)}function updateBadge(e){e>=1?document.title="("+e+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);'
-		},
 		{
 			 id: 'voxer'
 			,logo: 'voxer.png'
@@ -362,7 +357,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: locale['services[35]']
 			,url: 'https://web.icq.com/'
 			,type: 'messaging'
-			,js_unread: 'function checkUnread(){updateBadge(parseInt(document.getElementsByClassName("nwa-msg-counter")[0].style.display==="block"?document.getElementsByClassName("nwa-msg-counter")[0].innerHTML.trim():0))}function updateBadge(e){e>=1?document.title="("+e+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);'
+			,js_unread: 'function checkUnread(){let total=0;for(let counter of document.getElementsByClassName("icq-msg-counter"))total+=parseInt("block"===counter.style.display?counter.innerHTML.trim():0);updateBadge(total)}function updateBadge(e){e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
 			,titleBlink: true
 		},
 		{
@@ -445,10 +440,10 @@ Ext.define('Rambox.store.ServicesList', {
 		},
 		{
 			 id: 'zohochat'
-			,logo: 'zohochat.png'
+			,logo: 'zohocliq.png'
-			,name: 'Zoho Chat'
+			,name: 'Zoho Cliq'
 			,description: locale['services[46]']
-			,url: 'https://chat.zoho.com/'
+			,url: 'https://accounts.zoho.com/signin?servicename=ZohoChat&signupurl=https://www.zoho.com/cliq/signup.html'
 			,type: 'messaging'
 			,js_unread: 'NotifyByTitle.show = function(){};NotifyByTitle.start = function(){};NotifyByTitle.stop = function(){};function checkUnread(){var t=0;$(".msgnotify").each(function() { t += isNaN(parseInt($(this).html())) ? 0 : parseInt(parseInt($(this).html())) });updateBadge(t)}function updateBadge(e){e>=1?document.title="("+e+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);'
 		},
@@ -495,15 +490,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: 'Ryver is a team communication tool that organizes team collaboration, chats, files, and even emails into a single location, for any size team, for FREE.'
 			,url: 'https://___.ryver.com/'
 			,type: 'messaging'
-			,js_unread: 'function checkUnread(){updateBadge(parseInt(document.getElementsByClassName("scene-space-tab-button--flash").length))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
+			,js_unread: 'function checkUnread(){updateBadge(parseInt(document.getElementsByClassName("scene-space-tab-button__badge-icon").length))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-		},
-		{
-			 id: 'aim'
-			,logo: 'aim.png'
-			,name: 'Aim'
-			,description: 'Aim offers free Text Messaging, Group Conversations, Media Sharing, Social Notifications, and more.'
-			,url: 'http://aim.com/'
-			,type: 'messaging'
 		},
 		{
 			 id: 'kiwi'
@@ -523,7 +510,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://www.icloud.com/#mail'
 			,type: 'email'
 			,js_unread: 'function checkUnread(){updateBadge(document.querySelector(".current-app").querySelector(".sb-badge").style.display==="none"?0:parseInt(document.querySelector(".current-app").querySelector(".text").innerHTML.trim()))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'rainloop'
@@ -614,11 +600,11 @@ Ext.define('Rambox.store.ServicesList', {
 			,js_unread: 'document.getElementsByClassName("google-login-area")[0].remove();document.getElementsByClassName("microsoft-login-area")[0].remove();'
 		},
 		{
-			 id: 'spark'
+			 id: 'webexteams'
-			,logo: 'spark.png'
+			,logo: 'webexteams.png'
-			,name: 'Cisco Spark'
+			,name: 'Cisco Webex Teams'
-			,description: 'Cisco Spark is for group chat, video calling, and sharing documents with your team. It’s all backed by Cisco security and reliability.'
+			,description: 'Cisco Webex Teams is for group chat, video calling, and sharing documents with your team. It’s all backed by Cisco security and reliability.'
-			,url: 'https://web.ciscospark.com/'
+			,url: 'https://teams.webex.com/'
 			,type: 'messaging'
 		},
 		{
@@ -653,7 +639,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://web.flock.co/'
 			,type: 'messaging'
 			,js_unread: 'function checkUnread(){var a=document.getElementsByClassName("unreadMessages no-unread-mentions has-unread"),b=0;for(i=0;i<a.length;i++)b+=parseInt(a[i].innerHTML.trim());updateBadge(b)}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-			,dont_update_unread_from_title: true
 
 		},
 		{
@@ -680,7 +665,6 @@ Ext.define('Rambox.store.ServicesList', {
 			url: 'https://www.xing.com/messages/conversations',
 			type: 'messaging',
 			js_unread: '(function() { let originalTitle = document.title; function checkUnread() { let count = null; let notificationElement = document.querySelector(\'[data-update="unread_conversations"]\'); if (notificationElement && notificationElement.style.display !== \'none\') { count = parseInt(notificationElement.textContent.trim(), 10); } updateBadge(count); } function updateBadge(count) { if (count && count >= 1) { rambox.setUnreadCount(count); } else { rambox.clearUnreadCount(); } } setInterval(checkUnread, 3000); checkUnread(); })();',
-			dont_update_unread_from_title: true
 		},
 		{
 			id: 'threema',
@@ -690,7 +674,6 @@ Ext.define('Rambox.store.ServicesList', {
 			url: 'https://web.threema.ch/',
 			type: 'messaging',
 			js_unread: '(function () { let unreadCount = 0; function checkUnread() { let newUnread = 0; try { let webClientService = angular.element(document.documentElement).injector().get(\'WebClientService\'); let conversations = webClientService.conversations.conversations; conversations.forEach(function(conversation) { newUnread += conversation.unreadCount; }); } catch (e) { } if (newUnread !== unreadCount) { unreadCount = newUnread; updateBadge(unreadCount); } } function updateBadge(count) { if (count && count >= 1) { rambox.setUnreadCount(count); } else { rambox.clearUnreadCount(); } } setInterval(checkUnread, 3000); checkUnread(); })();',
-			dont_update_unread_from_title: true
 		},
 		{
 			 id: 'workplace'
@@ -742,7 +725,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://app.zyptonite.com/'
 			,type: 'messaging'
 			,js_unread: 'function checkUnread(){var a=document.getElementsByClassName("z-messages"),b=0;for(i=0;i<a.length;i++)b+=parseInt(a[i].innerHTML.trim());updateBadge(b)}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'fastmail'
@@ -750,7 +732,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,name: 'FastMail'
 			,description: 'Secure, reliable email hosting for businesses, families and professionals. Premium email with no ads, excellent spam protection and rapid personal support.'
 			,url: 'https://www.fastmail.com/mail/'
-			,type: 'mail'
+			,type: 'email'
 			,js_unread: 'function checkUnread(){var e=document.getElementsByClassName("v-FolderSource-badge"),t=0;for(i=0;i<e.length;i++)t+=isNaN(parseInt(e[i].innerHTML.trim())) ? 0 : parseInt(e[i].innerHTML.trim());updateBadge(t)}function updateBadge(e){e>=1?document.title="("+e+")"+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);setTimeout(function(){O.WindowController.openExternal=function(a){var b=document.createElement("a");b.href=a,b.setAttribute("target","_blank"),b.click()};},3000);'
 			,note: 'To enable desktop notifications, you have to go to Settings inside FastMail.'
 		},
@@ -779,12 +761,21 @@ Ext.define('Rambox.store.ServicesList', {
 			,type: 'messaging'
 			,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");'
 		},
+		{
+			 id: 'messengerbusiness'
+			,logo: 'messengerpages.png'
+			,name: 'Messenger for Business'
+			,description: 'Messenger can help facilitate communication with your customers.'
+			,url: 'https://business.facebook.com/___/inbox/'
+			,type: 'messaging'
+			,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");'
+		},
 		{
 			 id: 'vk'
 			,logo: 'vk.png'
 			,name: 'VK Messenger'
 			,description: 'Simple and Easy App for Messaging on VK.'
-			,url: 'https://vk.com/im'
+			,url: 'https://m.vk.com/im'
 			,type: 'messaging'
 			,js_unread: 'function checkUnread(){updateBadge(parseInt(document.getElementById("l_msg").innerText.replace(/\D+/g,"")))}function updateBadge(e){e>=1?document.title="("+e+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);'
 		},
@@ -803,10 +794,9 @@ Ext.define('Rambox.store.ServicesList', {
 			,logo: 'teamworkchat.png'
 			,name: 'Teamwork Chat'
 			,description: 'Say goodbye to email. Take your online collaboration to the next level with Teamwork Chat and keep all team discussions in one place. Chat to your team in a fun and informal way with Teamwork Chat.'
-			,url: 'https://___.teamwork.com/chat'
+			,url: 'https://___/chat'
 			,type: 'messaging'
 			,js_unread: 'function checkUnread(){updateBadge(parseInt(document.getElementsByClassName("sidebar-notification-indicator").length > 0 ? document.getElementsByClassName("sidebar-notification-indicator")[0].innerHTML : 0))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'clocktweets'
@@ -824,7 +814,6 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://app.intercom.io'
 			,type: 'messaging'
 			,js_unread: 'function checkUnread(){var a=document.getElementsByClassName("unread")[0];updateBadge(t=a===undefined?0:parseInt(a.textContent.replace(/[^0-9]/g,"")))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3000);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'allo'
@@ -833,8 +822,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: 'Google Allo is a smart messaging app that helps you say more and do more. Express yourself better with stickers, doodles, and HUGE emojis & text. Allo also brings you the Google Assistant.'
 			,url: 'https://allo.google.com/web'
 			,type: 'messaging'
-			,js_unread: 'function checkUnread(){var e=document.querySelectorAll(".hasUnread.conversation_item"),n=0;for(i=0;i<e.length;i++){var r="none"===e[i].querySelector("#muted").style.display?parseInt(e[i].querySelector(".unreadCount").innerHTML.trim()):0;n+=isNaN(r)?0:r}updateBadge(n)}function updateBadge(e){e&&e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
+			,js_unread: 'function checkUnread(){var e=document.querySelectorAll(".hasUnread.conversation_item"),n=0;for(i=0;i<e.length;i++){var m=e[i].querySelector("#muted"),u=e[i].querySelector(".unreadCount"),c=parseInt(u.innerHTML.trim()),r=(m===null||m.style.display==="none")?c:0;n+=isNaN(r)?0:r}updateBadge(n)}function updateBadge(e){e&&e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);'
-			,dont_update_unread_from_title: true
 		},
 		{
 			 id: 'Kune'
@@ -851,7 +839,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: 'A free phone number for life.  Stay in touch from any screen.  Use your free number to text, call, and check voicemail  all from one app. Plus, Google Voice works on all of your devices so you can connect and communicate how you want.'
 			,url: 'https://voice.google.com'
 			,type: 'messaging'
-			,js_unread: 'function parseIntOrZero(e){return isNaN(parseInt(e))?0:parseInt(e)}function checkUnread(){var e=document.querySelector(".msgCount"),n=0;e?n=parseIntOrZero(e.innerHTML.replace(/[\(\) ]/gi,"")):["Messages","Calls","Voicemail"].forEach(function(e){var r=document.querySelector(\'gv-nav-button[tooltip="\'+e+\'"] div[aria-label="Unread count"]\');r&&(n+=parseIntOrZero(r.innerHTML))}),updateBadge(n)}function updateBadge(e){var n=e>0?"("+e+") ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);'
+			,js_unread: 'function parseIntOrZero(e){return isNaN(parseInt(e))?0:parseInt(e)}function checkUnread(){var e=document.querySelector(".msgCount"),n=0;e?n=parseIntOrZero(e.innerHTML.replace(/[\(\) ]/gi,"")):["Messages","Calls","Voicemail"].forEach(function(e){var r=document.querySelector(\'gv-nav-tab[tooltip="\'+e+\'"] div[aria-label="Unread count"]\');r&&(n+=parseIntOrZero(r.innerHTML))}),updateBadge(n)}function updateBadge(e){var n=e>0?"("+e+") ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);'
 		},
 		{
 			 id: 'sandstorm'
@@ -876,7 +864,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,logo: 'mailru.png'
 			,name: 'Mail.Ru'
 			,description: 'Free voice and video calls, ICQ support, Odnoklassniki, VKontakte, Facebook, online games, free SMS.'
-			,url: 'http://webagent.mail.ru/webim/agent/popup.html'
+			,url: 'https://webagent.mail.ru/webim/agent/popup.html'
 			,type: 'email'
 		},
 		{
@@ -888,5 +876,67 @@ Ext.define('Rambox.store.ServicesList', {
 			,type: 'messaging'
 			,custom_domain: true
 		},
+		{
+			 id: 'stride'
+			,logo: 'stride.png'
+			,name: 'Stride'
+			,description: 'Stride is the complete team communication solution with group messaging, video meetings, and built-in collaboration tools.'
+			,url: 'https://app.stride.com/___'
+			,type: 'messaging'
+			,js_unread: 'function checkUnread(){var t=0,e=!1;document.querySelectorAll(".conversations-nav .nav-item .activity-indicator").forEach(function(n){n.classList.contains("has-count")?t+=parseInt(n.innerHTML):e=!0}),updateBadge(t,e)}function updateBadge(t,e){var n=t>0?"("+t+") ":e?"(•) ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);'
+		},
+		{
+			 id: 'hangoutschat'
+			,logo: 'hangoutschat.png'
+			,name: 'Hangouts Chat'
+			,description: 'A messaging platform built for teams.'
+			,url: 'https://chat.google.com/'
+			,type: 'messaging'
+			,titleBlink: true
+			,manual_notifications: true
+			,js_unread: 'function checkUnread(){updateBadge(document.querySelectorAll(".SSPGKf.EyyDtb.Q6oXP:not(.oCHqfe) .eM5l9e.FVKzAb").length)}function updateBadge(e){e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3000);'
+		},
+		{
+			 id: 'devrant'
+			,logo: 'devrant.png'
+			,name: 'devRant'
+			,description: 'Share and bond over successes and frustrations with code, tech and life as a programmer'
+			,url: 'https://devrant.com/'
+			,type: 'messaging'
+			,js_unread: 'function checkUnread(){var a=document.querySelectorAll(".menu-notif.notif-badge")[0];updateBadge(t=a===undefined?0:(a.textContent.length?parseInt(a.textContent.replace(/[^0-9]/g,"")):0))}function updateBadge(a){a>=1?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3000);'
+		},
+		{
+			 id: 'reddit'
+			,logo: 'reddit.png'
+			,name: 'Reddit'
+			,description: 'Reddit\'s in-build chat service.'
+			,url: 'https://www.reddit.com/chat'
+			,type: 'messaging'
+		},
+		{
+			 id: 'androidmessages'
+			,logo: 'androidmessages.png'
+			,name: 'Android Messages'
+			,description: 'Text on your computer with Messages for web.'
+			,url: 'https://messages.android.com/'
+			,type: 'messaging'
+			,js_unread: 'function checkUnread(){var t = document.querySelectorAll(".tpEAA.yrs5ff").length;if(t>=1){rambox.setUnreadCount(t)}else{rambox.clearUnreadCount()}}setInterval(checkUnread,3000);'
+		},
+		{
+			 id: 'tawktochat'
+			,logo: 'tawkto.png'
+			,name: 'Tawk.to Chat'
+			,description: 'A chat platform built for monitor and chat with visitors on your website.'
+			,url: 'https://dashboard.tawk.to/'
+			,type: 'messaging'
+		},
+		{
+			 id: 'sococo'
+			,logo: 'sococo.png'
+			,name: 'Sococo'
+			,description: 'Sococo is an online workplace that adds the magic of co-location back into the day to day life of distributed Agile teams.'
+			,url: 'https://app.sococo.com/a/login'
+			,type: 'messaging'
+		}
 	]
 });

app/ux/Auth0.js

@@ -4,85 +4,78 @@ Ext.define('Rambox.ux.Auth0', {
 	// private
 	,lock: null
 	,auth0: null
+	,authService: null
 	,backupCurrent: false
 
 	,init: function() {
 		var me = this;
 
-		var Auth0Lock = require('auth0-lock')['default'];
 		var Auth0 = require('auth0-js');
-
+		var _AuthService = require('./resources/js/AuthService');
-		// Auth0 Config
+
-		me.lock = new Auth0Lock(auth0Cfg.clientID, auth0Cfg.domain, {
+		me.authService = new _AuthService.default({
-			 autoclose: true
+			clientId: auth0Cfg.clientID,
-			,autofocus: true
+			authorizeEndpoint: 'https://'+auth0Cfg.domain+'/authorize',
-			,auth: {
+			audience: 'https://'+auth0Cfg.domain+'/userinfo',
-				 redirect: false
+			scope: 'openid profile offline_access',
-				,params: {scope: 'openid offline_access'}
+			redirectUri: 'https://'+auth0Cfg.domain+'/mobile',
-			}
+			tokenEndpoint: 'https://'+auth0Cfg.domain+'/oauth/token'
-			,theme: {
-				 logo: 'resources/Icon.png'
-				,primaryColor: '#0675A0'
-			}
-			,languageDictionary: {
-				title: 'Rambox Account'
-			}
-			,popupOptions: {
-				nodeIntegration: 'no'
-			}
-			,language: localStorage.getItem('locale-auth0') === null ? 'en' : localStorage.getItem('locale-auth0')
 		});
 
 		me.auth0 = new Auth0.WebAuth({ clientID: auth0Cfg.clientID, domain : auth0Cfg.domain });
 
-		me.defineEvents();
+		//me.defineEvents();
 	}
 
-	,defineEvents: function() {
+	,onLogin: function(token, authWindow) {
 		var me = this;
 
-		me.lock.on("authenticated", function(authResult) {
+		authWindow.close();
-			me.lock.getProfile(authResult.idToken, function(err, profile) {
-				if ( err ) {
-					if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
-					Ext.Msg.hide();
-					return Ext.Msg.show({
-						 title: 'Error'
-						,message: 'There was an error getting the profile: ' + err.error_description
-						,icon: Ext.Msg.ERROR
-						,buttons: Ext.Msg.OK
-					});
-				}
-
-				// Display a spinner while waiting
-				Ext.Msg.wait(locale['app.window[29]'], locale['app.window[28]']);
-
-				// Google Analytics Event
-				ga_storage._trackEvent('Users', 'loggedIn');
-
-				// Set cookies to help Tooltip.io messages segmentation
-				Ext.util.Cookies.set('auth0', true);
-
-				// User is logged in
-				// Save the profile and JWT.
-				localStorage.setItem('profile', JSON.stringify(profile));
-				localStorage.setItem('id_token', authResult.idToken);
-				localStorage.setItem('refresh_token', authResult.refreshToken);
-
-				if ( !Ext.isEmpty(profile.user_metadata) && !Ext.isEmpty(profile.user_metadata.services) && !me.backupCurrent ) {
-					Ext.each(profile.user_metadata.services, function(s) {
-						var service = Ext.create('Rambox.model.Service', s);
-						service.save();
-						Ext.getStore('Services').add(service);
-					});
-
-					require('electron').remote.getCurrentWindow().reload();
-				}
 
+		me.auth0.client.userInfo(token.access_token, function(err, profile) {
+			if ( err ) {
+				if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
 				Ext.Msg.hide();
-				Ext.cq1('app-main').getViewModel().set('username', profile.name);
+				return Ext.Msg.show({
-				Ext.cq1('app-main').getViewModel().set('avatar', profile.picture);
+					 title: 'Error'
-			});
+					,message: 'There was an error getting the profile: ' + err.error_description
+					,icon: Ext.Msg.ERROR
+					,buttons: Ext.Msg.OK
+				});
+			}
+
+			profile.user_metadata = profile['https://rambox.pro/user_metadata'];
+			delete profile['https://rambox.pro/user_metadata'];
+
+			// Display a spinner while waiting
+			Ext.Msg.wait(locale['app.window[29]'], locale['app.window[28]']);
+
+			// Google Analytics Event
+			ga_storage._trackEvent('Users', 'loggedIn');
+
+			// Set cookies to help Tooltip.io messages segmentation
+			Ext.util.Cookies.set('auth0', true);
+
+			// User is logged in
+			// Save the profile and JWT.
+			localStorage.setItem('profile', JSON.stringify(profile));
+			localStorage.setItem('access_token', token.access_token);
+			localStorage.setItem('id_token', token.id_token);
+			localStorage.setItem('refresh_token', token.refresh_token);
+
+			if ( !Ext.isEmpty(profile.user_metadata) && !Ext.isEmpty(profile.user_metadata.services) && !me.backupCurrent ) {
+				Ext.each(profile.user_metadata.services, function(s) {
+					var service = Ext.create('Rambox.model.Service', s);
+					service.save();
+					Ext.getStore('Services').add(service);
+				});
+
+				require('electron').remote.getCurrentWindow().reload();
+			}
+
+			Ext.Msg.hide();
+			Ext.cq1('app-main').getViewModel().set('username', profile.name);
+			Ext.cq1('app-main').getViewModel().set('avatar', profile.picture);
 		});
 	}
 
@@ -147,7 +140,7 @@ Ext.define('Rambox.ux.Auth0', {
 	,restoreConfiguration: function() {
 		var me = this;
 
-		me.lock.getProfile(localStorage.getItem('id_token'), function (err, profile) {
+		me.auth0.client.userInfo(localStorage.getItem('access_token'), function(err, profile) {
 			if ( err ) {
 				if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
 				return Ext.Msg.show({
@@ -158,8 +151,12 @@ Ext.define('Rambox.ux.Auth0', {
 				});
 			}
 
+			profile.user_metadata = profile['https://rambox.pro/user_metadata'];
+			delete profile['https://rambox.pro/user_metadata'];
+
 			// First we remove all current services
 			Ext.cq1('app-main').getController().removeAllServices(false, function() {
+				if ( !profile.user_metadata || !profile.user_metadata.services ) return;
 				Ext.each(profile.user_metadata.services, function(s) {
 					var service = Ext.create('Rambox.model.Service', s);
 					service.save();
@@ -174,7 +171,7 @@ Ext.define('Rambox.ux.Auth0', {
 	,checkConfiguration: function() {
 		var me = this;
 
-		me.lock.getProfile(localStorage.getItem('id_token'), function (err, profile) {
+		me.auth0.client.userInfo(localStorage.getItem('access_token'), function(err, profile) {
 			if ( err ) {
 				if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
 				return Ext.Msg.show({
@@ -185,6 +182,9 @@ Ext.define('Rambox.ux.Auth0', {
 				});
 			}
 
+			profile.user_metadata = profile['https://rambox.pro/user_metadata'];
+			delete profile['https://rambox.pro/user_metadata'];
+
 			if ( !profile.user_metadata ) {
 				Ext.toast({
 					 html: 'You don\'t have any backup yet.'
@@ -243,7 +243,34 @@ Ext.define('Rambox.ux.Auth0', {
 	,login: function() {
 		var me = this;
 
-		me.lock.show();
+		var electron = require('electron').remote;
+		var authWindow = new electron.BrowserWindow({
+			 title: 'Rambox - Login'
+			,width: 400
+			,height: 600
+			,maximizable: false
+			,minimizable: false
+			,resizable: false
+			,center: true
+			,autoHideMenuBar: true
+			,skipTaskbar: true
+			,fullscreenable: false
+			,modal: true
+			,parent: require('electron').remote.getCurrentWindow()
+			,webPreferences: {
+				partition: 'persist:rambox'
+			}
+		});
+
+		authWindow.on('closed', function() {
+			authWindow = null;
+		});
+
+		authWindow.loadURL(me.authService.requestAuthCode());
+
+		authWindow.webContents.on('did-get-redirect-request', function(e, oldUrl, newUrl) {
+			me.authService.requestAccessCode(newUrl, me.onLogin.bind(me), authWindow);
+		});
 	}
 
 	,logout: function() {

app/ux/WebView.js

@@ -174,7 +174,7 @@ Ext.define('Rambox.ux.WebView',{
 					,plugins: 'true'
 					,allowtransparency: 'on'
 					,autosize: 'on'
-					,webpreferences: 'allowRunningInsecureContent=yes' //,nativeWindowOpen=yes
+					,webpreferences: '' //,nativeWindowOpen=yes
 					//,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
 					,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
 					,preload: './resources/js/rambox-service-api.js'
@@ -230,6 +230,8 @@ Ext.define('Rambox.ux.WebView',{
 
 		var webview = me.down('component').el.dom;
 
+		require('electron-context-menu')({window: webview});
+
 		// Google Analytics Event
 		ga_storage._trackEvent('Services', 'load', me.type, 1, true);
 
@@ -475,14 +477,14 @@ Ext.define('Rambox.ux.WebView',{
 
 			/**
 			 * Handles 'rambox.setUnreadCount' messages.
-			 * Sets the badge text if the event contains an integer as first argument.
+			 * Sets the badge text if the event contains an integer or a '•' (indicating non-zero but unknown number of unreads) as first argument.
 			 *
 			 * @param event
 			 */
 			function handleSetUnreadCount(event) {
 				if (Array.isArray(event.args) === true && event.args.length > 0) {
 					var count = event.args[0];
-					if (count === parseInt(count, 10)) {
+					if (count === parseInt(count, 10) || "•" === count) {
 						me.setUnreadCount(count);
 					}
 				}
@@ -495,9 +497,9 @@ Ext.define('Rambox.ux.WebView',{
 		});
 
 		/**
-		 * Register page title update event listener only for services that don't prevent it by setting 'dont_update_unread_from_title' to true.
+		 * Register page title update event listener only for services that don't specify a js_unread
 		 */
-		if (Ext.getStore('ServicesList').getById(me.record.get('type')).get('dont_update_unread_from_title') !== true) {
+		if (Ext.getStore('ServicesList').getById(me.record.get('type')).get('js_unread') === '' && me.record.get('js_unread') === '') {
 			webview.addEventListener("page-title-updated", function(e) {
 				var count = e.title.match(/\(([^)]+)\)/); // Get text between (...)
 				count = count ? count[1] : '0';

app/view/add/Add.js

@@ -65,7 +65,7 @@ Ext.define('Rambox.view.add.Add',{
 								,readOnly: me.edit ? (me.service.get('custom_domain') && me.service.get('url') === me.record.get('url') ? true : me.service.get('url').indexOf('___') === -1 && !me.service.get('custom_domain')) : me.record.get('url').indexOf('___') === -1 && me.record.get('custom_domain')
 								,allowBlank: false
 								,submitEmptyText: false
-								,emptyText: me.record.get('url') === '___' ? 'http://' : ''
+								,emptyText: me.record.get('url') === '___' ? 'https://' : ''
 								,vtype: me.record.get('url') === '___' ? 'url' : ''
 								,listeners: { specialkey: 'onEnter' }
 								,flex: 1
@@ -97,7 +97,7 @@ Ext.define('Rambox.view.add.Add',{
 								}
 								,changeHandler: function(cycleBtn, activeItem) {
 									Ext.apply(cycleBtn.previousSibling(), {
-										 emptyText: activeItem.custom ? 'http://' : ' '
+										 emptyText: activeItem.custom ? 'https://' : ' '
 										,vtype: activeItem.custom ? 'url' : ''
 									});
 									cycleBtn.previousSibling().applyEmptyText();
@@ -127,7 +127,7 @@ Ext.define('Rambox.view.add.Add',{
 					,{
 						 xtype: 'textfield'
 						,fieldLabel: locale['app.window[18]']
-						,emptyText: 'http://url.com/image.png'
+						,emptyText: 'https://url.com/image.png'
 						,name: 'logo'
 						,vtype: me.record.get('type') === 'custom' ? 'url' : ''
 						,value: me.record.get('type') === 'custom' ? (me.edit ? me.record.get('logo') : '') : me.record.get('logo')

app/view/main/Main.js

@@ -25,6 +25,15 @@ Ext.define('Rambox.view.main.Main', {
 	,autoRender: true
 	,autoShow: true
 	,deferredRender: false
+	,tabBar: {
+		items: [{
+			 xtype: 'button'
+			,html: '<span class="fa fa-heart" style="color:red;font-size:16px;cursor:pointer;padding:0 5px;"></span>'
+			,baseCls: ''
+			,tooltip: locale['app.main[25]']
+			,href: 'https://rambox.pro/#donate'
+		}]
+	}
 	,items: [
 		{
 			 icon: 'resources/[email protected]'
@@ -242,6 +251,11 @@ Ext.define('Rambox.view.main.Main', {
 						,tooltip: locale['app.main[20]']+'<br/><b>'+locale['app.main[18]']+': F2</b>'
 						,handler: 'lockRambox'
 						,id: 'lockRamboxBtn'
+					},'-'
+					,{
+						 html: '<span style="color:#FFF;cursor:pointer;"><span class="fa fa-star" style="color:#F8D64E;font-size:16px;padding:0 5px;"></span> Try Rambox Pro</span>'
+						,href: 'https://rambox.pro/api/download'
+						,baseCls: ''
 					}
 					,'->'
 					,{
@@ -304,7 +318,7 @@ Ext.define('Rambox.view.main.Main', {
 						 text: locale['app.main[22]']
 						,icon: 'resources/auth0.png'
 						,id: 'loginBtn'
-						,tooltip: locale['app.main[23]']+'<br /><br /><i>'+locale['app.main[24]']+' Auth0 (http://auth0.com)</i>'
+						,tooltip: locale['app.main[23]']+'<br /><br /><i>'+locale['app.main[24]']+' Auth0 (https://auth0.com)</i>'
 						,bind: {
 							hidden: '{username}'
 						}
@@ -329,7 +343,7 @@ Ext.define('Rambox.view.main.Main', {
 						,{
 							 text: locale['app.main[25]']
 							,glyph: 'xf21e@FontAwesome'
-							,handler: 'showDonate'
+							,href: 'https://rambox.pro/#donate'
 						}
 						,{
 							 text: 'Translation'
@@ -362,7 +376,7 @@ Ext.define('Rambox.view.main.Main', {
 						}
 						,{
 							 glyph: 'xf09b@FontAwesome'
-							,href: 'https://www.github.com/saenzramiro/rambox'
+							,href: 'https://github.com/ramboxapp/community-edition'
 						}
 					]
 				}
@@ -376,5 +390,6 @@ Ext.define('Rambox.view.main.Main', {
 		,add: 'updatePositions'
 		,remove: 'updatePositions'
 		,childmove: 'updatePositions'
+		,boxready: 'initialize'
 	}
 });

app/view/main/MainController.js

@@ -3,6 +3,22 @@ Ext.define('Rambox.view.main.MainController', {
 
 	,alias: 'controller.main'
 
+	,initialize: function( tabPanel ) {
+		const config = ipc.sendSync('getConfig');
+
+		tabPanel.setTabPosition(config.tabbar_location);
+		tabPanel.setTabRotation(0);
+
+		var reorderer = tabPanel.plugins.find(function(plugin) { return plugin.ptype == "tabreorderer"});
+
+		if ( reorderer !== undefined ) {
+			const names = reorderer.container.getLayout().names;
+			reorderer.dd.dim = names.width;
+			reorderer.dd.startAttr = names.beforeX;
+			reorderer.dd.endAttr = names.afterX;
+		}
+	}
+
 	// Make focus on webview every time the user change tabs, to enable the autofocus in websites
 	,onTabChange: function( tabPanel, newTab, oldTab ) {
 		var me = this;
@@ -42,14 +58,20 @@ Ext.define('Rambox.view.main.MainController', {
 		console.log('Updating Tabs positions...');
 
 		var store = Ext.getStore('Services');
+		var align = 'left';
 		store.suspendEvent('remove');
 		Ext.each(tabPanel.items.items, function(t, i) {
 			if ( t.id !== 'ramboxTab' && t.id !== 'tbfill' && t.record.get('enabled') ) {
 				var rec = store.getById(t.record.get('id'));
-				if ( rec.get('align') === 'right' ) i--;
+				if ( align === 'right' ) i--;
+				rec.set('align', align);
 				rec.set('position', i);
 				rec.save();
 			}
+			else if ( t.id === 'tbfill' ) {
+				align = 'right';
+			}
+
 		});
 
 		store.load();
@@ -464,6 +486,7 @@ Ext.define('Rambox.view.main.MainController', {
 			Ext.cq1('app-main').getViewModel().set('avatar', '');
 
 			if ( Ext.isFunction(callback) ) callback();
+			Ext.Msg.hide();
 		}
 
 		if ( btn ) {
@@ -478,6 +501,6 @@ Ext.define('Rambox.view.main.MainController', {
 	}
 
 	,showDonate: function( btn ) {
-		Tooltip.API.show('zxzKWZfcmgRtHXgth');
+		Signalayer.API.show('tChaoq3PwSG9wswhn');
 	}
 });

app/view/preferences/Preferences.js

@@ -146,10 +146,31 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,value: config.hide_menu_bar
 						,hidden: process.platform === 'darwin'
 					}
+					,{
+						 xtype: 'combo'
+						,name: 'tabbar_location'
+						,fieldLabel: locale['preferences[11]']
+						,labelAlign: 'left'
+						,width: 380
+						,labelWidth: 180
+						,value: config.tabbar_location
+						,displayField: 'label'
+						,valueField: 'value'
+						,editable: false
+						,store: Ext.create('Ext.data.Store', {
+							 fields: ['value', 'label']
+							,data: [
+								 { 'value': 'top', 'label': 'Top' }
+								,{ 'value': 'left', 'label': 'Left' }
+								,{ 'value': 'bottom', 'label': 'Bottom' }
+								,{ 'value': 'right', 'label': 'Right' }
+							]
+						})
+					}
 					,{
 						 xtype: 'combo'
 						,name: 'default_service'
-						,fieldLabel: 'Default service to display when Rambox starts'
+						,fieldLabel: locale['preferences[12]']
 						,labelAlign: 'top'
 						//,width: 380
 						//,labelWidth: 105
@@ -165,7 +186,7 @@ Ext.define('Rambox.view.preferences.Preferences',{
 					,{
 						 xtype: 'combo'
 						,name: 'window_display_behavior'
-						,fieldLabel: 'Display behaviour'
+						,fieldLabel: locale['preferences[13]']
 						,labelAlign: 'left'
 						,width: 380
 						,labelWidth: 105
@@ -176,9 +197,9 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,store: Ext.create('Ext.data.Store', {
 							 fields: ['value', 'label']
 							,data: [
-								 { 'value': 'show_taskbar', 'label': 'Show in Taskbar' }
+								 { 'value': 'show_taskbar', 'label': locale['preferences[14]'] }
-								,{ 'value': 'show_trayIcon', 'label': 'Show Tray Icon' }
+								,{ 'value': 'show_trayIcon', 'label': locale['preferences[15]'] }
-								,{ 'value': 'taskbar_tray', 'label': 'Show in Taskbar and Tray Icon' }
+								,{ 'value': 'taskbar_tray', 'label': locale['preferences[16]'] }
 							]
 						})
 						,hidden: process.platform === 'darwin'
@@ -186,7 +207,7 @@ Ext.define('Rambox.view.preferences.Preferences',{
 					,{
 						 xtype: 'combo'
 						,name: 'window_close_behavior'
-						,fieldLabel: 'When closing the main window'
+						,fieldLabel: locale['preferences[17]']
 						,labelAlign: 'left'
 						,width: 380
 						,labelWidth: 180
@@ -197,9 +218,9 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,store: Ext.create('Ext.data.Store', {
 							 fields: ['value', 'label']
 							,data: [
-								 { 'value': 'keep_in_tray', 'label': 'Keep in tray' }
+								 { 'value': 'keep_in_tray', 'label': locale['preferences[18]'] }
-								,{ 'value': 'keep_in_tray_and_taskbar', 'label': 'Keep in tray and/or taskbar' }
+								,{ 'value': 'keep_in_tray_and_taskbar', 'label': locale['preferences[19]'] }
-								,{ 'value': 'quit', 'label': 'Quit' }
+								,{ 'value': 'quit', 'label': locale['preferences[20]'] }
 							]
 						})
 						,hidden: process.platform === 'darwin'
@@ -207,13 +228,13 @@ Ext.define('Rambox.view.preferences.Preferences',{
 					,{
 						 xtype: 'checkbox'
 						,name: 'always_on_top'
-						,boxLabel: 'Always on top'
+						,boxLabel: locale['preferences[21]']
 						,value: config.always_on_top
 					}
 					,{
 						 xtype: 'checkbox'
 						,name: 'systemtray_indicator'
-						,boxLabel: 'Show System Tray indicator on unread messages'
+						,boxLabel: locale['preferences[22]']
 						,value: config.systemtray_indicator
 						,hidden: process.platform === 'darwin'
 					}
@@ -226,7 +247,7 @@ Ext.define('Rambox.view.preferences.Preferences',{
 					,{
 						 xtype: 'checkbox'
 						,name: 'disable_gpu'
-						,boxLabel: 'Disable Hardware Acceleration (needs to relaunch)'
+						,boxLabel: locale['preferences[23]']
 						,value: config.disable_gpu
 					}
 					,{
@@ -234,10 +255,11 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,name: 'enable_hidpi_support'
 						,boxLabel: locale['preferences[8]']
 						,value: config.enable_hidpi_support
+						,hidden: process.platform !== 'win32'
 					}
 					,{
 						 xtype: 'fieldset'
-						,title: 'Master Password - Ask for password on startup'
+						,title: locale['preferences[24]']
 						,collapsed: !config.master_password
 						,checkboxToggle: true
 						,checkboxName: 'master_password'
@@ -249,7 +271,7 @@ Ext.define('Rambox.view.preferences.Preferences',{
 							{
 								 xtype: 'textfield'
 								,inputType: 'password'
-								,fieldLabel: 'Password'
+								,fieldLabel: locale['preferences[25]']
 								,name: 'master_password1'
 								,itemId: 'pass'
 								,flex: 1
@@ -265,7 +287,7 @@ Ext.define('Rambox.view.preferences.Preferences',{
 							,{
 								 xtype: 'textfield'
 								,inputType: 'password'
-								,fieldLabel: 'Repeat Password'
+								,fieldLabel: locale['preferences[26]']
 								,name: 'master_password2'
 								,margin: '0 0 0 10'
 								,vtype: 'password'
@@ -276,7 +298,7 @@ Ext.define('Rambox.view.preferences.Preferences',{
 					}
 					,{
 						 xtype: 'fieldset'
-						,title: 'Proxy (needs to relaunch) - <a href="http://proxylist.hidemyass.com/" target="_blank">Free IP:PORT Proxy List</a>'
+						,title: 'Proxy (needs to relaunch) - <a href="https://github.com/saenzramiro/rambox/wiki/FREE-PROXY-SERVERS" target="_blank">Free Proxy Servers</a>'
 						,collapsed: !config.proxy
 						,checkboxToggle: true
 						,checkboxName: 'proxy'
@@ -315,6 +337,12 @@ Ext.define('Rambox.view.preferences.Preferences',{
 							}
 						]
 					}
+					,{
+						 xtype: 'checkbox'
+						,name: 'sendStatistics'
+						,boxLabel: locale['preferences[27]']
+						,value: config.sendStatistics
+					}
 				]
 			}
 		];

appveyor.yml

@@ -1,4 +1,6 @@
-version: 0.5.14
+environment:
+  matrix:
+    - nodejs_version: '8'
 pull_requests:
   do_not_increment_build_number: true
 branches:
@@ -6,46 +8,21 @@ branches:
   - master
 skip_non_tags: true
 init:
-- cmd: git config --global core.autocrlf input
+  - cmd: git config --global core.autocrlf input
+  - cmd: node --version
+  - cmd: npm --version
 install:
-- cmd: >-
+  - ps: Install-Product node $env:nodejs_version
-    git reset --hard HEAD
+  - cmd: >-
+      git clone https://github.com/saenzramiro/rambox-build.git %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\
 
-    npm run sencha:clean
+      cd %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\
 
-    git clone https://github.com/saenzramiro/rambox-build.git %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\
+      npm install
-
-    npm install npm -g
-
-    npm install
-
-    npm --prefix %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\ install %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\
-
-    npm prune
 cache:
-- '%APPDATA%\npm-cache'
+  - '%APPDATA%\npm-cache'
-- '%USERPROFILE%\.electron'
+  - '%USERPROFILE%\.electron'
-- node_modules
-- build\production\Rambox\node_modules
 build_script:
-- cmd: >-
+  - cmd: cd %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\
-    node --version
+  - cmd: npm run build:win
-
-    npm --version
-
-    node_modules/.bin/build --win --ia32 --x64
 test: off
-artifacts:
-- path: dist\win\*.exe
-- path: dist\win\*.nupkg
-- path: dist\win\RELEASES
-- path: dist\win-ia32\*.exe
-- path: dist\*.zip
-deploy:
-- provider: GitHub
-  tag: $(appveyor_build_version)
-  release: $(appveyor_build_version)
-  auth_token:
-    secure: RKFkz2S89dkYXdW+k47Wv42yrUeE1bDDMkM1PNuxrb0ZOcVVXPO88+t5dUllyvOG
-  draft: true
-  prerelease: false

electron/main.js

@@ -6,7 +6,7 @@ const tray = require('./tray');
 // AutoLaunch
 var AutoLaunch = require('auto-launch-patched');
 // Configuration
-const Config = require('electron-config');
+const Config = require('electron-store');
 // Development
 const isDev = require('electron-is-dev');
 // Updater
@@ -20,6 +20,7 @@ const config = new Config({
 	 defaults: {
 		 always_on_top: false
 		,hide_menu_bar: false
+		,tabbar_location: 'top'
 		,window_display_behavior: 'taskbar_tray'
 		,auto_launch: !isDev
 		,flash_frame: true
@@ -37,6 +38,7 @@ const config = new Config({
 		,locale: 'en'
 		,enable_hidpi_support: false
 		,default_service: 'ramboxTab'
+		,sendStatistics: false
 
 		,x: undefined
 		,y: undefined
@@ -156,15 +158,19 @@ function createWindow () {
 		,show: !config.get('start_minimized')
 		,acceptFirstMouse: true
 		,webPreferences: {
-			 webSecurity: false
+			plugins: true
-			,nodeIntegration: true
-			,plugins: true
 			,partition: 'persist:rambox'
 		}
 	});
 
 	if ( !config.get('start_minimized') && config.get('maximized') ) mainWindow.maximize();
-	if ( config.get('window_display_behavior') !== 'show_trayIcon' && config.get('start_minimized') ) mainWindow.minimize();
+	if ( config.get('window_display_behavior') !== 'show_trayIcon' && config.get('start_minimized') ) {
+		// Wait for the mainWindow.loadURL(..) and the optional mainWindow.webContents.openDevTools() 
+		// to be finished before minimizing
+		mainWindow.webContents.once('did-finish-load', function(e) {
+			mainWindow.minimize();
+		});
+	}
 
 	// Check if the window its outside of the view (ex: multi monitor setup)
 	const { positionOnScreen } = require('./utils/positionOnScreen');
@@ -277,15 +283,12 @@ function createMasterPasswordWindow() {
 function updateBadge(title) {
 	title = title.split(" - ")[0]; //Discard service name if present, could also contain digits
 	var messageCount = title.match(/\d+/g) ? parseInt(title.match(/\d+/g).join("")) : 0;
+	messageCount = isNaN(messageCount) ? 0 : messageCount;
 
 	tray.setBadge(messageCount, config.get('systemtray_indicator'));
 
-	if (process.platform === 'win32') { // Windows
+	if (process.platform === 'win32') {
-		if (messageCount === 0) {
+		if (messageCount === 0) return mainWindow.setOverlayIcon(null, '');
-			mainWindow.setOverlayIcon(null, "");
-			return;
-		}
-
 		mainWindow.webContents.send('setBadge', messageCount);
 	} else { // macOS & Linux
 		app.setBadgeCount(messageCount);
@@ -295,8 +298,7 @@ function updateBadge(title) {
 }
 
 ipcMain.on('setBadge', function(event, messageCount, value) {
-	var img = nativeImage.createFromDataURL(value);
+	mainWindow.setOverlayIcon(nativeImage.createFromDataURL(value), messageCount.toString());
-	mainWindow.setOverlayIcon(img, messageCount.toString());
 });
 
 ipcMain.on('getConfig', function(event, arg) {
@@ -316,6 +318,8 @@ ipcMain.on('setConfig', function(event, values) {
 	// systemtray_indicator
 	updateBadge(mainWindow.getTitle());
 
+	mainWindow.webContents.executeJavaScript('(function(a){if(a)a.controller.initialize(a)})(Ext.cq1("app-main"))');
+
 	switch ( values.window_display_behavior ) {
 		case 'show_taskbar':
 			mainWindow.setSkipTaskbar(false);
@@ -334,6 +338,10 @@ ipcMain.on('setConfig', function(event, values) {
 	}
 });
 
+ipcMain.on('sendStatistics', function(event) {
+	event.returnValue = config.get('sendStatistics');
+});
+
 ipcMain.on('validateMasterPassword', function(event, pass) {
 	if ( config.get('master_password') === require('crypto').createHash('md5').update(pass).digest('hex') ) {
 		createWindow();
@@ -469,7 +477,7 @@ if ( config.get('proxy') ) {
 	app.on('login', (event, webContents, request, authInfo, callback) => {
 		if(!authInfo.isProxy)
 			return;
-			
+
 		event.preventDefault()
 		callback(config.get('proxyLogin'), config.get('proxyPassword'))
 	})

electron/menu.js

@@ -22,7 +22,7 @@ module.exports = function(config) {
 		{
 			label: `&`+locale['menu.help[0]'],
 			click() {
-				shell.openExternal('http://rambox.pro');
+				shell.openExternal('https://rambox.pro');
 			}
 		},
 		{
@@ -40,7 +40,7 @@ module.exports = function(config) {
 		{
 			label: `&GitHub`,
 			click() {
-				shell.openExternal('https://www.github.com/saenzramiro/rambox');
+				shell.openExternal('https://github.com/ramboxapp/community-edition');
 			}
 		},
 		{
@@ -60,13 +60,13 @@ module.exports = function(config) {
 	> Electron ${process.versions.electron}
 	> ${process.platform} ${process.arch} ${os.release()}`;
 
-				shell.openExternal(`https://github.com/saenzramiro/rambox/issues/new?body=${encodeURIComponent(body)}`);
+				shell.openExternal(`https://github.com/ramboxapp/community-edition/issues/new?body=${encodeURIComponent(body)}`);
 			}
 		},
 		{
 			label: `&`+locale['menu.help[2]'],
 			click() {
-				shell.openExternal('https://gitter.im/saenzramiro/rambox');
+				shell.openExternal('https://rambox.typeform.com/to/t7jc4C');
 			}
 		},
 		{
@@ -98,7 +98,7 @@ module.exports = function(config) {
 		{
 			label: `&`+locale['menu.help[3]'],
 			click() {
-				shell.openExternal('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA');
+				shell.openExternal('https://rambox.pro/#donate');
 			}
 		}
 	];
@@ -162,6 +162,15 @@ module.exports = function(config) {
 				{
 					type: 'separator'
 				},
+				{
+					label: '&Toggle Status Bar',
+					click() {
+						sendAction('toggleStatusBar');
+					}
+				},
+				{
+					type: 'separator'
+				},
 				{
 					role: 'zoomin'
 				},

electron/tray.js

@@ -66,12 +66,13 @@ exports.setBadge = function(messageCount, showUnreadTray) {
 	if (process.platform === 'darwin' || !appIcon) return;
 
 	let icon;
+	messageCount = parseInt(messageCount);
 	if (process.platform === 'linux') {
-		icon = messageCount && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
+		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
 	} else {
-		icon = messageCount && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
+		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
 	}
 
 	const iconPath = path.join(__dirname, `../resources/${icon}`);
-	appIcon.setImage(iconPath);
+	appIcon.setImage(electron.nativeImage.createFromPath(iconPath));
 };

electron/updater.js

@@ -1,7 +1,6 @@
-const {app, autoUpdater, ipcMain} = require('electron');
+const {app, ipcMain} = require('electron');
-const version = app.getVersion();
+const { autoUpdater } = require("electron-updater");
-const platform = process.platform === 'darwin' ? 'osx' : process.platform;
+const path = require('path');
-const url = `https://getrambox.herokuapp.com/update/${platform}/${version}`;
 
 const initialize = (window) => {
 	const webContents = window.webContents;
@@ -10,10 +9,6 @@ const initialize = (window) => {
 	autoUpdater.on('update-downloaded', (event, ...args) => send('autoUpdater:update-downloaded', ...args));
 	ipcMain.on('autoUpdater:quit-and-install', (event) => autoUpdater.quitAndInstall());
 	ipcMain.on('autoUpdater:check-for-updates', (event) => autoUpdater.checkForUpdates());
-	webContents.on('did-finish-load', () => {
-		autoUpdater.setFeedURL(url);
-		//autoUpdater.checkForUpdates();
-	});
 };
 
 module.exports = {initialize};

ext/packages/ext-aria/build/resources/Readme.md

@@ -1,3 +1,3 @@
 # ext-aria/resources
 
-This folder contains static resources (typically an `"images"` folder as well).
+This folder contains static resources (typically an `images` folder as well).

ext/packages/ext-aria/resources/Readme.md

@@ -1,3 +1,3 @@
 # ext-aria/resources
 
-This folder contains static resources (typically an `"images"` folder as well).
+This folder contains static resources (typically an `images` folder as well).

ext/packages/ext-aria/sass/etc/Readme.md

@@ -1,4 +1,4 @@
 # ext-aria/sass/etc
 
-This folder contains miscellaneous SASS files. Unlike `"ext-aria/sass/etc"`, these files
+This folder contains miscellaneous SASS files.
-need to be used explicitly.
+Unlike `ext-aria/sass/etc`, these files need to be used explicitly.

ext/packages/sencha-soap/Readme.md

@@ -1,2 +1 @@
 # sencha-soap - Read Me
-

index.html

@@ -15,7 +15,9 @@
 		xhr.open('HEAD', file + "?rand=" + randomNum, true);
 		xhr.send();
 
-		xhr.addEventListener("readystatechange", processRequest, false);
+		xhr.addEventListener("readystatechange", function() {
+			setTimeout(processRequest, 5000);
+		}, false);
 
 		function processRequest(e) {
 			if (xhr.readyState == 4) {
@@ -42,16 +44,22 @@
 	</script>
 	<!--- Localization -->
 
-	<!--- Tooltip player -->
+	<!--- Signalayer player -->
 	<script type='text/javascript'>
-	    (function(d, s){
+	window.Signalayer||function(t,e){var o={
-			var t = d.createElement(s), e = d.getElementsByTagName(s)[0];
+		url:"https://cdn.signalayer.com/static/player.js",
-			t.type = "text/javascript"; e.parentNode.insertBefore(t, e);
+		key:"sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2",
-			t.async = "async";
+		async:true
-			t.src = "https://cdn.tooltip.io/static/player.js?apiKey=sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2";
+	};window.Signalayer={cs:[],_apiKey:o.key};for(
-		})(document, "script");
+	var r=["identify","goal","updateUserData","start","stop","refresh","show","hide","on"],
+	i={},n=0;n>r.length;n++){var a=r[n];i[a]=function(t){return function(){var
+	e=Array.prototype.slice.call(arguments);
+	window.Signalayer.cs.push({method:t,args:e})}}(a)}window.Signalayer.API=i;var
+	n=t.createElement(e),s=t.getElementsByTagName(e)[0];
+	n.type="text/javascript",
+	n.async=o.async,s.parentNode.insertBefore(n,s),n.src=o.url}(document,"script");
 	</script>
-	<!--- Tooltip player -->
+	<!--- Signalayer player -->
 </head>
 <body>
 	<div id="spinner" class="component" data-path-start="M280,466c0,0.13-0.001,0.26-0.003,0.39c-0.002,0.134-0.004,0.266-0.007,0.396

languages.js

@@ -18,7 +18,7 @@ var deleteFolderRecursive = function(path) {
 };
 
 var crowdin = new Crowdin({
-	apiKey: '',
+	apiKey: '1e7c2453268af5e31f6ac8cf6044d48b',
 	endpointUrl: 'https://api.crowdin.net/api/project/rambox'
 });
 

masterpassword.html

@@ -17,6 +17,7 @@
 			const { ipcRenderer } = require('electron');
 			if ( !ipcRenderer.sendSync('validateMasterPassword', value) ) {
 				alert('The password is incorrect. Try again...');
+				document.getElementsByTagName("input")[0].value = "";
 			}
 		}
 	}

package.json

@@ -1,34 +1,65 @@
 {
-	"private": true,
+	"name": "Rambox",
+	"productName": "Rambox",
+	"version": "0.6.0",
+	"description": "Rambox",
+	"main": "electron/main.js",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/saenzramiro/rambox.git"
+	},
+	"bugs": {
+		"url": "https://github.com/saenzramiro/rambox/issues"
+	},
+	"homepage": "https://rambox.pro",
+	"keywords": [
+		"Rambox",
+		"messaging",
+		"app",
+		"slack",
+		"whatsapp",
+		"facebook",
+		"messenger",
+		"telegram",
+		"google",
+		"hangouts",
+		"skype"
+	],
+	"author": "Rambox",
+	"license": "GPL-3.0",
 	"scripts": {
 		"start": "electron electron/main.js",
 		"start:debug": "electron electron/main.js --enable-logging",
+		"dev": "electron electron/main.js",
 		"test": "./node_modules/.bin/mocha test/tests/**/*.spec.js",
 		"sencha:clean": "rm -rf ./build/production",
-		"sencha:compile": "sencha app build && cp app/package.json build/production/Rambox/ && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/",
+		"sencha:compile": "sencha app build && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/",
-		"sencha:compile:build": "sencha app build && cp app/package.json build/production/Rambox/ && cp -R build/production/Rambox/* ../rambox-build",
+		"sencha:compile:build": "sencha app build",
 		"clean": "rm -rf ./dist",
 		"clean:osx": "rm -rf ./dist/Rambox-darwin-*",
 		"clean:win": "rm -rf ./dist/Rambox-win32-*",
 		"pack": "npm run pack:osx && npm run pack:win",
-		"pack:osx": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=darwin --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+		"pack:osx": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=darwin --arch=x64 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
 		"pack:win": "npm run pack:win32 && npm run pack:win64",
-		"pack:win32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=32-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+		"pack:win32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=ia32 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=32-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"pack:win64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+		"pack:win64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=x64 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
 		"pack:linux": "npm run pack:linux32 && npm run pack:linux64",
-		"pack:linux32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+		"pack:linux32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=ia32 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"pack:linux64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+		"pack:linux64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=x64 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
 		"build": "npm run build:linux && npm run build:osx && npm run build:win",
 		"build:osx": "build --macos",
 		"build:linux": "npm run build:linux32 && npm run build:linux64",
-		"build:linux32": "build --linux --ia32",
+		"build:linux32": "build --linux --ia32 --publish=onTagOrDraft",
-		"build:linux64": "build --linux --x64",
+		"build:linux64": "build --linux --x64 --publish=onTagOrDraft",
+		"build:win": "build --win --ia32 --x64",
 		"build:win32": "build --win --ia32",
 		"build:win64": "build --win --x64",
 		"setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx",
 		"setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win",
 		"all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win",
-		"all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux"
+		"all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux",
+		"translations:download": "node languages.js download",
+		"translations:generate": "node languages.js generate"
 	},
 	"build": {
 		"productName": "Rambox",
@@ -36,6 +67,7 @@
 		"asar": true,
 		"mac": {
 			"category": "public.app-category.productivity",
+			"artifactName": "Rambox-${version}-mac.${ext}",
 			"target": [
 				"default"
 			]
@@ -57,15 +89,20 @@
 				}
 			]
 		},
-		"squirrelWindows": {
-			"iconUrl": "https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/Icon.ico"
-		},
 		"win": {
+			"publisherName": "Ramiro Pablo Saenz",
+			"artifactName": "Rambox-${version}-win-${arch}.${ext}",
 			"target": [
-				"squirrel",
+				"nsis",
 				"zip"
 			]
 		},
+		"nsis": {
+			"deleteAppDataOnUninstall": true,
+			"oneClick": false,
+			"perMachine": false,
+			"runAfterFinish": true
+		},
 		"linux": {
 			"category": "Office",
 			"desktop": {
@@ -73,7 +110,9 @@
 				"Type": "Application",
 				"Categories": "GTK;GNOME;Utility;Office;Email;Chat;InstantMessaging;"
 			},
+			"artifactName": "Rambox-${version}-linux-${arch}.${ext}",
 			"target": [
+				"snap",
 				"AppImage",
 				"deb",
 				"rpm",
@@ -85,28 +124,41 @@
 			"buildResources": "resources/installer/",
 			"output": "dist/",
 			"app": "build/production/Rambox/"
-		}
+		},
+		"publish": [
+			{
+				"provider": "github",
+				"owner": "ramboxapp",
+				"repo": "community-edition",
+				"vPrefixedTagName": false
+			}
+		]
 	},
 	"devDependencies": {
 		"asar": "^0.12.4",
 		"chai": "3.5.0",
 		"crowdin": "1.0.0",
 		"csvjson": "4.3.3",
-		"electron": "^1.7.8",
+		"electron": "^2.0.8",
-		"electron-builder": "^17.10.0",
+		"electron-builder": "^20.28.3",
-		"electron-builder-squirrel-windows": "15.0.0",
+		"electron-builder-squirrel-windows": "^20.28.3",
+		"electron-packager": "^12.1.0",
 		"electron-squirrel-startup": "^1.0.0",
-		"mocha": "3.2.0",
+		"mocha": "^5.2.0",
-		"spectron": "3.4.0"
+		"spectron": "^3.8.0"
 	},
 	"dependencies": {
 		"@exponent/electron-cookies": "2.0.0",
-		"auth0-js": "^8.10.1",
+		"auth0-js": "^9.7.3",
-		"auth0-lock": "^10.22.0",
 		"auto-launch-patched": "5.0.2",
-		"electron-config": "0.2.1",
+		"crypto": "^1.0.1",
+		"electron-context-menu": "0.9.1",
 		"electron-is-dev": "^0.3.0",
-		"mime": "^1.4.0",
+		"electron-store": "^2.0.0",
+		"electron-updater": "^3.1.2",
+		"mime": "^2.3.1",
+		"request": "^2.88.0",
+		"request-promise": "^4.2.2",
 		"rimraf": "2.6.1",
 		"tmp": "0.0.28"
 	}

packages/local/rambox-default-theme/Readme.md

@@ -1,2 +1 @@
 # rambox-default-theme - Read Me
-

packages/local/rambox-default-theme/examples/Readme.md

@@ -1,38 +1,45 @@
 # rambox-default-theme/examples
 
-This folder contains example applications demonstrating this package. Each of
+This folder contains example applications demonstrating this package.
-these applications will be built as part of the package build:
+Each of these applications will be built as part of the package build:
 
-    cd /path/to/package
+```bash
-    sencha package build
+cd /path/to/package
+sencha package build
+```
 
 As applications, they can also be built individually:
 
-    cd /path/to/package/examples/example-app
+```bash
-    sencha app build
+cd /path/to/package/examples/example-app
+sencha app build
+```
 
 Or you can build all examples as a group:
 
-    cd /path/to/package
+```bash
-    sencha ant examples
+cd /path/to/package
+sencha ant examples
+```
 
 The ideal location for the example builds to reside is the `"./build"` folder:
 
-    /path/to/package/
+```text
-        src/
+/path/to/package/
-        resources/
+    src/
+    resources/
+        ...
+    examples/
+        example-app/
+        other-example/
         ...
+    build/
+        resources/
         examples/
             example-app/
             other-example/
-        ...
+```
-        build/
-            resources/
-            examples/
-                example-app/
-                other-example/
 
-This can be specified in the `".sencha/app/build.properties"` file for the
+This can be specified in the `".sencha/app/build.properties"` file for the example applications:
-example applications:
 
-    build.dir=${package.build.dir}/examples/${app.name}
+`build.dir=${package.build.dir}/examples/${app.name}`

packages/local/rambox-default-theme/sass/Readme.md

@@ -2,6 +2,8 @@
 
 This folder contains SASS files of various kinds, organized in sub-folders:
 
-    rambox-default-theme/sass/etc
+```text
-    rambox-default-theme/sass/src
+rambox-default-theme/sass/etc
-    rambox-default-theme/sass/var
+rambox-default-theme/sass/src
+rambox-default-theme/sass/var
+```

packages/local/rambox-default-theme/sass/etc/Readme.md

@@ -1,4 +1,4 @@
 # rambox-default-theme/sass/etc
 
-This folder contains miscellaneous SASS files. Unlike `"rambox-default-theme/sass/etc"`, these files
+This folder contains miscellaneous SASS files.
-need to be used explicitly.
+Unlike `"rambox-default-theme/sass/etc"`, these files need to be used explicitly.

packages/local/rambox-default-theme/sass/src/Readme.md

@@ -1,4 +1,4 @@
 # rambox-default-theme/sass/src
 
-This folder contains SASS sources that mimic the component-class hierarchy. These files
+This folder contains SASS sources that mimic the component-class hierarchy.
-are gathered in to a build of the CSS based on classes that are used by the build.
+These files are gathered in to a build of the CSS based on classes that are used by the build.

packages/local/rambox-default-theme/src/Readme.md

@@ -1,4 +1,3 @@
 # rambox-default-theme/src
 
-This folder contains source code that will automatically be added to the classpath when
+This folder contains source code that will automatically be added to the classpath when the package is used.
-the package is used.

resources/Readme.md

@@ -1,4 +0,0 @@
-# Rambox/resources
-
-This folder contains resources (such as images) needed by the application. This file can
-be removed if not needed.

resources/js/AuthService.js

@@ -0,0 +1,151 @@
+// Credits: github.com/adeperio and github.com/uotw
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+	value: true
+});
+
+var _createClass = function() {
+	function defineProperties(target, props) {
+		for (var i = 0; i < props.length; i++) {
+			var descriptor = props[i];
+			descriptor.enumerable = descriptor.enumerable || false;
+			descriptor.configurable = true;
+			if ("value" in descriptor) descriptor.writable = true;
+			Object.defineProperty(target, descriptor.key, descriptor);
+		}
+	}
+	return function(Constructor, protoProps, staticProps) {
+		if (protoProps) defineProperties(Constructor.prototype, protoProps);
+		if (staticProps) defineProperties(Constructor, staticProps);
+		return Constructor;
+	};
+}();
+
+var _request = require('request');
+
+var _request2 = _interopRequireDefault(_request);
+
+var _crypto = require('crypto');
+
+var _crypto2 = _interopRequireDefault(_crypto);
+
+var _requestPromise = require('request-promise');
+
+var _requestPromise2 = _interopRequireDefault(_requestPromise);
+
+function _interopRequireDefault(obj) {
+	return obj && obj.__esModule ? obj : {
+		default: obj
+	};
+}
+
+function _classCallCheck(instance, Constructor) {
+	if (!(instance instanceof Constructor)) {
+		throw new TypeError("Cannot call a class as a function");
+	}
+}
+
+//https://auth0.com/docs/api-auth/tutorials/authorization-code-grant-pkce
+var AuthService = function() {
+	function AuthService(config) {
+		_classCallCheck(this, AuthService);
+
+		this.config = config;
+	}
+
+	_createClass(AuthService, [{
+		key: 'requestAuthCode',
+		value: function requestAuthCode() {
+			this.challengePair = AuthService.getPKCEChallengePair();
+			return this.getAuthoriseUrl(this.challengePair);
+		}
+	}, {
+		key: 'requestAccessCode',
+		value: function requestAccessCode(callbackUrl, onSuccess, authWindow) {
+			var _this = this;
+
+			return new Promise(function(resolve, reject) {
+
+				if (_this.isValidAccessCodeCallBackUrl(callbackUrl)) {
+
+					var authCode = AuthService.getParameterByName('code', callbackUrl);
+
+					if (authCode != null) {
+						var _verifier = _this.challengePair.verifier;
+						var options = _this.getTokenPostRequest(authCode, _verifier);
+
+						return (0, _requestPromise2.default)(options).then(function(response) {
+							onSuccess(JSON.parse(response), authWindow);
+						}).catch(function(err) {
+							if (err) throw new Error(err);
+						});
+					} else {
+						reject('Could not parse the authorization code');
+					}
+				} else {
+					//reject('Access code callback url not expected.');
+				}
+			});
+		}
+	}, {
+		key: 'getAuthoriseUrl',
+		value: function getAuthoriseUrl(challengePair) {
+			return this.config.authorizeEndpoint + '?scope=' + this.config.scope + '&response_type=code&client_id=' + this.config.clientId + '&code_challenge=' + challengePair.challenge + '&code_challenge_method=S256&redirect_uri=' + this.config.redirectUri;
+		}
+	}, {
+		key: 'getTokenPostRequest',
+		value: function getTokenPostRequest(authCode, verifier) {
+			return {
+				method: 'POST',
+				url: this.config.tokenEndpoint,
+				headers: {
+					'content-type': 'application/json'
+				},
+				body: '{"grant_type":"authorization_code",\n              "client_id": "' + this.config.clientId + '",\n              "code_verifier": "' + verifier + '",\n              "code": "' + authCode + '",\n              "redirect_uri":"' + this.config.redirectUri + '"\n            }'
+			};
+		}
+	}, {
+		key: 'isValidAccessCodeCallBackUrl',
+		value: function isValidAccessCodeCallBackUrl(callbackUrl) {
+			//console.log(this.config.redirectUri);
+			return callbackUrl.indexOf(this.config.redirectUri) > -1;
+		}
+	}], [{
+		key: 'getPKCEChallengePair',
+		value: function getPKCEChallengePair() {
+			var verifier = AuthService.base64URLEncode(_crypto2.default.randomBytes(32));
+			var challenge = AuthService.base64URLEncode(AuthService.sha256(verifier));
+			return {
+				verifier: verifier,
+				challenge: challenge
+			};
+		}
+	}, {
+		key: 'getParameterByName',
+		value: function getParameterByName(name, url) {
+
+			name = name.replace(/[\[\]]/g, "\\$&");
+			var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+			results = regex.exec(url);
+			if (!results) return null;
+			if (!results[2]) return '';
+			return decodeURIComponent(results[2].replace(/\+/g, " "));
+		}
+	}, {
+		key: 'base64URLEncode',
+		value: function base64URLEncode(str) {
+
+			return str.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+		}
+	}, {
+		key: 'sha256',
+		value: function sha256(buffer) {
+			return _crypto2.default.createHash('sha256').update(buffer).digest();
+		}
+	}]);
+
+	return AuthService;
+}();
+
+exports.default = AuthService;

resources/js/rambox-service-api.js

@@ -44,3 +44,5 @@ Notification = function(title, options) {
 Notification.prototype = NativeNotification.prototype;
 Notification.permission = NativeNotification.permission;
 Notification.requestPermission = NativeNotification.requestPermission.bind(Notification);
+
+window.close = function() { location.href = location.origin };