candy

app/lobby.component.css

@@ -9,7 +9,7 @@
 }
 
 #candy {
-    background-color: #336699;
+    background-color: #444;
     height: 236px;
     flex-shrink: 0;
 }

app/lobby.component.ts

@@ -5,11 +5,10 @@ import {Component, OnInit, ElementRef, ViewChild} from "@angular/core";
 import {AppsService} from "./apps.service";
 import {LoginService} from "./login.service";
 import {App, Category} from "./app";
-import {DownloadService} from "./download.service";
-import {Http, URLSearchParams} from "@angular/http";
+import {URLSearchParams} from "@angular/http";
 import {shell} from "electron";
-import WebViewElement = Electron.WebViewElement;
 import {SettingsService} from "./settings.sevices";
+import WebViewElement = Electron.WebViewElement;
 
 @Component({
     moduleId: module.id,
@@ -34,7 +33,7 @@ export class LobbyComponent implements OnInit {
             this.chooseApp(this.appsService.lastVisited || this.apps.get("ygopro")!);
 
             // 初始化聊天室
-            let url = new URL('candy/index.html', location.href);
+            let url = new URL('candy.html', location.href);
             let params: URLSearchParams = url['searchParams']; // TypeScrpt 缺了 url.searchParams 的定义
             params.set('jid', this.loginService.user.username + '@mycard.moe');
             params.set('password', this.loginService.user.external_id.toString());

candy/index.html → candy.html

@@ -4,9 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Candy - Chats are not dead yet</title>
-    <link rel="shortcut icon" href="res/img/favicon.png" type="image/gif"/>
-    <link rel="stylesheet" type="text/css" href="libs.min.css"/>
-    <link rel="stylesheet" type="text/css" href="res/default.css"/>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy/libs.min.css"/>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy/res/default.css"/>
     <style>
         body {
             font-family: -apple-system, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
@@ -14,9 +13,39 @@
     </style>
 
     <script>delete module.exports</script>
-    <script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
-    <script type="text/javascript" src="libs.min.js"></script>
-    <script type="text/javascript" src="candy.min.js"></script>
+    <script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
+    <script type="text/javascript" src="node_modules/candy/libs.min.js"></script>
+    <script type="text/javascript" src="node_modules/candy/candy.min.js"></script>
+
+
+    <!-- plugins -->
+    <script type="text/javascript" src="node_modules/candy-shop/replies/candy.js"></script>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy-shop/replies/candy.css"/>
+
+    <script type="text/javascript" src="node_modules/candy-shop/notifyme/candy.js"></script>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy-shop/notifyme/candy.css"/>
+
+    <script type="text/javascript" src="node_modules/candy-shop/namecomplete/candy.js"></script>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy-shop/namecomplete/candy.css"/>
+
+    <script type="text/javascript" src="node_modules/candy-shop/modify-role/candy.js"></script>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy-shop/modify-role/candy.css"/>
+
+    <script type="text/javascript" src="node_modules/candy-shop/inline-images/candy.js"></script>
+    <link rel="stylesheet" type="text/css" href="node_modules/candy-shop/inline-images/candy.css"/>
+
+    <script type="text/javascript" src="node_modules/candy-shop/me-does/candy.js"></script>
+
+    <script type="text/javascript" src="node_modules/candy-shop/notifications/candy.js"></script>
+
+    <script type="text/javascript" src="node_modules/candy-shop/refocus/candy.js"></script>
+
+    <script type="text/javascript" src="node_modules/candy-shop/slash-commands/slash-commands.js"></script>
+
+
+    <!--正在输入那个插件不好用-->
+    <!--<script type="text/javascript" src="node_modules/candy-shop/typingnotifications/typingnotifications.js"></script>-->
+    <!--<link rel="stylesheet" type="text/css" href="node_modules/candy-shop/typingnotifications/typingnotifications.css" />-->
 </head>
 <body>
 <div id="candy"></div>
@@ -47,11 +76,22 @@
         core: {
             debug: false,
             autojoin: params.get('autojoin') && [params.get('autojoin')],
-            resource: 'mycard-' + Math.random().toString().split('.')[1]
+            resource: 'mycard-' + Math.random().toString().split('.')[1],
+            enableXHTML: true
         },
-        view: {assets: 'res/', language: params.get('language')}
+        view: {assets: 'node_modules/candy/res/', language: params.get('language')}
     });
 
+    CandyShop.Replies.init();
+    CandyShop.NotifyMe.init();
+    CandyShop.NameComplete.init();
+    CandyShop.ModifyRole.init();
+    CandyShop.InlineImages.init();
+    CandyShop.MeDoes.init();
+    CandyShop.Notifications.init();
+    CandyShop.Refocus.init();
+    CandyShop.SlashCommands.init();
+
     Candy.Core.connect(params.get('jid'), params.get('password'), params.get('nickname'));
 
 </script>

candy/CONTRIBUTING.md

-# Contributing
-
-## Team members
-
-* Patrick Stadler &middot; [@pstadler](http://twitter.com/pstadler) &middot; <patrick.stadler@gmail.com>
-* Michael Weibel &middot; [@weibelm](htps://twitter.com/weibelm) &middot; <michael.weibel@gmail.com>
-
-## Learn & listen
-
-[![Gitter chat](https://badges.gitter.im/candy-chat.png)](https://gitter.im/candy-chat)
-
-* [Mailing list](http://groups.google.com/group/candy-chat)
-	* yes, non-gmail users can signup as well
-* [FAQ](https://github.com/candy-chat/candy/wiki/Frequently-Asked-Questions)
-
-## Contributing
-
-You want to help us? **Awesome!**
-
-### How to contribute
-A few hopefully helpful hints to contributing to Candy
-
-#### Using vagrant
-1. [Fork](https://help.github.com/articles/fork-a-repo) Candy
-2. [Install Vagrant](http://vagrantup.com/)
-3. Run `vagrant up`.
-5. Create a branch based on the `master` branch (`git checkout -B my-awesome-feature`)
-6. Run `grunt watch` to automatically run jshint (syntax checker) and the build of `candy.bundle.js` and `candy.min.js` while developing.
-7. Make your changes, fix eventual *jshint* errors & push them back to your fork
-8. Create a [pull request](https://help.github.com/articles/using-pull-requests)
-
-
-#### On your own machine
-Please note that you should have a working XMPP server to test your changes (the vagrant way does already have a working XMPP server).
-
-1. [Fork](https://help.github.com/articles/fork-a-repo) Candy
-2. Clone your fork
-3. Checkout out `master` branch (`git checkout master`)
-4. Install [Node.js](http://nodejs.org/)
-5. Install [Grunt](http://gruntjs.com/) (`npm install -g grunt-cli`)
-6. Install [Bower](http://bower.io/) (`npm install -g bower`)
-7. Install npm dependencies (`npm install` in candy root directory)
-8. Install bower dependencies (`bower install` in candy root directory)
-9. Create a branch based on the `master` branch (`git checkout -B my-awesome-feature`)
-10. Run `grunt watch` to automatically run jshint (syntax checker) and the build of `candy.bundle.js` and `candy.min.js` while developing.
-11. Make your changes, fix eventual *jshint* errors & push them back to your fork
-12. Create a [pull request](https://help.github.com/articles/using-pull-requests)
-
-In case you have any questions, don't hesitate to ask on the [Mailing list](http://groups.google.com/group/candy-chat).
-
-### Running tests
-
-* Tests are run using [Intern](http://theintern.io).
-* `grunt` and `grunt watch` will each run unit tests in Chrome on Linux (for fast feedback).
-* `grunt test` will run both unit and integration tests in a variety of environments. Tests are run using Selenium Standalone and Phantom.JS while developing, and on Sauce Labs in CI or using `grunt test`.
-* If you don't want to use the Vagrant box to run Selenium/PhantomJS, set `CANDY_VAGRANT='false'` to run tests.

candy/CREDITS.md

-Credits
-=======
-- [Special thanks to our contributors](https://github.com/candy-chat/candy/graphs/contributors)
-- [famfamfam silk icons](http://www.famfamfam.com/lab/icons/silk/) is a smooth, free icon set, containing over 700 16-by-16 pixel icons.
-- [Simple Smileys](http://simplesmileys.org) are beautifully simple emoticons.
-- [Flash MP3 Player](http://flash-mp3-player.net/players/js) is a very simple flash audio player used by Candy for audio notifications.
-- [Colin Snover](http://zetafleet.com/blog/javascript-dateparse-for-iso-8601) provides a fix for browsers not supporting latest Date.parse().
-- [Ben Cherry](http://www.adequatelygood.com/2010/3/JavaScript-Module-Pattern-In-Depth) wrote a great article about the JS module pattern.
-- [Amiado Group](http://www.amiadogroup.com) allowed us to make Candy freely available for everyone :)
\ No newline at end of file

candy/LICENSE

-Copyright (c) 2011 Amiado Group AG
-Copyright (c) 2012-2014 Patrick Stadler & Michael Weibel
-Copyright (c) 2015 Adhearsion Foundation Inc <info@adhearsion.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

candy/README.md

-Candy — a JavaScript-based multi-user chat client
-==================================================
-
-[![Build Status](https://travis-ci.org/candy-chat/candy.png?branch=dev)](https://travis-ci.org/candy-chat/candy)
-[![Coverage Status](https://coveralls.io/repos/candy-chat/candy/badge.png?branch=dev)](https://coveralls.io/r/candy-chat/candy)
-
-Visit the official project page: http://candy-chat.github.io/candy
-
-Features
---------
-- Focused on real-time multi-user chatting
-- Easy to configure, easy to run, easy to use
-- Highly customizable
-- 100% well-documented JavaScript source code
-- Built for Jabber (XMPP), using famous technologies
-- Used and approved in a productive environment with up to 400 concurrent users
-- Works with all major web browsers including IE9
-
-Plugins
--------
-If you wish to add new functionality (to your candy installation) or contribute plugins, take a look at our [plugin repository](http://github.com/candy-chat/candy-plugins).
-
-Support & Community
--------------------
-Take a look at our [FAQ](https://github.com/candy-chat/candy/wiki/Frequently-Asked-Questions). If it doesn't solve your questions, you're welcome to join our [Mailinglist on Google Groups](http://groups.google.com/group/candy-chat).
-You don't need to have a Gmail account for it.
-
-[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/a41a8075608abeaf99db685d7ef29cf6 "githalytics.com")](http://githalytics.com/candy-chat/candy)

candy/bower.json

-{
-  "name": "candy",
-  "version": "2.2.0",
-  "homepage": "http://candy-chat.github.io/candy/",
-  "authors": [
-    "Michael Weibel <michael.weibel@gmail.com>",
-    "Patrick Stadler <patrick.stadler@gmail.com>"
-  ],
-  "description": "Multi-user XMPP web client",
-  "main": [
-    "candy.min.js"
-  ],
-  "keywords": [
-    "xmpp",
-    "muc",
-    "multi-user",
-    "websocket",
-    "bosh",
-    "chat"
-  ],
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/candy-chat/candy.git"
-  },
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "jquery": "~1.10.2",
-    "strophe": "1.1.3",
-    "strophejs-plugins": "benlangfeld/strophejs-plugins#30fb089457addc37e01d69c3536dee868a90a9ad",
-    "mustache": "0.3.0",
-    "jquery-i18n": "1.1.1",
-    "bootstrap": "~3.3.6"
-  }
-}

candy/example/htaccess

-AddDefaultCharset UTF-8
-Options +MultiViews
-RewriteEngine On
-RewriteRule http-bind/ http://localhost:5280/http-bind/ [P]

candy/example/index.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Candy - Chats are not dead yet</title>
-	<link rel="shortcut icon" href="../res/img/favicon.png" type="image/gif" />
-	<link rel="stylesheet" type="text/css" href="../libs.min.css" />
-	<link rel="stylesheet" type="text/css" href="../res/default.css" />
-
-	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-	<script type="text/javascript" src="../libs.min.js"></script>
-	<script type="text/javascript" src="../candy.min.js"></script>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			Candy.init('http-bind/', {
-				core: {
-					// only set this to true if developing / debugging errors
-					debug: false,
-					// autojoin is a *required* parameter if you don't have a plugin (e.g. roomPanel) for it
-					//   true
-					//     -> fetch info from server (NOTE: does only work with openfire server)
-					//   ['test@conference.example.com']
-					//     -> array of rooms to join after connecting
-					autojoin: true
-				},
-				view: { assets: '../res/' }
-			});
-
-			Candy.Core.connect();
-
-			/**
-			 * Thanks for trying Candy!
-			 *
-			 * If you need more information, please see here:
-			 *   - Setup instructions & config params: http://candy-chat.github.io/candy/#setup
-			 *   - FAQ & more: https://github.com/candy-chat/candy/wiki
-			 *
-			 * Mailinglist for questions:
-			 *   - http://groups.google.com/group/candy-chat
-			 *
-			 * Github issues for bugs:
-			 *   - https://github.com/candy-chat/candy/issues
-			 */
-		});
-	</script>
-</head>
-<body>
-	<div id="candy"></div>
-</body>
-</html>

candy/package.json

-{
-  "name": "candy",
-  "version": "2.2.0",
-  "description": "Multi-user XMPP web client",
-  "main": "candy.min.js",
-  "directories": {
-    "doc": "docs",
-    "example": "example"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/candy-chat/candy.git"
-  },
-  "keywords": [
-    "xmpp",
-    "muc",
-    "multi-user",
-    "websocket",
-    "bosh",
-    "chat"
-  ],
-  "contributors": [
-    {
-      "name": "Michael Weibel",
-      "email": "michael.weibel@gmail.com"
-    },
-    {
-      "name": "Patrick Stadler",
-      "email": "patrick.stadler@gmail.com",
-      "url": "http://pstadler.sh"
-    }
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/candy-chat/candy/issues"
-  },
-  "homepage": "http://candy-chat.github.io/candy/",
-  "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-clear": "^0.2.1",
-    "grunt-contrib-clean": "^0.5.0",
-    "grunt-contrib-compress": "^0.13.0",
-    "grunt-contrib-concat": "^0.5.1",
-    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-uglify": "^0.4.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-coveralls": "^0.3.0",
-    "grunt-github-releaser": "^0.1.17",
-    "grunt-mkdir": "^0.1.1",
-    "grunt-natural-docs": "^0.1.1",
-    "grunt-notify": "^0.3.0",
-    "grunt-prompt": "^1.3.0",
-    "grunt-sync-pkg": "^0.1.2",
-    "grunt-todo": "~0.4.0",
-    "intern": "^2.0.1",
-    "jshint-stylish": "^0.2.0",
-    "lolex": "^1.2.0",
-    "sinon": "^1.10.3",
-    "sinon-chai": "^2.5.0"
-  }
-}

candy/res/img/emoticons/README

-Simple Smileys is a set of 49 clean, free as in freedom, Public Domain smileys.
-For more packages or older versions, visit http://simplesmileys.org

package.json

@@ -43,7 +43,9 @@
     "systemjs-plugin-text": "latest",
     "tether": "latest",
     "vue": "latest",
-    "zone.js": "^0.6.26"
+    "zone.js": "^0.6.26",
+    "candy": "https://github.com/mycard/candy/releases/download/v2.2.0/candy.tar.gz",
+    "candy-shop": "zh99998/candy-plugins#patch-2"
   },
   "devDependencies": {
     "@angular/compiler-cli": "latest",