clean code and remove unused file

SaifJerbi · SaifJerbi · commit 7b0a606fc633 · 2017-05-29T15:01:21.000+01:00
diff --git a/demo/bower.json b/demo/bower.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "angular-schema-form": "^0.8.13",
     "angular-schema-form-bootstrap": "^0.2.0",
-    "angular": "^1.6.4",
-    "bootstrap": "^3.3.7"
+    "bootstrap": "^3.3.7",
+    "lodash": "^4.17.4"
   }
-}
+ }
diff --git a/demo/src/main/resources/static/css/main.css b/demo/src/main/resources/static/css/main.css
@@ -1,83 +0,0 @@
-.form-control{
-	width: auto;
-}
-.debug .wrapper {
-  border: 1px solid #d6d6d6;
-  border-radius: 5px;
-  margin: 10px 0;
-}
-
-.debug .wrapper > div > div {
-  padding: 0 25px;
-}
-#direct_upload_jquery, #direct_upload { padding: 20px 20px; margin: 20px 0;
-    border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; }
-
-#direct_upload_jquery h1, #direct_upload h1 { margin: 0 0 15px 0; }
-
-.back_link { font-weight: bold; display: block; font-size: 16px; margin: 10px 0; }
-
-form { border: 1px solid #ddd; margin: 15px 0; padding: 15px 0; border-radius: 4px; }
-form .form_line { margin-bottom: 20px; }
-form .form_controls { margin-left: 180px; }
-form label { float: left; width: 160px; padding: 6px; text-align: right; }
-form .error { color: #c55; margin: 0 10px; }
-
-#direct_upload, #direct_upload_jquery { border: 4px dashed #ccc; }
-#direct_upload.dragover { border-color: #0c0; }
-#direct_upload.dragover-err { border-color: #c00; }
-
-.upload_details { font-size: 12px; margin: 20px; border-top: 1px solid #ccc; word-wrap: break-word; }
-.upload_button_holder {
-    position: relative;
-    overflow: hidden;
-    display: inline-block;
-}
-
-.upload_button {
-    display: inline-block;
-    position: relative;
-    font-weight: bold;
-    font-size: 14px;
-    background-color: rgb(15, 97, 172);
-    color: #fff;
-    padding: 5px 0;
-    border: 1px solid #000;
-    border-radius: 4px;
-    width: 100px;
-    height: 28px;
-    text-decoration: none;
-    text-align: center;
-    cursor: pointer;
-}
-
-.upload_button_holder .upload_button {
-    display: block;
-} 
-
-.upload_button:hover {
-    background-color: rgb(17, 133, 240);
-}
-.upload_button_holder .cloudinary_fileupload {
-    opacity: 0;
-    filter: alpha(opacity=0);
-    cursor: pointer;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    border: none;
-}
-.progress-bar{
-  width: 100px;
-  position: relative;
-  height: 4px;
-}
-.progress-bar .progress{
-  height: 4px;
-  background-color: #ff0000;
-  width: 0;
-}
diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html
@@ -1,24 +1,22 @@
 <html>
   <head>
-    <script src="../bower_components/angular/angular.min.js"></script>
+	<script src="../bower_components/angular/angular.min.js"></script>
     <script src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
     <script src="../bower_components/tv4/tv4.js"></script>
     <script src="../bower_components/objectpath/lib/ObjectPath.js"></script>
     <script src="../bower_components/angular-schema-form/dist/schema-form.min.js"></script>
     <script src="../bower_components/angular-schema-form-bootstrap/bootstrap-decorator.min.js"></script>
+    <script src="../bower_components/lodash/lodash.js"></script>
 
-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../css/main.css">
+<link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
 
     <script>
 
-      angular.module('test', ["schemaForm"]).controller('FormController', function($scope,$http) {
+      angular.module('demoApp', ["schemaForm"]).controller('DemoAppController', function($scope,$http) {
     	
     	$http.get('/api/ui').then(successCallback, errorCallback);
     	function successCallback(response){
-    		console.log(response.data.schema);
 			$scope.schema = response.data.schema;
-			console.log(response.data.form);
 			$scope.form = response.data.form;
 			$scope.model = {};
 	        $scope.debug = {schema: angular.copy($scope.schema), form: angular.copy($scope.form)};
@@ -32,11 +30,11 @@
     <title>Testing ASF Java UI</title>
   </head>
 
-  <body ng-app="test">
-    <div class="container-fluid" ng-controller="FormController">
+  <body ng-app="demoApp">
+    <div class="container-fluid" ng-controller="DemoAppController">
 
         <div class="col-sm-6 form">
-          <form sf-schema="schema" sf-model="model"></form>
+          <form sf-schema="schema" sf-form="form" sf-model="model"></form>
         </div>
 
         <div class="col-sm-6 debug">
diff --git a/demo/src/test/java/io/asfjava/ui/DemoApplicationTests.java b/demo/src/test/java/io/asfjava/ui/DemoApplicationTests.java
