From 980c71076ebbe0528314b58c1c8902676265596c Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 8 Sep 2015 17:02:24 +0100 Subject: [PATCH] Start moving back to basing off react sdk: move vector out of examples dir --- examples/custom/CustomMTextTile.js | 40 ------------------ examples/custom/README.md | 4 -- examples/custom/index.html | 12 ------ examples/custom/index.js | 40 ------------------ examples/custom/package.json | 29 ------------- {examples/vector => vector}/README.md | 0 {examples/vector => vector}/fonts | 0 .../icons/android-chrome-144x144.png | Bin .../icons/android-chrome-192x192.png | Bin .../icons/android-chrome-36x36.png | Bin .../icons/android-chrome-48x48.png | Bin .../icons/android-chrome-72x72.png | Bin .../icons/android-chrome-96x96.png | Bin .../icons/apple-touch-icon-114x114.png | Bin .../icons/apple-touch-icon-120x120.png | Bin .../icons/apple-touch-icon-144x144.png | Bin .../icons/apple-touch-icon-152x152.png | Bin .../icons/apple-touch-icon-180x180.png | Bin .../icons/apple-touch-icon-57x57.png | Bin .../icons/apple-touch-icon-60x60.png | Bin .../icons/apple-touch-icon-72x72.png | Bin .../icons/apple-touch-icon-76x76.png | Bin .../icons/apple-touch-icon-precomposed.png | Bin .../icons/apple-touch-icon.png | Bin .../vector => vector}/icons/browserconfig.xml | 0 .../vector => vector}/icons/favicon-16x16.png | Bin .../vector => vector}/icons/favicon-32x32.png | Bin .../vector => vector}/icons/favicon-96x96.png | Bin {examples/vector => vector}/icons/favicon.ico | Bin .../vector => vector}/icons/manifest.json | 0 .../icons/mstile-144x144.png | Bin .../icons/mstile-150x150.png | Bin .../icons/mstile-310x150.png | Bin .../icons/mstile-310x310.png | Bin .../vector => vector}/icons/mstile-70x70.png | Bin {examples/vector => vector}/img | 0 {examples/vector => vector}/index.html | 0 {examples/vector => vector}/index.js | 0 {examples/vector => vector}/media/busy.mp3 | Bin {examples/vector => vector}/media/busy.ogg | Bin {examples/vector => vector}/media/callend.mp3 | Bin {examples/vector => vector}/media/callend.ogg | Bin {examples/vector => vector}/media/message.mp3 | Bin {examples/vector => vector}/media/message.ogg | Bin {examples/vector => vector}/media/ring.mp3 | Bin {examples/vector => vector}/media/ring.ogg | Bin .../vector => vector}/media/ringback.mp3 | Bin .../vector => vector}/media/ringback.ogg | Bin {examples/vector => vector}/package.json | 0 49 files changed, 125 deletions(-) delete mode 100644 examples/custom/CustomMTextTile.js delete mode 100644 examples/custom/README.md delete mode 100644 examples/custom/index.html delete mode 100644 examples/custom/index.js delete mode 100644 examples/custom/package.json rename {examples/vector => vector}/README.md (100%) rename {examples/vector => vector}/fonts (100%) rename {examples/vector => vector}/icons/android-chrome-144x144.png (100%) rename {examples/vector => vector}/icons/android-chrome-192x192.png (100%) rename {examples/vector => vector}/icons/android-chrome-36x36.png (100%) rename {examples/vector => vector}/icons/android-chrome-48x48.png (100%) rename {examples/vector => vector}/icons/android-chrome-72x72.png (100%) rename {examples/vector => vector}/icons/android-chrome-96x96.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-114x114.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-120x120.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-144x144.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-152x152.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-180x180.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-57x57.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-60x60.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-72x72.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-76x76.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon-precomposed.png (100%) rename {examples/vector => vector}/icons/apple-touch-icon.png (100%) rename {examples/vector => vector}/icons/browserconfig.xml (100%) rename {examples/vector => vector}/icons/favicon-16x16.png (100%) rename {examples/vector => vector}/icons/favicon-32x32.png (100%) rename {examples/vector => vector}/icons/favicon-96x96.png (100%) rename {examples/vector => vector}/icons/favicon.ico (100%) rename {examples/vector => vector}/icons/manifest.json (100%) rename {examples/vector => vector}/icons/mstile-144x144.png (100%) rename {examples/vector => vector}/icons/mstile-150x150.png (100%) rename {examples/vector => vector}/icons/mstile-310x150.png (100%) rename {examples/vector => vector}/icons/mstile-310x310.png (100%) rename {examples/vector => vector}/icons/mstile-70x70.png (100%) rename {examples/vector => vector}/img (100%) rename {examples/vector => vector}/index.html (100%) rename {examples/vector => vector}/index.js (100%) rename {examples/vector => vector}/media/busy.mp3 (100%) rename {examples/vector => vector}/media/busy.ogg (100%) rename {examples/vector => vector}/media/callend.mp3 (100%) rename {examples/vector => vector}/media/callend.ogg (100%) rename {examples/vector => vector}/media/message.mp3 (100%) rename {examples/vector => vector}/media/message.ogg (100%) rename {examples/vector => vector}/media/ring.mp3 (100%) rename {examples/vector => vector}/media/ring.ogg (100%) rename {examples/vector => vector}/media/ringback.mp3 (100%) rename {examples/vector => vector}/media/ringback.ogg (100%) rename {examples/vector => vector}/package.json (100%) diff --git a/examples/custom/CustomMTextTile.js b/examples/custom/CustomMTextTile.js deleted file mode 100644 index e58ed4c1..00000000 --- a/examples/custom/CustomMTextTile.js +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2015 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. -*/ - -'use strict'; - -var React = require('react'); - -var MTextTileController = require("matrix-react-sdk/src/controllers/molecules/MTextTile"); - -module.exports = React.createClass({ - displayName: 'MTextTile', - mixins: [MTextTileController], - - render: function() { - var content = this.props.mxEvent.getContent(); - return ( - - {content.body} - - ); - }, - - onClick: function(ev) { - global.alert(this.props.mxEvent.getContent().body); - } -}); - diff --git a/examples/custom/README.md b/examples/custom/README.md deleted file mode 100644 index 8125053c..00000000 --- a/examples/custom/README.md +++ /dev/null @@ -1,4 +0,0 @@ -matrix-react-example -==================== - -An example of how to use the Matrix React SDK to build a more customised app diff --git a/examples/custom/index.html b/examples/custom/index.html deleted file mode 100644 index 04c1645c..00000000 --- a/examples/custom/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Matrix React SDK Custom Example - - -
- - - - diff --git a/examples/custom/index.js b/examples/custom/index.js deleted file mode 100644 index 66602a0a..00000000 --- a/examples/custom/index.js +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2015 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. -*/ - -'use strict'; - -// Remember to make your project depend on react directly as soon as -// you add a require('react') to any file in your project. Do not rely -// on react being pulled in via matrix-react-sdk: browserify breaks -// horribly in this situation and can end up pulling in multiple copies -// of react. -var React = require("react"); - -// We pull in the component broker first, separately, as we need to replace -// components before the SDK loads. -var ComponentBroker = require("matrix-react-sdk/src/ComponentBroker"); - -var CustomMTextTile = require('./CustomMTextTile'); - -ComponentBroker.set('molecules/MTextTile', CustomMTextTile); - -var MatrixReactSdk = require("matrix-react-sdk"); -//var MatrixReactSdk = require("../../src/index"); - -React.render( - , - document.getElementById('matrixchat') -); diff --git a/examples/custom/package.json b/examples/custom/package.json deleted file mode 100644 index 6acec803..00000000 --- a/examples/custom/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "matrix-react-example", - "version": "0.0.1", - "description": "Example usage of matrix-react-sdk", - "author": "matrix.org", - "repository": { - "type": "git", - "url": "https://github.com/matrix-org/matrix-react-sdk" - }, - "license": "Apache-2.0", - "devDependencies": { - "browserify": "^10.2.3", - "envify": "^3.4.0", - "http-server": "^0.8.0", - "matrix-react-sdk": "../../", - "npm-css": "^0.2.3", - "parallelshell": "^1.2.0", - "reactify": "^1.1.1", - "uglify-js": "^2.4.23", - "watchify": "^3.2.1" - }, - "scripts": { - "build": "browserify -t [ envify --NODE_ENV production ] -g reactify index.js | uglifyjs -c -m -o bundle.js", - "start": "parallelshell 'watchify -v -d -g reactify index.js -o bundle.js' 'http-server'" - }, - "dependencies": { - "react": "^0.13.3" - } -} diff --git a/examples/vector/README.md b/vector/README.md similarity index 100% rename from examples/vector/README.md rename to vector/README.md diff --git a/examples/vector/fonts b/vector/fonts similarity index 100% rename from examples/vector/fonts rename to vector/fonts diff --git a/examples/vector/icons/android-chrome-144x144.png b/vector/icons/android-chrome-144x144.png similarity index 100% rename from examples/vector/icons/android-chrome-144x144.png rename to vector/icons/android-chrome-144x144.png diff --git a/examples/vector/icons/android-chrome-192x192.png b/vector/icons/android-chrome-192x192.png similarity index 100% rename from examples/vector/icons/android-chrome-192x192.png rename to vector/icons/android-chrome-192x192.png diff --git a/examples/vector/icons/android-chrome-36x36.png b/vector/icons/android-chrome-36x36.png similarity index 100% rename from examples/vector/icons/android-chrome-36x36.png rename to vector/icons/android-chrome-36x36.png diff --git a/examples/vector/icons/android-chrome-48x48.png b/vector/icons/android-chrome-48x48.png similarity index 100% rename from examples/vector/icons/android-chrome-48x48.png rename to vector/icons/android-chrome-48x48.png diff --git a/examples/vector/icons/android-chrome-72x72.png b/vector/icons/android-chrome-72x72.png similarity index 100% rename from examples/vector/icons/android-chrome-72x72.png rename to vector/icons/android-chrome-72x72.png diff --git a/examples/vector/icons/android-chrome-96x96.png b/vector/icons/android-chrome-96x96.png similarity index 100% rename from examples/vector/icons/android-chrome-96x96.png rename to vector/icons/android-chrome-96x96.png diff --git a/examples/vector/icons/apple-touch-icon-114x114.png b/vector/icons/apple-touch-icon-114x114.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-114x114.png rename to vector/icons/apple-touch-icon-114x114.png diff --git a/examples/vector/icons/apple-touch-icon-120x120.png b/vector/icons/apple-touch-icon-120x120.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-120x120.png rename to vector/icons/apple-touch-icon-120x120.png diff --git a/examples/vector/icons/apple-touch-icon-144x144.png b/vector/icons/apple-touch-icon-144x144.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-144x144.png rename to vector/icons/apple-touch-icon-144x144.png diff --git a/examples/vector/icons/apple-touch-icon-152x152.png b/vector/icons/apple-touch-icon-152x152.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-152x152.png rename to vector/icons/apple-touch-icon-152x152.png diff --git a/examples/vector/icons/apple-touch-icon-180x180.png b/vector/icons/apple-touch-icon-180x180.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-180x180.png rename to vector/icons/apple-touch-icon-180x180.png diff --git a/examples/vector/icons/apple-touch-icon-57x57.png b/vector/icons/apple-touch-icon-57x57.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-57x57.png rename to vector/icons/apple-touch-icon-57x57.png diff --git a/examples/vector/icons/apple-touch-icon-60x60.png b/vector/icons/apple-touch-icon-60x60.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-60x60.png rename to vector/icons/apple-touch-icon-60x60.png diff --git a/examples/vector/icons/apple-touch-icon-72x72.png b/vector/icons/apple-touch-icon-72x72.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-72x72.png rename to vector/icons/apple-touch-icon-72x72.png diff --git a/examples/vector/icons/apple-touch-icon-76x76.png b/vector/icons/apple-touch-icon-76x76.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-76x76.png rename to vector/icons/apple-touch-icon-76x76.png diff --git a/examples/vector/icons/apple-touch-icon-precomposed.png b/vector/icons/apple-touch-icon-precomposed.png similarity index 100% rename from examples/vector/icons/apple-touch-icon-precomposed.png rename to vector/icons/apple-touch-icon-precomposed.png diff --git a/examples/vector/icons/apple-touch-icon.png b/vector/icons/apple-touch-icon.png similarity index 100% rename from examples/vector/icons/apple-touch-icon.png rename to vector/icons/apple-touch-icon.png diff --git a/examples/vector/icons/browserconfig.xml b/vector/icons/browserconfig.xml similarity index 100% rename from examples/vector/icons/browserconfig.xml rename to vector/icons/browserconfig.xml diff --git a/examples/vector/icons/favicon-16x16.png b/vector/icons/favicon-16x16.png similarity index 100% rename from examples/vector/icons/favicon-16x16.png rename to vector/icons/favicon-16x16.png diff --git a/examples/vector/icons/favicon-32x32.png b/vector/icons/favicon-32x32.png similarity index 100% rename from examples/vector/icons/favicon-32x32.png rename to vector/icons/favicon-32x32.png diff --git a/examples/vector/icons/favicon-96x96.png b/vector/icons/favicon-96x96.png similarity index 100% rename from examples/vector/icons/favicon-96x96.png rename to vector/icons/favicon-96x96.png diff --git a/examples/vector/icons/favicon.ico b/vector/icons/favicon.ico similarity index 100% rename from examples/vector/icons/favicon.ico rename to vector/icons/favicon.ico diff --git a/examples/vector/icons/manifest.json b/vector/icons/manifest.json similarity index 100% rename from examples/vector/icons/manifest.json rename to vector/icons/manifest.json diff --git a/examples/vector/icons/mstile-144x144.png b/vector/icons/mstile-144x144.png similarity index 100% rename from examples/vector/icons/mstile-144x144.png rename to vector/icons/mstile-144x144.png diff --git a/examples/vector/icons/mstile-150x150.png b/vector/icons/mstile-150x150.png similarity index 100% rename from examples/vector/icons/mstile-150x150.png rename to vector/icons/mstile-150x150.png diff --git a/examples/vector/icons/mstile-310x150.png b/vector/icons/mstile-310x150.png similarity index 100% rename from examples/vector/icons/mstile-310x150.png rename to vector/icons/mstile-310x150.png diff --git a/examples/vector/icons/mstile-310x310.png b/vector/icons/mstile-310x310.png similarity index 100% rename from examples/vector/icons/mstile-310x310.png rename to vector/icons/mstile-310x310.png diff --git a/examples/vector/icons/mstile-70x70.png b/vector/icons/mstile-70x70.png similarity index 100% rename from examples/vector/icons/mstile-70x70.png rename to vector/icons/mstile-70x70.png diff --git a/examples/vector/img b/vector/img similarity index 100% rename from examples/vector/img rename to vector/img diff --git a/examples/vector/index.html b/vector/index.html similarity index 100% rename from examples/vector/index.html rename to vector/index.html diff --git a/examples/vector/index.js b/vector/index.js similarity index 100% rename from examples/vector/index.js rename to vector/index.js diff --git a/examples/vector/media/busy.mp3 b/vector/media/busy.mp3 similarity index 100% rename from examples/vector/media/busy.mp3 rename to vector/media/busy.mp3 diff --git a/examples/vector/media/busy.ogg b/vector/media/busy.ogg similarity index 100% rename from examples/vector/media/busy.ogg rename to vector/media/busy.ogg diff --git a/examples/vector/media/callend.mp3 b/vector/media/callend.mp3 similarity index 100% rename from examples/vector/media/callend.mp3 rename to vector/media/callend.mp3 diff --git a/examples/vector/media/callend.ogg b/vector/media/callend.ogg similarity index 100% rename from examples/vector/media/callend.ogg rename to vector/media/callend.ogg diff --git a/examples/vector/media/message.mp3 b/vector/media/message.mp3 similarity index 100% rename from examples/vector/media/message.mp3 rename to vector/media/message.mp3 diff --git a/examples/vector/media/message.ogg b/vector/media/message.ogg similarity index 100% rename from examples/vector/media/message.ogg rename to vector/media/message.ogg diff --git a/examples/vector/media/ring.mp3 b/vector/media/ring.mp3 similarity index 100% rename from examples/vector/media/ring.mp3 rename to vector/media/ring.mp3 diff --git a/examples/vector/media/ring.ogg b/vector/media/ring.ogg similarity index 100% rename from examples/vector/media/ring.ogg rename to vector/media/ring.ogg diff --git a/examples/vector/media/ringback.mp3 b/vector/media/ringback.mp3 similarity index 100% rename from examples/vector/media/ringback.mp3 rename to vector/media/ringback.mp3 diff --git a/examples/vector/media/ringback.ogg b/vector/media/ringback.ogg similarity index 100% rename from examples/vector/media/ringback.ogg rename to vector/media/ringback.ogg diff --git a/examples/vector/package.json b/vector/package.json similarity index 100% rename from examples/vector/package.json rename to vector/package.json