Merge branch 'master' into attacks_protection

Cloud-CV · Nov 17, 2018 · 5117147 · 5117147
2 parents 3d148b0 + eb83356
commit 5117147
Show file tree

Hide file tree

Showing 35 changed files with 304 additions and 74 deletions.
diff --git a/ide/static/css/searchbar_style.css b/ide/static/css/searchbar_style.css
@@ -9,6 +9,13 @@
 	float: left;
 }
 
+#model-search-icon {
+	position: relative;
+	left: 0px;
+	top: 0px;
+	float: left;
+}
+
 #layer-search-icon:hover {
 	cursor: pointer;
 }
@@ -28,6 +35,21 @@
 	transition: 0.3s;
 }
 
+#model-search-input {
+	position: relative;
+	top: 0px;
+	left: 0px;
+	width: 60%;
+	height: 25px;
+	font-size: 15px;
+	background: none;
+	border: none;
+	color: rgb(69, 80, 97);
+	outline: none;
+	opacity: 1;
+	transition: 0.3s;
+}
+
 .filter-button {
 	height: 24px !important;
 }

diff --git a/ide/static/css/zoo.css b/ide/static/css/zoo.css
@@ -0,0 +1,101 @@
+body {
+    overflow-x: hidden;
+ }
+
+#wrapper {
+    padding-left: 250px;
+}
+
+#sidebar-wrapper {
+    z-index: 1000;
+    position: fixed;
+    left: 200px;
+    top: 0px;
+    width: 200px;
+    height: 110%;
+    margin-left: -200px;
+    overflow-y: auto;
+    background: #F5F5F5;
+}
+
+
+#page-content-wrapper {
+    width: 100%;
+    padding: 20px;
+    padding-left: 200px;
+    position: relative;
+}
+
+.sidebar-content {
+    min-height: 80vh;
+    height: 0px;
+    overflow-y: scroll;
+}
+
+.sidebar-nav {
+    position: absolute;
+    top: 0;
+    width: 250px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.sidebar-nav li {
+    text-indent: 20px;
+    line-height: 40px;
+    cursor: pointer;
+}
+
+.sidebar-nav li a {
+    display: block;
+    text-decoration: none;
+    color: #000000;
+}
+
+.sidebar-nav li a:hover {
+    text-decoration: none;
+    color: #000;
+}
+
+.sidebar-nav li a:active,
+.sidebar-nav li a:focus {
+    text-decoration: none;
+}
+
+.sidebar-nav > .sidebar-brand {
+    height: 65px;
+    font-size: 18px;
+    line-height: 60px;
+}
+
+.sidebar-nav > .sidebar-brand a {
+    color: #000000;
+}
+
+
+.sidebar-content img {
+    width: 60%;
+}
+
+.filterbar-container {
+    margin-top: 24px;
+    margin-left: 16px;
+}
+
+.wordwrap { 
+    white-space: pre-wrap;      /* CSS3 */   
+    white-space: -moz-pre-wrap; /* Firefox */    
+    white-space: -pre-wrap;     /* Opera <7 */   
+    white-space: -o-pre-wrap;   /* Opera 7 */    
+    word-wrap: break-word;      /* IE */
+}
+
+.caption {
+    height: 80px;
+}
+
+.bold {
+    background: #cdcfd2;
+    font-weight: bold;
+}
diff --git a/ide/static/img/zoo/All_CNN.png b/ide/static/img/zoo/All_CNN.png
diff --git a/ide/static/img/zoo/CoCo_Caption.png b/ide/static/img/zoo/CoCo_Caption.png
diff --git a/ide/static/img/zoo/DAE_MNIST.png b/ide/static/img/zoo/DAE_MNIST.png
diff --git a/ide/static/img/zoo/GoogleNet.png b/ide/static/img/zoo/GoogleNet.png
diff --git a/ide/static/img/zoo/HED.png b/ide/static/img/zoo/HED.png
diff --git a/ide/static/img/zoo/SENet.png b/ide/static/img/zoo/SENet.png
diff --git a/ide/static/img/zoo/Squeezenet.png b/ide/static/img/zoo/Squeezenet.png
diff --git a/ide/static/img/zoo/VQA.png b/ide/static/img/zoo/VQA.png
diff --git a/ide/static/img/zoo/VQA2.png b/ide/static/img/zoo/VQA2.png
diff --git a/ide/static/img/zoo/ZF_UNET_224.png b/ide/static/img/zoo/ZF_UNET_224.png
diff --git a/ide/static/img/zoo/alexnet.png b/ide/static/img/zoo/alexnet.png
diff --git a/ide/static/img/zoo/cifar10_full.png b/ide/static/img/zoo/cifar10_full.png
diff --git a/ide/static/img/zoo/densenet.png b/ide/static/img/zoo/densenet.png
diff --git a/ide/static/img/zoo/fcn.png b/ide/static/img/zoo/fcn.png
diff --git a/ide/static/img/zoo/fcn2.png b/ide/static/img/zoo/fcn2.png
diff --git a/ide/static/img/zoo/imdb_cnn_lstm.png b/ide/static/img/zoo/imdb_cnn_lstm.png
diff --git a/ide/static/img/zoo/lenet.png b/ide/static/img/zoo/lenet.png
diff --git a/ide/static/img/zoo/mlpVQA.png b/ide/static/img/zoo/mlpVQA.png
diff --git a/ide/static/img/zoo/pix2pix.png b/ide/static/img/zoo/pix2pix.png
diff --git a/ide/static/img/zoo/resnet101.png b/ide/static/img/zoo/resnet101.png
diff --git a/ide/static/img/zoo/seq2seq_lang.png b/ide/static/img/zoo/seq2seq_lang.png
diff --git a/ide/static/img/zoo/siamese_mnist.png b/ide/static/img/zoo/siamese_mnist.png
diff --git a/ide/static/img/zoo/simpleNet.png b/ide/static/img/zoo/simpleNet.png
diff --git a/ide/static/img/zoo/textGeneration.png b/ide/static/img/zoo/textGeneration.png
diff --git a/ide/static/img/zoo/v3.png b/ide/static/img/zoo/v3.png
diff --git a/ide/static/img/zoo/v4.png b/ide/static/img/zoo/v4.png
diff --git a/ide/static/img/zoo/vanilla.png b/ide/static/img/zoo/vanilla.png
diff --git a/ide/static/img/zoo/vgg16.png b/ide/static/img/zoo/vgg16.png
diff --git a/ide/static/img/zoo/yolo_net.png b/ide/static/img/zoo/yolo_net.png
diff --git a/ide/static/js/modelElement.js b/ide/static/js/modelElement.js
@@ -7,13 +7,14 @@ class ModelElement extends React.Component {
   render() {
     if (this.props.children){
       return (
-        <a
-          style={{color: "#848a92"}}
-          className="btn"
-          onClick={() => this.props.importNet('sample'+this.props.framework, this.props.id)}
-          >
-          {this.props.children}
-        </a>
+        <div id={this.props.displayName} className="col-sm-6 col-md-4">
+          <div className="btn thumbnail text-center" onClick={() => this.props.importNet('sample'+this.props.framework, this.props.id)}>
+          <img src={"/static/img/zoo/" + this.props.id + ".png"} />
+            <div className="caption">
+              <h3 className="wordwrap">{this.props.displayName}</h3>
+            </div>
+          </div>
+        </div>
       );
     }
     else
@@ -25,7 +26,8 @@ ModelElement.propTypes = {
   importNet: React.PropTypes.func,
   framework: React.PropTypes.string.isRequired,
   children: React.PropTypes.string.isRequired,
-  id: React.PropTypes.string.isRequired
+  id: React.PropTypes.string.isRequired,
+  displayName: React.PropTypes.string.isRequired
 };
 
 export default ModelElement;