Home Explore Help
Sign In
cpp
/
ZeroTierOne
mirror of https://github.com/zerotier/ZeroTierOne
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Minify JS in UI, add Makefile.

Adam Ierymenko 10 years ago
parent
a4a62be698
commit
bd2ce82ea6
7 changed files with 19 additions and 21 deletions
Unified View Show Diff Stats
  1. 1 0
      .gitignore
  2. 5 0
      ui/Makefile
  3. 1 1
      ui/ZeroTierNetwork.jsx
  4. 5 5
      ui/ZeroTierNode.jsx
  5. 6 14
      ui/index.html
  6. 1 1
      ui/main.js
  7. 0 0
      ui/ztui.min.js

+ 1 - 0
.gitignore
View File 

@@ -40,3 +40,4 @@
 
 /root-topology/test/supernodes
 
 /root-topology/test/supernodes
 
 /root-topology/test/test-root-topology
 
 /root-topology/test/test-root-topology
 
 /ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/*
 
 /ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/*
 
+/ui/.module-cache

+ 5 - 0
ui/Makefile
View File 

@@ -0,0 +1,5 @@
 
+all:
 
+	mkdir -p build
 
+	jsx --target es3 -x jsx . ./build
 
+	minify build/*.js >>ztui.min.js
 
+	rm -rf build

+ 1 - 1
ui/ZeroTierNetwork.jsx
View File 

@@ -60,7 +60,7 @@ var ZeroTierNetwork = React.createClass({
 
 							{
 
 							{
 
 								this.props['assignedAddresses'].map(function(ipAssignment) {
 
 								this.props['assignedAddresses'].map(function(ipAssignment) {
 
 									return (
 
 									return (
 
-										<div className="ipAddress">{ipAssignment}</div>
 
+										<div key={ipAssignment} className="ipAddress">{ipAssignment}</div>
 
 									);
 
 									);
 
 								})
 
 								})
 
 							}
 
 							}

+ 5 - 5
ui/ZeroTierNode.jsx
View File 

@@ -144,8 +144,8 @@ var ZeroTierNode = React.createClass({
 
 					<div className="middleScroll">
 
 					<div className="middleScroll">
 
 						{
 
 						{
 
 							(this.tabIndex === 1) ? (
 
 							(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">Address</div>
 
 										<div className="f">Version</div>
 
 										<div className="f">Version</div>
 
 										<div className="f">Latency</div>
 
 										<div className="f">Latency</div>
 
@@ -156,7 +156,7 @@ var ZeroTierNode = React.createClass({
 
 									{
 
 									{
 
 										this.state._peers.map(function(peer) {
 
 										this.state._peers.map(function(peer) {
 
 											return (
 
 											return (
 
-												<div className="peer">
 
+												<div className="peer" key={peer['address']}>
 
 													<div className="f zeroTierAddress">{peer['address']}</div>
 
 													<div className="f zeroTierAddress">{peer['address']}</div>
 
 													<div className="f">{(peer['version'] === '-1.-1.-1') ? '-' : peer['version']}</div>
 
 													<div className="f">{(peer['version'] === '-1.-1.-1') ? '-' : peer['version']}</div>
 
 													<div className="f">{peer['latency']}</div>
 
 													<div className="f">{peer['latency']}</div>
 
@@ -186,12 +186,12 @@ var ZeroTierNode = React.createClass({
 
 									}
 
 									}
 
 								</div>
 
 								</div>
 
 							) : (
 
 							) : (
 
-								<div className="networks">
 
+								<div className="networks" key="_networks">
 
 									{
 
 									{
 
 										this.state._networks.map(function(network) {
 
 										this.state._networks.map(function(network) {
 
 											network['authToken'] = this.props.authToken;
 
 											network['authToken'] = this.props.authToken;
 
 											network['onNetworkDeleted'] = this.handleNetworkDelete;
 
 											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))
 
 										}.bind(this))
 
 									}
 
 									}
 
 								</div>
 
 								</div>

+ 6 - 14
ui/index.html
View File 

@@ -2,23 +2,15 @@
 
 <html lang="en">
 
 <html lang="en">
 
 <head>
 
 <head>
 
 	<title>ZeroTier One</title>
 
 	<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">
 
 	<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">
 
 	<link rel="stylesheet" href="zerotier.css">
 
-
 
 	<script src="simpleajax.min.js"></script>
 
 	<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="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>
 
 </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>
 
 </html>

+ 1 - 1
ui/main.jsx → ui/main.js
View File 

@@ -46,6 +46,6 @@ if ((!ztAuthToken)||(ztAuthToken.length <= 0)) {
 
 }
 
 }
 
 
 
 React.render(
 
 React.render(
 
-	<ZeroTierNode authToken={ztAuthToken} />,
 
+	React.createElement(ZeroTierNode, {authToken: ztAuthToken}),
 
 	document.getElementById('main')
 
 	document.getElementById('main')
 
 );
 
 );

File diff suppressed because it is too large
+ 0 - 0
ui/ztui.min.js


Some files were not shown because too many files changed in this diff