Minify JS in UI, add Makefile.

11 years ago · bd2ce82ea6
7 changed files with 21 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -40,3 +40,4 @@
 /root-topology/test/supernodes
 /root-topology/test/test-root-topology
 /ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/*
+/ui/.module-cache
--- a/ui/Makefile
+++ b/ui/Makefile
@ -0,0 +1,5 @@
+all:
+	mkdir -p build
+	jsx --target es3 -x jsx . ./build
+	minify build/*.js >>ztui.min.js
+	rm -rf build
--- a/ui/ZeroTierNetwork.jsx
+++ b/ui/ZeroTierNetwork.jsx
@ -60,7 +60,7 @@ var ZeroTierNetwork = React.createClass({
 							{
 								this.props['assignedAddresses'].map(function(ipAssignment) {
 									return (
-										<div className="ipAddress">{ipAssignment}</div>
+										<div key={ipAssignment} className="ipAddress">{ipAssignment}</div>
 									);
 								})
 							}
--- a/ui/ZeroTierNode.jsx
+++ b/ui/ZeroTierNode.jsx
@ -144,8 +144,8 @@ var ZeroTierNode = React.createClass({
 					<div className="middleScroll">
 						{
 							(this.tabIndex === 1) ? (
-								<div className="peers">
-									<div className="peerHeader">
+								<div className="peers" key="_peers">
+									<div className="peerHeader" key="_peersHeader">
 										<div className="f">Address</div>
 										<div className="f">Version</div>
 										<div className="f">Latency</div>
@ -156,7 +156,7 @@ var ZeroTierNode = React.createClass({
 									{
 										this.state._peers.map(function(peer) {
 											return (
-												<div className="peer">
+												<div className="peer" key={peer['address']}>
 													<div className="f zeroTierAddress">{peer['address']}</div>
 													<div className="f">{(peer['version'] === '-1.-1.-1') ? '-' : peer['version']}</div>
 													<div className="f">{peer['latency']}</div>
@ -186,12 +186,12 @@ var ZeroTierNode = React.createClass({
 									}
 								</div>
 							) : (
-								<div className="networks">
+								<div className="networks" key="_networks">
 									{
 										this.state._networks.map(function(network) {
 											network['authToken'] = this.props.authToken;
 											network['onNetworkDeleted'] = this.handleNetworkDelete;
-											return React.createElement('div',{className: 'network'},React.createElement(ZeroTierNetwork,network));
+											return React.createElement('div',{className: 'network',key: network.nwid},React.createElement(ZeroTierNetwork,network));
 										}.bind(this))
 									}
 								</div>
--- a/ui/index.html
+++ b/ui/index.html
@ -2,23 +2,15 @@
 <html lang="en">
 <head>
 	<title>ZeroTier One</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<!--
-	<link rel="stylesheet" href="bootstrap.min.css">
-	<link rel="stylesheet" href="bootstrap-theme.min.css">
-	-->
 	<link rel="stylesheet" href="zerotier.css">
-
 	<script src="simpleajax.min.js"></script>
+	<!-- <script src="https://fb.me/react-0.13.2.js"></script> -->
 	<script src="react.min.js"></script>
-
-	<script src="ZeroTierNetwork.js"></script>
-	<script src="ZeroTierNode.js"></script>
-
-	<script src="main.js"></script>
+	<script src="ztui.min.js"></script>
 </head>
-<body>
-<div style="width: 100%; height: 100%;" id="main"></div>
-</body>
+<body><div style="width: 100%; height: 100%;" id="main"></div></body>
+<script src="main.js"></script>
 </html>
--- a/ui/main.jsx
+++ b/ui/main.jsx
@ -46,6 +46,6 @@ if ((!ztAuthToken)||(ztAuthToken.length <= 0)) {
 }

 React.render(
-	<ZeroTierNode authToken={ztAuthToken} />,
+	React.createElement(ZeroTierNode, {authToken: ztAuthToken}),
 	document.getElementById('main')
 );
--- a/ui/ztui.min.js
+++ b/ui/ztui.min.js