merged with gulp

wttech · Aug 9, 2018 · a47c9aa · a47c9aa
1 parent 6b4f513
commit a47c9aa
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 277 deletions.
diff --git a/report/README.md b/report/README.md
@@ -18,8 +18,7 @@ Please setup AET environment and run some tests to have the data to show.
 You will need following tools installed locally:
 
 * [Node.js][node-js] with [npm][npm-install] package manager
-* [Compass][compass] for building css files
-* Grunt installed globally: `npm install grunt -g`
+* Gulp installed globally: `npm i gulp -g`
 
 #### Running web application locally
 
@@ -30,9 +29,10 @@ You will need following tools installed locally:
         };
    in order to fetch data displayed on the report from instance `http://aet.server.com:8181`.
    (for vagrant setup url example: 'http://aet-vagrant/api/')
-2. got into `.../report/src/main/webapp` folder
+2. go into `.../report/src/main/webapp` folder
 3. run `npm install` to install required npm modules
-4. run `grunt` to start your web application
+4. if you are running the app for the first time use `gulp installLibs` or `gulp build`
+4. run `gulp` to start the application
 
 
 #### Deploying report application to vagrant virtual machine
@@ -42,5 +42,4 @@ You could also upload report application to local virtual machine:
     mvn clean install -P upload
 
 [node-js]: https://nodejs.org/en/
-[npm-install]: https://docs.npmjs.com/getting-started/installing-node#updating-npm
-[compass]: http://compass-style.org/install/
+[npm-install]: https://docs.npmjs.com/getting-started/installing-node#updating-npm
diff --git a/report/pom.xml b/report/pom.xml
@@ -71,6 +71,7 @@
                 <exclude>src/main/webapp/.csslintrc</exclude>
                 <exclude>src/main/webapp/.jsbeautifyrc</exclude>
                 <exclude>src/main/webapp/.jshintrc</exclude>
+                <exclude>src/main/webapp/.babelrc</exclude>
 
                 <exclude>src/main/webapp/assets/libs/**</exclude>
                 <exclude>src/main/webapp/assets/js/**</exclude>
@@ -105,8 +106,8 @@
             </goals>
             <configuration>
               <workingDirectory>src/main/webapp</workingDirectory>
-              <nodeVersion>v4.4.7</nodeVersion>
-              <npmVersion>3.9.5</npmVersion>
+              <nodeVersion>v8.11.3</nodeVersion>
+              <npmVersion>6.2.0</npmVersion>
             </configuration>
           </execution>
           <execution>
@@ -120,9 +121,9 @@
             </configuration>
           </execution>
           <execution>
-            <id>build-with-grunt</id>
+            <id>build-with-gulp</id>
             <goals>
-              <goal>grunt</goal>
+              <goal>gulp</goal>
             </goals>
             <configuration>
               <workingDirectory>src/main/webapp</workingDirectory>

diff --git a/report/src/main/webapp/.babelrc b/report/src/main/webapp/.babelrc
@@ -0,0 +1,3 @@
+{
+    "presets": ["es2015"]
+}
diff --git a/report/src/main/webapp/Gruntfile.js b/report/src/main/webapp/Gruntfile.js
diff --git a/report/src/main/webapp/app/app.config.js b/report/src/main/webapp/app/app.config.js
@@ -19,10 +19,10 @@ require.config({
   baseUrl: 'app/',
   paths: {
     // **** LIBRARIES ****
-    'jquery': '../assets/libs/jquery/jquery',
-    'bootstrap': '../assets/libs/bootstrap-sass-twbs/bootstrap',
+    'jquery': '../assets/libs/jquery/dist/jquery',
+    'bootstrap': '../assets/libs/bootstrap-sass-twbs/assets/javascripts/bootstrap',
     'angular': '../assets/libs/angular/angular',
-    'angular-ui-router': '../assets/libs/angular-ui-router/angular-ui-router',
+    'angular-ui-router': '../assets/libs/angular-ui-router/release/angular-ui-router',
     'angularAMD': '../assets/libs/angularAMD/angularAMD',
     'lodash': '../assets/libs/lodash/dist/lodash',
     'angular-bootstrap': '../assets/libs/angular-bootstrap/ui-bootstrap-tpls',

diff --git a/report/src/main/webapp/assets/sass/_buttons.scss b/report/src/main/webapp/assets/sass/_buttons.scss
@@ -65,7 +65,6 @@
   &-small {
     font-size: 11px;
     line-height: 33px;
-    margin-top:6px;  
   }
 
   svg {

diff --git a/report/src/main/webapp/assets/sass/_popups.scss b/report/src/main/webapp/assets/sass/_popups.scss
@@ -60,7 +60,7 @@
 
   p {
     text-align: left;
-    @include ellipsis();
+    @extend .ellipsis;
     max-width: 86%;
   }
 }

diff --git a/report/src/main/webapp/assets/sass/_sidebar.scss b/report/src/main/webapp/assets/sass/_sidebar.scss
@@ -124,7 +124,7 @@
     }
 
     span {
-      @include ellipsis();
+      @extend .ellipsis;
       color: inherit;
       font-family: $font_light;
       font-size: 15px;
@@ -144,7 +144,7 @@
     &.is-expanded {
 
       svg.rotate-svg {
-        @include transform(rotate(90deg));
+        transform: rotate(90deg);
       }
     }
 
@@ -170,7 +170,7 @@
           color: inherit;
           text-align: left;
           padding-left: 10px;
-          @include ellipsis();
+          @extend .ellipsis;
           -webkit-font-smoothing: antialiased;
         }
 

diff --git a/report/src/main/webapp/assets/sass/_typography.scss b/report/src/main/webapp/assets/sass/_typography.scss
@@ -142,10 +142,4 @@
 
 .name {
   font-style: italic;
-}
-
-input[type=text] {
-  @include input-placeholder {
-    color: #85898e;
-  }
 }
diff --git a/report/src/main/webapp/assets/sass/main.scss b/report/src/main/webapp/assets/sass/main.scss
@@ -15,8 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "compass";
-@import "../../node_modules/bootstrap-sass-twbs/assets/stylesheets/_bootstrap.scss";
+@import "../../assets/libs/bootstrap-sass-twbs/assets/stylesheets/_bootstrap.scss";
 @import "normalize";
 @import "variables";
 @import "typography";
@@ -34,7 +33,7 @@ body {
 	height: 100%;
 }
 
-body {
+body
 	overflow-y: scroll;
 	overflow-x: hidden;
 	&.modal-open {