](https://translate.riot.im/engage/riot-web/?utm_source=widget)
+
+
+Head to the [translating doc](docs/translating.md)
+
+Adding Strings to the translations (Developer Guide)
+====================================================
+
+Head to the [translating dev doc](docs/translating-dev.md)
+
Triaging issues
===============
@@ -292,7 +314,7 @@ bug or feature:
* feature
bug severity:
-
+
* cosmetic - feature works functionally but UI/UX is broken
* critical - whole app doesn't work
* major - entire feature doesn't work
diff --git a/config.sample.json b/config.sample.json
index a65646ac..7f2c97f9 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -4,11 +4,16 @@
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
- "bug_report_endpoint_url": "https://vector.im/bugs",
+ "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true,
"roomDirectory": {
"servers": [
"matrix.org"
]
+ },
+ "welcomeUserId": "@riot-bot:matrix.org",
+ "piwik": {
+ "url": "https://piwik.riot.im/",
+ "siteId": 1
}
}
diff --git a/docs/translating-dev.md b/docs/translating-dev.md
new file mode 100644
index 00000000..55ba34be
--- /dev/null
+++ b/docs/translating-dev.md
@@ -0,0 +1,26 @@
+# How to translate riot-web (Dev Guide)
+
+## Requirements
+
+- A working [Development Setup](../../#setting-up-a-dev-environment)
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Adding new strings
+
+1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements.
+2. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method)
+3. Add the String to the ``en_EN.json`` file in ``src/i18n/strings`` (respect which repository you are on).
+
+## Adding variables inside a string.
+
+1. Extend your ``_t()`` call. Instead of ``_t(STRING)`` use ``_t(STRING, {})``
+2. Decide how to name it. Please think about if the person who has to translate it can understand what it does.
+3. Add it to the array in ``_t`` for example ``_t(STRING, {variable: this.variable})``
+4. Add the variable inside the string. The syntax for variables is ``%(variable)s``. Please note the s at the end. The name of the variable has to match the previous used name.
+
+## Things to know/Style Guides
+
+- Do not use it inside ``getDefaultProps`` at the point where ``getDefaultProps`` is initialized the translations aren't loaded yet and it causes missing translations.
+- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded.
+- If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.
diff --git a/docs/translating.md b/docs/translating.md
new file mode 100644
index 00000000..3fd0731d
--- /dev/null
+++ b/docs/translating.md
@@ -0,0 +1,64 @@
+# How to translate riot-web
+
+## Requirements
+
+- Web Browser
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Step 0: Join #riotweb-translations:matrix.org
+
+1. Come and join https://matrix.to/#/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
+
+## Step 1: Preparing your Weblate Profile
+
+1. Head to https://translate.riot.im and register either via Github or email
+2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
+3. Log into weblate
+4. Head to https://translate.riot.im/accounts/profile/ and select the languages you know and maybe another language you know too.
+6. Head to https://translate.riot.im/accounts/profile/#subscriptions and select Riot Web as Project
+
+## How to check if your language already is being translated
+
+Go to https://translate.riot.im/projects/riot-web/ and visit the 2 sub-projects.
+If your language is listed go to Step 2a and if not go to Step 2b
+
+## Step 2a: Helping on existing languages.
+
+1. Head to one of the projects listed https://translate.riot.im/projects/riot-web/
+2. Click on the ``translate`` button on the right side of your language
+3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
+
+Head to the explanations under Steb 2b
+
+## Step 2b: Adding a new language
+
+1. Go to one of the projects listed https://translate.riot.im/projects/riot-web/
+2. Click the ``Start new language`` button at the bottom
+3. Select a language
+4. Start translating like in 2a.3
+5. Repeat these steps for the other projects which are listed at the link of step 2b.1
+
+### What means the green button under the text field?
+
+The green button let you save our translations directly. Please only use it if you are 100% sure about that translation. If you do not know a translation please DO NOT click that button. Use the arrows above the translations field and click to the right.
+
+### What means the yellow button under the text field?
+
+The yellow button has to be used if you are unsure about the translation but you have a rough idea. It adds a new suggestion to the string which can than be reviewed by others.
+
+### What are "%(something)s"?
+
+These things are variables that are expanded when displayed by Riot. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.
+
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `
+
diff --git a/res/home/images/logo.svg b/res/home/images/logo.svg
new file mode 100644
index 00000000..a5f70e5e
--- /dev/null
+++ b/res/home/images/logo.svg
@@ -0,0 +1,76 @@
+
+
+
diff --git a/res/home/images/matrix.svg b/res/home/images/matrix.svg
new file mode 100644
index 00000000..5c7dfbb5
--- /dev/null
+++ b/res/home/images/matrix.svg
@@ -0,0 +1,153 @@
+
+
+
+
diff --git a/res/home/rooms/bridging.png b/res/home/rooms/bridging.png
new file mode 100644
index 00000000..6b3a55e7
Binary files /dev/null and b/res/home/rooms/bridging.png differ
diff --git a/res/home/rooms/dendrite-dev.png b/res/home/rooms/dendrite-dev.png
new file mode 100644
index 00000000..1d96bd84
Binary files /dev/null and b/res/home/rooms/dendrite-dev.png differ
diff --git a/res/home/rooms/dendrite.png b/res/home/rooms/dendrite.png
new file mode 100644
index 00000000..1d96bd84
Binary files /dev/null and b/res/home/rooms/dendrite.png differ
diff --git a/res/home/rooms/e2e.png b/res/home/rooms/e2e.png
new file mode 100644
index 00000000..a2bda4bc
Binary files /dev/null and b/res/home/rooms/e2e.png differ
diff --git a/res/home/rooms/homeowners.png b/res/home/rooms/homeowners.png
new file mode 100644
index 00000000..ed45f11c
Binary files /dev/null and b/res/home/rooms/homeowners.png differ
diff --git a/res/home/rooms/identity.jpg b/res/home/rooms/identity.jpg
new file mode 100644
index 00000000..f2e15056
Binary files /dev/null and b/res/home/rooms/identity.jpg differ
diff --git a/res/home/rooms/identity.png b/res/home/rooms/identity.png
new file mode 100644
index 00000000..de1ea60d
Binary files /dev/null and b/res/home/rooms/identity.png differ
diff --git a/res/home/rooms/irc.png b/res/home/rooms/irc.png
new file mode 100644
index 00000000..5f611d12
Binary files /dev/null and b/res/home/rooms/irc.png differ
diff --git a/res/home/rooms/matrix-dev.png b/res/home/rooms/matrix-dev.png
new file mode 100644
index 00000000..fa54f00c
Binary files /dev/null and b/res/home/rooms/matrix-dev.png differ
diff --git a/res/home/rooms/matrix.png b/res/home/rooms/matrix.png
new file mode 100644
index 00000000..fa54f00c
Binary files /dev/null and b/res/home/rooms/matrix.png differ
diff --git a/res/home/rooms/riot-android.png b/res/home/rooms/riot-android.png
new file mode 100644
index 00000000..fa2bec8e
Binary files /dev/null and b/res/home/rooms/riot-android.png differ
diff --git a/res/home/rooms/riot-bot.png b/res/home/rooms/riot-bot.png
new file mode 100644
index 00000000..9efd4a3c
Binary files /dev/null and b/res/home/rooms/riot-bot.png differ
diff --git a/res/home/rooms/riot-dev.png b/res/home/rooms/riot-dev.png
new file mode 100644
index 00000000..ff8b21ad
Binary files /dev/null and b/res/home/rooms/riot-dev.png differ
diff --git a/res/home/rooms/riot-ios.png b/res/home/rooms/riot-ios.png
new file mode 100644
index 00000000..83306f7c
Binary files /dev/null and b/res/home/rooms/riot-ios.png differ
diff --git a/res/home/rooms/riot-translations.png b/res/home/rooms/riot-translations.png
new file mode 100644
index 00000000..ee0f8558
Binary files /dev/null and b/res/home/rooms/riot-translations.png differ
diff --git a/res/home/rooms/riot.png b/res/home/rooms/riot.png
new file mode 100644
index 00000000..4daa2e4e
Binary files /dev/null and b/res/home/rooms/riot.png differ
diff --git a/res/home/rooms/synapse.png b/res/home/rooms/synapse.png
new file mode 100644
index 00000000..ee0f8558
Binary files /dev/null and b/res/home/rooms/synapse.png differ
diff --git a/res/home/rooms/vr.png b/res/home/rooms/vr.png
new file mode 100644
index 00000000..98b77802
Binary files /dev/null and b/res/home/rooms/vr.png differ
diff --git a/res/home/rooms/webrtc.png b/res/home/rooms/webrtc.png
new file mode 100644
index 00000000..98b790f9
Binary files /dev/null and b/res/home/rooms/webrtc.png differ
diff --git a/res/manifest.json b/res/manifest.json
new file mode 100644
index 00000000..75b18212
--- /dev/null
+++ b/res/manifest.json
@@ -0,0 +1,56 @@
+{
+ "name": "Riot - open team collaboration",
+ "short_name": "Riot",
+ "display": "standalone",
+ "theme_color": "#76CFA6",
+ "start_url": "index.html",
+ "icons": [
+ {
+ "src": "vector-icons/android-chrome-36x36.png",
+ "sizes": "36x36",
+ "type": "image\/png",
+ "density": "0.75"
+ },
+ {
+ "src": "vector-icons/android-chrome-48x48.png",
+ "sizes": "48x48",
+ "type": "image\/png",
+ "density": "1.0"
+ },
+ {
+ "src": "vector-icons/android-chrome-72x72.png",
+ "sizes": "72x72",
+ "type": "image\/png",
+ "density": "1.5"
+ },
+ {
+ "src": "vector-icons/android-chrome-96x96.png",
+ "sizes": "96x96",
+ "type": "image\/png",
+ "density": "2.0"
+ },
+ {
+ "src": "vector-icons/android-chrome-144x144.png",
+ "sizes": "144x144",
+ "type": "image\/png",
+ "density": "3.0"
+ },
+ {
+ "src": "vector-icons/android-chrome-192x192.png",
+ "sizes": "192x192",
+ "type": "image\/png",
+ "density": "4.0"
+ }
+ ],
+ "related_applications": [
+ {
+ "platform": "play",
+ "url": "https://play.google.com/store/apps/details?id=im.vector.alpha",
+ "id": "im.vector.alpha"
+ },
+ {
+ "platform": "itunes",
+ "url": "https://itunes.apple.com/gb/app/riot-open-source-team-collaboration-via-matrix/id1083446067"
+ }
+ ]
+}
diff --git a/res/vector-icons/manifest.json b/res/vector-icons/manifest.json
deleted file mode 100644
index feab1753..00000000
--- a/res/vector-icons/manifest.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "Riot",
- "icons": [
- {
- "src": "android-chrome-36x36.png",
- "sizes": "36x36",
- "type": "image\/png",
- "density": "0.75"
- },
- {
- "src": "android-chrome-48x48.png",
- "sizes": "48x48",
- "type": "image\/png",
- "density": "1.0"
- },
- {
- "src": "android-chrome-72x72.png",
- "sizes": "72x72",
- "type": "image\/png",
- "density": "1.5"
- },
- {
- "src": "android-chrome-96x96.png",
- "sizes": "96x96",
- "type": "image\/png",
- "density": "2.0"
- },
- {
- "src": "android-chrome-144x144.png",
- "sizes": "144x144",
- "type": "image\/png",
- "density": "3.0"
- },
- {
- "src": "android-chrome-192x192.png",
- "sizes": "192x192",
- "type": "image\/png",
- "density": "4.0"
- }
- ]
-}
diff --git a/scripts/babelcheck.js b/scripts/babelcheck.js
deleted file mode 100644
index 89f5cac5..00000000
--- a/scripts/babelcheck.js
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-
-var exec = require('child_process').exec;
-
-// Makes sure the babel executable in the path is babel 6 (or greater), not
-// babel 5, which it is if you upgrade from an older version of react-sdk and
-// run 'npm install' since the package has changed to babel-cli, so 'babel'
-// remains installed and the executable in node_modules/.bin remains as babel
-// 5.
-
-// This script is duplicated from matrix-react-sdk because it can't reliably
-// be pulled in from react-sdk while npm install is failing, as it will do
-// if the environment is in the erroneous state this script checks for.
-
-exec("babel -V", function (error, stdout, stderr) {
- if ((error && error.code) || parseInt(stdout.substr(0,1), 10) < 6) {
- console.log("\033[31m\033[1m"+
- '*****************************************\n'+
- '* vector-web has moved to babel 6 *\n'+
- '* Please "rm -rf node_modules && npm i" *\n'+
- '* then restore links as appropriate *\n'+
- '*****************************************\n'+
- "\033[91m");
- process.exit(1);
- }
-});
diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
new file mode 120000
index 00000000..7d74c7a4
--- /dev/null
+++ b/scripts/check-i18n.pl
@@ -0,0 +1 @@
+../../matrix-react-sdk/scripts/check-i18n.pl
\ No newline at end of file
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 826d9a96..b02946ae 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -3,19 +3,55 @@
// copies the resources into the webapp directory.
//
+// Languages are listed manually so we can choose when to include
+// a translation in the app (because having a translation with only
+// 3 strings translated is just frustrating)
+// This could readily be automated, but it's nice to explicitly
+// control when we languages are available.
+const INCLUDE_LANGS = [
+ {'value': 'en_EN', 'label': 'English'},
+ {'value': 'en_US', 'label': 'English (US)'},
+ {'value': 'da', 'label': 'Dansk'},
+ {'value': 'el', 'label': 'Ελληνικά'},
+ {'value': 'nl', 'label': 'Nederlands'},
+ {'value': 'de_DE', 'label': 'Deutsch'},
+ {'value': 'fr', 'label': 'Français'},
+ {'value': 'pt', 'label': 'Português'},
+ {'value': 'pt_BR', 'label': 'Português do Brasil'},
+ {'value': 'ru', 'label': 'Русский'},
+ {'value': 'sv', 'label': 'Svenska'},
+ {'value': 'es', 'label': 'Español'},
+ {'value': 'th', 'label': 'ไทย'},
+ {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
+ {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
+];
+
// cpx includes globbed parts of the filename in the destination, but excludes
// common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
// "dest/b/...".
const COPY_LIST = [
+ ["res/manifest.json", "webapp"],
+ ["res/home.html", "webapp"],
+ ["res/home/**", "webapp/home"],
["res/{media,vector-icons}/**", "webapp"],
+ ["res/flags/*", "webapp/flags/"],
["src/skins/vector/{fonts,img}/**", "webapp"],
["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
- ["./config.json", "webapp", {directwatch: 1}],
+ ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
+ ["./config.json", "webapp", { directwatch: 1 }],
];
+INCLUDE_LANGS.forEach(function(l) {
+ COPY_LIST.push([
+ l.value, "webapp/i18n/", { lang: 1 },
+ ]);
+});
+
const parseArgs = require('minimist');
const Cpx = require('cpx');
const chokidar = require('chokidar');
+const fs = require('fs');
+const rimraf = require('rimraf');
const argv = parseArgs(
process.argv.slice(2), {}
@@ -31,6 +67,15 @@ function errCheck(err) {
}
}
+// Check if webapp exists
+if (!fs.existsSync('webapp')) {
+ fs.mkdirSync('webapp');
+}
+// Check if i18n exists
+if (!fs.existsSync('webapp/i18n/')) {
+ fs.mkdirSync('webapp/i18n/');
+}
+
function next(i, err) {
errCheck(err);
@@ -42,10 +87,13 @@ function next(i, err) {
const source = ent[0];
const dest = ent[1];
const opts = ent[2] || {};
+ let cpx = undefined;
- const cpx = new Cpx.Cpx(source, dest);
+ if (!opts.lang) {
+ cpx = new Cpx.Cpx(source, dest);
+ }
- if (verbose) {
+ if (verbose && cpx) {
cpx.on("copy", (event) => {
console.log(`Copied: ${event.srcPath} --> ${event.dstPath}`);
});
@@ -54,7 +102,7 @@ function next(i, err) {
});
}
- const cb = (err) => {next(i+1, err)};
+ const cb = (err) => { next(i + 1, err) };
if (watch) {
if (opts.directwatch) {
@@ -62,20 +110,79 @@ function next(i, err) {
// which in the case of config.json is '.', which inevitably takes
// ages to crawl. So we create our own watcher on the files
// instead.
- const copy = () => {cpx.copy(errCheck)};
+ const copy = () => { cpx.copy(errCheck) };
chokidar.watch(source)
.on('add', copy)
.on('change', copy)
.on('ready', cb)
.on('error', errCheck);
+ } else if (opts.lang) {
+ const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + source + '.json';
+ const riotWebFile = 'src/i18n/strings/' + source + '.json';
+
+ const translations = {};
+ const makeLang = () => { genLangFile(source, dest) };
+ [reactSdkFile, riotWebFile].forEach(function(f) {
+ chokidar.watch(f)
+ .on('add', makeLang)
+ .on('change', makeLang)
+ //.on('ready', cb) We'd have to do this when both files are ready
+ .on('error', errCheck);
+ });
+ next(i + 1, err);
} else {
cpx.on('watch-ready', cb);
cpx.on("watch-error", cb);
cpx.watch();
}
+ } else if (opts.lang) {
+ genLangFile(source, dest);
+ next(i + 1, err);
} else {
cpx.copy(cb);
}
}
+function genLangFile(lang, dest) {
+ const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+ const riotWebFile = 'src/i18n/strings/' + lang + '.json';
+
+ const translations = {};
+ [reactSdkFile, riotWebFile].forEach(function(f) {
+ if (fs.existsSync(f)) {
+ Object.assign(
+ translations,
+ JSON.parse(fs.readFileSync(f).toString())
+ );
+ }
+ });
+ fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4));
+ if (verbose) {
+ console.log("Generated language file: " + lang);
+ }
+}
+
+function genLangList() {
+ const languages = {};
+ INCLUDE_LANGS.forEach(function(lang) {
+ const normalizedLanguage = lang.value.toLowerCase().replace("_", "-");
+ const languageParts = normalizedLanguage.split('-');
+ if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
+ languages[languageParts[0]] = {'fileName': lang.value + '.json', 'label': lang.label};
+ } else {
+ languages[normalizedLanguage] = {'fileName': lang.value + '.json', 'label': lang.label};
+ }
+ });
+ fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4), function(err) {
+ if (err) {
+ console.error("Copy Error occured: " + err);
+ throw new Error("Failed to generate languages.json");
+ }
+ });
+ if (verbose) {
+ console.log("Generated languages.json");
+ }
+}
+
+genLangList();
next(0);
diff --git a/scripts/electron-package.sh b/scripts/electron-package.sh
index 87e353f7..973ea45e 100755
--- a/scripts/electron-package.sh
+++ b/scripts/electron-package.sh
@@ -63,7 +63,7 @@ fi
if [ ! -f package.json ]; then
echo "No package.json found. This script must be run from"
- echo "the vector-web directory."
+ echo "the riot-web directory."
exit
fi
@@ -90,8 +90,8 @@ npm run build:electron
popd
-distdir="$builddir/electron/dist"
-pubdir="$projdir/electron/pub"
+distdir="$builddir/electron_app/dist"
+pubdir="$projdir/electron_app/pub"
rm -r "$pubdir" || true
mkdir -p "$pubdir"
@@ -120,11 +120,11 @@ cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/"
cp $distdir/win/RELEASES "$pubdir/update/win32/x64/"
# Move the debs to the main project dir's dist folder
-rm -r "$projdir/electron/dist" || true
-mkdir -p "$projdir/electron/dist"
-cp $distdir/*.deb "$projdir/electron/dist/"
+rm -r "$projdir/electron_app/dist" || true
+mkdir -p "$projdir/electron_app/dist"
+cp $distdir/*.deb "$projdir/electron_app/dist/"
rm -rf "$builddir"
echo "Riot Desktop is ready to go in $pubdir: this directory can be hosted on your web server."
-echo "deb archives are in electron/dist/ - these should be added into your debian repository"
+echo "deb archives are in electron_app/dist/ - these should be added into your debian repository"
diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
new file mode 100755
index 00000000..4fa1a4a2
--- /dev/null
+++ b/scripts/fetch-develop.deps.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Fetches the js-sdk and matrix-react-sdk dependencies for development
+# or testing purposes
+# If there exists a branch of that dependency with the same name as
+# the branch the current checkout is on, use that branch. Otherwise,
+# use develop.
+
+set -e
+
+GIT_CLONE_ARGS=("$@")
+
+# Look in the many different CI env vars for which branch we're
+# building
+if [[ "$TRAVIS" == true ]]; then
+ curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+else
+ # ghprbSourceBranch for jenkins github pull request builder
+ # GIT_BRANCH for other jenkins builds
+ curbranch="${ghprbSourceBranch:-$GIT_BRANCH}"
+ # Otherwise look at the actual branch we're on
+ if [ -z "$curbranch" ]
+ then
+ curbranch=`git rev-parse --abbrev-ref HEAD`
+ fi
+fi
+
+# Chop 'origin' off the start as jenkins ends up using
+# branches on the origin, but this doesn't work if we
+# specify the branch when cloning.
+curbranch=${curbranch#origin/}
+
+echo "Determined branch to be $curbranch"
+
+# clone a specific branch of a github repo
+function clone() {
+ org=$1
+ repo=$2
+ branch=$3
+ git clone https://github.com/$org/$repo.git $repo --branch $branch \
+ "${GIT_CLONE_ARGS[@]}"
+}
+
+function dodep() {
+ org=$1
+ repo=$2
+ rm -rf $repo
+ clone $org $repo $curbranch || {
+ [ "$curbranch" != 'develop' ] && clone $org $repo develop
+ } || return $?
+
+ (
+ cd $repo
+ echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD`
+ )
+
+ mkdir -p node_modules
+ rm -r "node_modules/$repo" 2>/dev/null || true
+ ln -sv "../$repo" node_modules/
+}
+
+echo -en 'travis_fold:start:matrix-js-sdk\r'
+echo 'Setting up matrix-js-sdk'
+
+dodep matrix-org matrix-js-sdk
+(
+ cd node_modules/matrix-js-sdk
+ npm install
+)
+
+echo -en 'travis_fold:end:matrix-js-sdk\r'
+
+echo -en 'travis_fold:start:matrix-react-sdk\r'
+echo 'Setting up matrix-react-sdk'
+
+dodep matrix-org matrix-react-sdk
+
+mkdir -p node_modules/matrix-react-sdk/node_modules
+ln -s ../../matrix-js-sdk node_modules/matrix-react-sdk/node_modules/
+
+(
+ cd node_modules/matrix-react-sdk
+ npm install
+)
+
+echo -en 'travis_fold:end:matrix-react-sdk\r'
+
+# Link the reskindex binary in place: if we used npm link,
+# npm would do this for us, but we don't because we'd have
+# to define the npm prefix somewhere so it could put the
+# intermediate symlinks there. Instead, we do it ourselves.
+mkdir -p node_modules/.bin
+ln -sfv ../matrix-react-sdk/scripts/reskindex.js node_modules/.bin/reskindex
diff --git a/scripts/genflags.sh b/scripts/genflags.sh
new file mode 100755
index 00000000..d960c6de
--- /dev/null
+++ b/scripts/genflags.sh
@@ -0,0 +1,70 @@
+# Copyright 2017 Vector Creations Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# genflags.sh - Generates pngs for use with CountryDropdown.js
+#
+# Dependencies:
+# - imagemagick --with-rsvg (because default imagemagick SVG
+# renderer does not produce accurate results)
+#
+# on macOS, this is most easily done with:
+# brew install imagemagick --with-librsvg
+#
+# This will clone the googlei18n flag repo before converting
+# all phonenumber.js-supported country flags (as SVGs) into
+# PNGs that can be used by CountryDropdown.js.
+
+# Allow CTRL+C to terminate the script
+trap "echo Exited!; exit;" SIGINT SIGTERM
+
+# git clone the google repo to get flag SVGs
+git clone git@github.com:googlei18n/region-flags
+for f in region-flags/svg/*.svg; do
+ # Skip state flags
+ if [[ $f =~ [A-Z]{2}-[A-Z]{2,3}.svg ]] ; then
+ echo "Skipping state flag "$f
+ continue
+ fi
+
+ # Skip countries not included in phonenumber.js
+ if [[ $f =~ (AC|CP|DG|EA|EU|IC|TA|UM|UN|XK).svg ]] ; then
+ echo "Skipping non-phonenumber supported flag "$f
+ continue
+ fi
+
+ # Run imagemagick convert
+ # -background none : transparent background
+ # -resize 50x30 : resize the flag to have a height of 15px (2x)
+ # By default, aspect ratio is respected so the width will
+ # be correct and not necessarily 25px.
+ # -filter Lanczos : use sharper resampling to avoid muddiness
+ # -gravity Center : keep the image central when adding an -extent
+ # -border 1 : add a 1px border around the flag
+ # -bordercolor : set the border colour
+ # -extent 54x54 : surround the image with padding so that it
+ # has the dimensions 27x27px (2x).
+ convert $f -background none -filter Lanczos -resize 50x30 \
+ -gravity Center -border 1 -bordercolor \#e0e0e0 \
+ -extent 54x54 $f.png
+
+ # $f.png will be region-flags/svg/XX.svg.png at this point
+
+ # Extract filename from path $f
+ newname=${f##*/}
+ # Replace .svg with .png
+ newname=${newname%.svg}.png
+ # Move the file to flags directory
+ mv $f.png ../res/flags/$newname
+ echo "Generated res/flags/"$newname
+done
diff --git a/scripts/issues-burndown.pl b/scripts/issues-burndown.pl
old mode 100644
new mode 100755
index 7d0f3409..03af5ed7
--- a/scripts/issues-burndown.pl
+++ b/scripts/issues-burndown.pl
@@ -4,16 +4,24 @@ use warnings;
use strict;
use Net::GitHub;
-use DateTime;
-use DateTime::Format::ISO8601;
+use Time::Moment;
+use Term::ReadPassword;
+
+# This version of the script emits the cumulative number of bugs, split into open & closed
+# suitable for drawing the 'top' and 'bottom' of a burndown graph.
+#
+# N.B. this doesn't take into account issues changing priority over time, but only their most recent priority.
+#
+# If you want instead the number of open issues on a given day, then look at issues-no-state.pl
my $gh = Net::GitHub->new(
- login => 'ara4n', pass => 'secret'
+ login => 'ara4n', pass => read_password("github password: "),
);
-$gh->set_default_user_repo('vector-im', 'vector-web');
+$gh->set_default_user_repo('vector-im', 'riot-web');
-my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
+#my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
+my @issues = $gh->issue->repos_issues({ state => 'all' });
while ($gh->issue->has_next_page) {
push @issues, $gh->issue->next_page;
}
@@ -30,11 +38,11 @@ while ($gh->issue->has_next_page) {
my $days = {};
my $schema = {};
-my $now = DateTime->now();
+my $now = Time::Moment->now;
foreach my $issue (@issues) {
next if ($issue->{pull_request});
-
+
# use Data::Dumper;
# print STDERR Dumper($issue);
@@ -56,10 +64,10 @@ foreach my $issue (@issues) {
my $priority = &$extract_labels(qw(p1 p2 p3 p4 p5)) || "unprioritised";
my $severity = &$extract_labels(qw(minor major critical cosmetic network)) || "no-severity";
- my $start = DateTime::Format::ISO8601->parse_datetime($issue->{created_at});
+ my $start = Time::Moment->from_string($issue->{created_at});
do {
- my $ymd = $start->ymd();
+ my $ymd = $start->strftime('%F');
$days->{ $ymd }->{ 'created' }->{ $type }->{ $priority }->{ $severity }->{ total }++;
$schema->{ 'created' }->{ $type }->{ $priority }->{ $severity }->{ total }++;
@@ -68,13 +76,14 @@ foreach my $issue (@issues) {
$schema->{ 'created' }->{ $type }->{ $priority }->{ $severity }->{ $_ }++;
}
- $start = $start->add(days => 1);
- } while (DateTime->compare($start, $now) < 0);
+ $start = $start->plus_days(1);
+ # print STDERR "^";
+ } while ($start->compare($now) < 0);
if ($state eq 'closed') {
- my $end = DateTime::Format::ISO8601->parse_datetime($issue->{closed_at});
+ my $end = Time::Moment->from_string($issue->{closed_at});
do {
- my $ymd = $end->ymd();
+ my $ymd = $end->strftime('%F');
$days->{ $ymd }->{ 'resolved' }->{ $type }->{ $priority }->{ $severity }->{ total }++;
$schema->{ 'resolved' }->{ $type }->{ $priority }->{ $severity }->{ total }++;
@@ -83,9 +92,12 @@ foreach my $issue (@issues) {
$schema->{ 'resolved' }->{ $type }->{ $priority }->{ $severity }->{ $_ }++;
}
- $end = $end->add(days => 1);
- } while (DateTime->compare($end, $now) < 0);
+ $end = $end->plus_days(1);
+ } while ($end->compare($now) < 0);
+ # print STDERR "v";
}
+
+ # print STDERR "\n";
}
print "day,";
diff --git a/scripts/issues-no-state.pl b/scripts/issues-no-state.pl
index da12fb22..748809c5 100755
--- a/scripts/issues-no-state.pl
+++ b/scripts/issues-no-state.pl
@@ -6,14 +6,22 @@ use strict;
use Net::GitHub;
use DateTime;
use DateTime::Format::ISO8601;
+use Term::ReadPassword;
+
+# This version of the script emits the total number of bugs open on a given day,
+# split by various tags.
+#
+# If you want instead the cumulative number of open & closed issues on a given day,
+# then look at issues-burndown.pl
my $gh = Net::GitHub->new(
- login => 'ara4n', pass => 'secret'
+ login => 'ara4n', pass => read_password("github password: "),
);
-$gh->set_default_user_repo('vector-im', 'vector-web');
+$gh->set_default_user_repo('vector-im', 'riot-web');
-my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
+#my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
+my @issues = $gh->issue->repos_issues({ state => 'all' });
while ($gh->issue->has_next_page) {
push @issues, $gh->issue->next_page;
}
@@ -34,7 +42,7 @@ my $now = DateTime->now();
foreach my $issue (@issues) {
next if ($issue->{pull_request});
-
+
use Data::Dumper;
print STDERR Dumper($issue);
diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh
index 0d441cdd..4f2e9405 100755
--- a/scripts/jenkins.sh
+++ b/scripts/jenkins.sh
@@ -8,10 +8,13 @@ nvm use 6
set -x
+# check out corresponding branches of dependencies
+`dirname $0`/fetch-develop.deps.sh
+
npm install
# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
-npm install matrix-react-sdk matrix-js-sdk olm
+npm install olm
# install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
# from our package.json (or even matrix-js-sdk's) in preference.
@@ -23,24 +26,17 @@ npm install matrix-react-sdk matrix-js-sdk olm
#rm -r node_modules/olm
#cp -r olm/package node_modules/olm
-
-# we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
-(cd node_modules/matrix-js-sdk && npm install)
-(cd node_modules/matrix-react-sdk && npm install)
-
# run the mocha tests
npm run test
# run eslint
npm run lintall -- -f checkstyle -o eslint.xml || true
-rm dist/vector-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
+rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
- # node_modules deps from 'npm install' don't have a .git dir so can't
- # rev-parse; but they do set the commit in package.json under 'gitHead' which
- # we're grabbing here.
-REACT_SHA=$(grep 'gitHead' node_modules/matrix-react-sdk/package.json | cut -d \" -f 4 | head -c 12)
-JSSDK_SHA=$(grep 'gitHead' node_modules/matrix-js-sdk/package.json | cut -d \" -f 4 | head -c 12)
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
diff --git a/scripts/make-icons.sh b/scripts/make-icons.sh
index c77064ab..19e48895 100755
--- a/scripts/make-icons.sh
+++ b/scripts/make-icons.sh
@@ -52,7 +52,7 @@ cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png"
cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png"
cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png"
cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png"
-iconutil -c icns -o electron/build/icon.icns "$tmpdir/Riot.iconset"
+iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png"
cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png"
@@ -79,15 +79,17 @@ cp "$tmpdir/144.png" "res/vector-icons/mstile-144x144.png"
cp "$tmpdir/150.png" "res/vector-icons/mstile-150x150.png"
cp "$tmpdir/310.png" "res/vector-icons/mstile-310x310.png"
cp "$tmpdir/310x150.png" "res/vector-icons/mstile-310x150.png"
+cp "$tmpdir/180.png" "electron_app/img/riot.png"
convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png" "$tmpdir/256.png" "res/vector-icons/favicon.ico"
-cp "res/vector-icons/favicon.ico" "electron/build/icon.ico"
+cp "res/vector-icons/favicon.ico" "electron_app/build/icon.ico"
+cp "res/vector-icons/favicon.ico" "electron_app/img/riot.ico"
# https://github.com/electron-userland/electron-builder/blob/3f97b86993d4ea5172e562b182230a194de0f621/src/targets/LinuxTargetHelper.ts#L127
for i in 24 96 16 48 64 128 256 512
do
- cp "$tmpdir/$i.png" "electron/build/icons/${i}x${i}.png"
+ cp "$tmpdir/$i.png" "electron_app/build/icons/${i}x${i}.png"
done
rm -r "$tmpdir"
diff --git a/scripts/package.sh b/scripts/package.sh
index 5c1fdd5e..23d0925b 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
set -e
@@ -21,10 +21,17 @@ npm run build$dev
cp config.sample.json webapp/
mkdir -p dist
-cp -r webapp vector-$version
-echo $version > vector-$version/version
-tar chvzf dist/vector-$version.tar.gz vector-$version
-rm -r vector-$version
+cp -r webapp riot-$version
+
+# if $version looks like semver with leading v, strip it before writing to file
+if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
+ echo ${version:1} > riot-$version/version
+else
+ echo ${version} > riot-$version/version
+fi
+
+tar chvzf dist/riot-$version.tar.gz riot-$version
+rm -r riot-$version
echo
-echo "Packaged dist/vector-$version.tar.gz"
+echo "Packaged dist/riot-$version.tar.gz"
diff --git a/src/component-index.js b/src/component-index.js
deleted file mode 100644
index 2b67aa15..00000000
--- a/src/component-index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
- * THIS FILE IS AUTO-GENERATED
- * You can edit it you like, but your changes will be overwritten,
- * so you'd just be trying to swim upstream like a salmon.
- * You are not a salmon.
- *
- * To update it, run:
- * ./reskindex.js -h header
- */
-
-module.exports.components = require('matrix-react-sdk/lib/component-index').components;
-
-import structures$BottomLeftMenu from './components/structures/BottomLeftMenu';
-structures$BottomLeftMenu && (module.exports.components['structures.BottomLeftMenu'] = structures$BottomLeftMenu);
-import structures$CompatibilityPage from './components/structures/CompatibilityPage';
-structures$CompatibilityPage && (module.exports.components['structures.CompatibilityPage'] = structures$CompatibilityPage);
-import structures$HomePage from './components/structures/HomePage';
-structures$HomePage && (module.exports.components['structures.HomePage'] = structures$HomePage);
-import structures$LeftPanel from './components/structures/LeftPanel';
-structures$LeftPanel && (module.exports.components['structures.LeftPanel'] = structures$LeftPanel);
-import structures$RightPanel from './components/structures/RightPanel';
-structures$RightPanel && (module.exports.components['structures.RightPanel'] = structures$RightPanel);
-import structures$RoomDirectory from './components/structures/RoomDirectory';
-structures$RoomDirectory && (module.exports.components['structures.RoomDirectory'] = structures$RoomDirectory);
-import structures$RoomSubList from './components/structures/RoomSubList';
-structures$RoomSubList && (module.exports.components['structures.RoomSubList'] = structures$RoomSubList);
-import structures$SearchBox from './components/structures/SearchBox';
-structures$SearchBox && (module.exports.components['structures.SearchBox'] = structures$SearchBox);
-import structures$ViewSource from './components/structures/ViewSource';
-structures$ViewSource && (module.exports.components['structures.ViewSource'] = structures$ViewSource);
-import views$context_menus$MessageContextMenu from './components/views/context_menus/MessageContextMenu';
-views$context_menus$MessageContextMenu && (module.exports.components['views.context_menus.MessageContextMenu'] = views$context_menus$MessageContextMenu);
-import views$context_menus$RoomTileContextMenu from './components/views/context_menus/RoomTileContextMenu';
-views$context_menus$RoomTileContextMenu && (module.exports.components['views.context_menus.RoomTileContextMenu'] = views$context_menus$RoomTileContextMenu);
-import views$dialogs$BugReportDialog from './components/views/dialogs/BugReportDialog';
-views$dialogs$BugReportDialog && (module.exports.components['views.dialogs.BugReportDialog'] = views$dialogs$BugReportDialog);
-import views$dialogs$ChangelogDialog from './components/views/dialogs/ChangelogDialog';
-views$dialogs$ChangelogDialog && (module.exports.components['views.dialogs.ChangelogDialog'] = views$dialogs$ChangelogDialog);
-import views$directory$NetworkDropdown from './components/views/directory/NetworkDropdown';
-views$directory$NetworkDropdown && (module.exports.components['views.directory.NetworkDropdown'] = views$directory$NetworkDropdown);
-import views$elements$ImageView from './components/views/elements/ImageView';
-views$elements$ImageView && (module.exports.components['views.elements.ImageView'] = views$elements$ImageView);
-import views$elements$Spinner from './components/views/elements/Spinner';
-views$elements$Spinner && (module.exports.components['views.elements.Spinner'] = views$elements$Spinner);
-import views$globals$GuestWarningBar from './components/views/globals/GuestWarningBar';
-views$globals$GuestWarningBar && (module.exports.components['views.globals.GuestWarningBar'] = views$globals$GuestWarningBar);
-import views$globals$MatrixToolbar from './components/views/globals/MatrixToolbar';
-views$globals$MatrixToolbar && (module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar);
-import views$globals$NewVersionBar from './components/views/globals/NewVersionBar';
-views$globals$NewVersionBar && (module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar);
-import views$login$VectorCustomServerDialog from './components/views/login/VectorCustomServerDialog';
-views$login$VectorCustomServerDialog && (module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog);
-import views$login$VectorLoginFooter from './components/views/login/VectorLoginFooter';
-views$login$VectorLoginFooter && (module.exports.components['views.login.VectorLoginFooter'] = views$login$VectorLoginFooter);
-import views$login$VectorLoginHeader from './components/views/login/VectorLoginHeader';
-views$login$VectorLoginHeader && (module.exports.components['views.login.VectorLoginHeader'] = views$login$VectorLoginHeader);
-import views$messages$DateSeparator from './components/views/messages/DateSeparator';
-views$messages$DateSeparator && (module.exports.components['views.messages.DateSeparator'] = views$messages$DateSeparator);
-import views$messages$MessageTimestamp from './components/views/messages/MessageTimestamp';
-views$messages$MessageTimestamp && (module.exports.components['views.messages.MessageTimestamp'] = views$messages$MessageTimestamp);
-import views$rooms$DNDRoomTile from './components/views/rooms/DNDRoomTile';
-views$rooms$DNDRoomTile && (module.exports.components['views.rooms.DNDRoomTile'] = views$rooms$DNDRoomTile);
-import views$rooms$RoomDropTarget from './components/views/rooms/RoomDropTarget';
-views$rooms$RoomDropTarget && (module.exports.components['views.rooms.RoomDropTarget'] = views$rooms$RoomDropTarget);
-import views$rooms$RoomTooltip from './components/views/rooms/RoomTooltip';
-views$rooms$RoomTooltip && (module.exports.components['views.rooms.RoomTooltip'] = views$rooms$RoomTooltip);
-import views$rooms$SearchBar from './components/views/rooms/SearchBar';
-views$rooms$SearchBar && (module.exports.components['views.rooms.SearchBar'] = views$rooms$SearchBar);
-import views$settings$IntegrationsManager from './components/views/settings/IntegrationsManager';
-views$settings$IntegrationsManager && (module.exports.components['views.settings.IntegrationsManager'] = views$settings$IntegrationsManager);
-import views$settings$Notifications from './components/views/settings/Notifications';
-views$settings$Notifications && (module.exports.components['views.settings.Notifications'] = views$settings$Notifications);
diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index f378cac6..eacc500a 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,20 +15,21 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import sdk from 'matrix-react-sdk';
+import dis from 'matrix-react-sdk/lib/dispatcher';
+import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
+import Velocity from 'velocity-vector';
+import 'velocity-vector/velocity.ui';
-var React = require('react');
-var ReactDOM = require('react-dom');
-var sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
+const CALLOUT_ANIM_DURATION = 1000;
module.exports = React.createClass({
displayName: 'BottomLeftMenu',
propTypes: {
collapsed: React.PropTypes.bool.isRequired,
- teamToken: React.PropTypes.string,
},
getInitialState: function() {
@@ -40,6 +42,18 @@ module.exports = React.createClass({
});
},
+ componentWillMount: function() {
+ this._dispatcherRef = dis.register(this.onAction);
+ this._peopleButton = null;
+ this._directoryButton = null;
+ this._createRoomButton = null;
+ this._lastCallouts = {};
+ },
+
+ componentWillUnmount: function() {
+ dis.unregister(this._dispatcherRef);
+ },
+
// Room events
onDirectoryClick: function() {
dis.dispatch({ action: 'view_room_directory' });
@@ -104,6 +118,30 @@ module.exports = React.createClass({
this.setState({ settingsHover: false });
},
+ onAction: function(payload) {
+ let calloutElement;
+ switch (payload.action) {
+ // Incoming instruction: dance!
+ case 'callout_start_chat':
+ calloutElement = this._peopleButton;
+ break;
+ case 'callout_room_directory':
+ calloutElement = this._directoryButton;
+ break;
+ case 'callout_create_room':
+ calloutElement = this._createRoomButton;
+ break;
+ }
+ if (calloutElement) {
+ const lastCallout = this._lastCallouts[payload.action];
+ const now = Date.now();
+ if (lastCallout == undefined || lastCallout < now - CALLOUT_ANIM_DURATION) {
+ this._lastCallouts[payload.action] = now;
+ Velocity(ReactDOM.findDOMNode(calloutElement), "callout.bounce", CALLOUT_ANIM_DURATION);
+ }
+ }
+ },
+
// Get the label/tooltip to show
getLabel: function(label, show) {
if (show) {
@@ -112,39 +150,41 @@ module.exports = React.createClass({
}
},
- render: function() {
- var TintableSvg = sdk.getComponent('elements.TintableSvg');
+ _collectPeopleButton: function(e) {
+ this._peopleButton = e;
+ },
- var homeButton;
- if (this.props.teamToken) {
- homeButton = (
-
+ 
+
+
+
+
+ _t("Welcome to Riot.im")
+_t("Decentralised, encrypted chat & collaboration powered by [matrix]")
+
+
+
+
+
+
+ 
+
+
+ _t("Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!")
+
+
+ _t("Search the room directory")
+ +
+
+
+ _t("Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!")
+
+
+
+
+ 
+ _t("General discussion about Matrix and Riot")
+ +
+
+
+
+
+ 
+ Matrix HQ
+
+ _t("Discussion of all things Matrix!")
+
+
+ Matrix HQ
+
+ _t("Discussion of all things Matrix!")
+
+
+ 
+ Riot
+
+ _t("Riot/Web & Desktop chat")
+
+
+ Riot
+
+ _t("Riot/Web & Desktop chat")
+
+
+ 
+ #riot-ios
+
+ _t("Riot/iOS & matrix-ios-sdk chat")
+
+
+ #riot-ios
+
+ _t("Riot/iOS & matrix-ios-sdk chat")
+
+
+ 
+ #riot-android
+
+ _t("Riot/Android & matrix-android-sdk chat")
+
+
+ #riot-android
+
+ _t("Riot/Android & matrix-android-sdk chat")
+ _t("Matrix technical discussions")
+_t("Running Matrix services")
+ +
+
+
+
+
+
+ Synapse Support Community
+
+ _t("Community-run support for Synapse")
+
+
+ Synapse Support Community
+
+ _t("Community-run support for Synapse")
+
+
+ 
+ #dendrite:matrix.org
+
+ _t("Admin support for Dendrite")
+
+
+ #dendrite:matrix.org
+
+ _t("Admin support for Dendrite")
+
+
+ 
+ Synapse Homeowners
+
+ _t("Announcements about Synapse releases")
+
+
+ Synapse Homeowners
+
+ _t("Announcements about Synapse releases")
+
+
+ 
+ IRC Matrix Bridges
+
+ _t("Support for those using and running matrix-appservice-irc")
+
+
+ IRC Matrix Bridges
+
+ _t("Support for those using and running matrix-appservice-irc")
+ _t("Building services on Matrix")
+ +
+
+
+
+
+ 
+ #matrix-dev:matrix.org
+
+ _t("Support for those using the Matrix spec")
+
+
+ #matrix-dev:matrix.org
+
+ _t("Support for those using the Matrix spec")
+
+
+ 
+ End-to-end crypto in Matrix
+
+ _t("Design and implementation of E2E in Matrix")
+
+
+ End-to-end crypto in Matrix
+
+ _t("Design and implementation of E2E in Matrix")
+
+
+ 
+ #vr:matrix.org
+
+ _t("Implementing VR services with Matrix")
+
+
+ #vr:matrix.org
+
+ _t("Implementing VR services with Matrix")
+
+
+ 
+ #webrtc:matrix.org
+
+ _t("Implementing VoIP services with Matrix")
+
+
+ #webrtc:matrix.org
+
+ _t("Implementing VoIP services with Matrix")
+
+
+ 
+ Matrix Identity
+
+ _t("Discussion of the Identity Service API")
+
+
+ Matrix Identity
+
+ _t("Discussion of the Identity Service API")
+
+
+ 
+ Matrix Bridging
+
+ _t("Support for those using, running and writing other bridges")
+
+
+ Matrix Bridging
+
+ _t("Support for those using, running and writing other bridges")
+ _t("Contributing code to Matrix and Riot")
+ +
+
+
+
+ 
+ #riot-dev
+
+ _t("Dev chat for the Riot/Web dev team")
+
+
+ #riot-dev
+
+ _t("Dev chat for the Riot/Web dev team")
+
+
+ 
+ #dendrite-dev
+
+ _t("Dev chat for the Dendrite dev team")
+
+
+ #dendrite-dev
+
+ _t("Dev chat for the Dendrite dev team")
+
+
+ 
+ Riot-Web Translations
+
+ _t("Co-ordination for Riot/Web translators")
+
+
+ Riot-Web Translations
+
+ _t("Co-ordination for Riot/Web translators")
+
- { homeButton }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
Sorry, your browser is not able to run Riot.
+{ _tJsx("Sorry, your browser is not able to run Riot.", /(.*?)<\/b>/, (sub) => {sub}) }
- Riot uses many advanced browser features, some of which are not - available or experimental in your current browser. + { _t("Riot uses many advanced browser features, some of which are not available or experimental in your current browser.") }
- Please install Chrome or Firefox for - the best experience. Safari and Opera work too. + { _tJsx('Please install Chrome or Firefox for the best experience.', + [ + /(.*?)<\/a>/, + /(.*?)<\/a>/, + ], + [ + (sub) => {sub}, + (sub) => {sub}, + ] + )} + { _tJsx('Safari and Opera work too.', + [ + /(.*?)<\/a>/, + /(.*?)<\/a>/, + ], + [ + (sub) => {sub}, + (sub) => {sub}, + ] + )}
- With your current browser, the look and feel of the application may - be completely incorrect, and some or all features may not function. - If you want to try it anyway you can continue, but you are on your own - in terms of any issues you may encounter! + { _t("With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!") }
![[matrix]](home/images/matrix.svg){kind=small}
');
+ return s;
+ },
+
+ componentWillMount: function() {
+ if (this.props.teamToken && this.props.teamServerUrl) {
+ this.setState({
+ iframeSrc: `${this.props.teamServerUrl}/static/${this.props.teamToken}/home.html`
+ });
+ }
+ else {
+ // we use request() to inline the homepage into the react component
+ // so that it can inherit CSS and theming easily rather than mess around
+ // with iframes and trying to synchronise document.stylesheets.
+
+ let src = this.props.homePageUrl || 'home.html';
+
+ request(
+ { method: "GET", url: src },
+ (err, response, body) => {
+ if (err || response.status < 200 || response.status >= 300) {
+ console.log(err);
+ this.setState({ page: "Couldn't load home page" });
+ }
+
+ body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>this.translate(g1));
+ this.setState({ page: body });
+ }
+ );
+ }
},
render: function() {
- return (
-
-