style(css,js,json,scss): apply prettier auto formatting

UW-Madison-DoIT · Oct 31, 2017 · 0042254 · 0042254
1 parent 4ce9c30
commit 0042254
Show file tree

Hide file tree

Showing 12 changed files with 309 additions and 271 deletions.
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
@@ -1,7 +1,4 @@
----
----
-
-@import "{{ site.theme }}";
+@import '{{ site.theme }}';
 
 .wrapper {
   width: auto;
@@ -27,7 +24,7 @@ header {
     }
   }
   a.button {
-    box-shadow: 0 2px 5px 0 rgba(0,0,0,.26);
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
     background: #39c;
     color: #fff;
     display: inline-block;
@@ -51,8 +48,10 @@ header {
     font-weight: 500;
     text-decoration: none;
     overflow: hidden;
-    -webkit-transition: box-shadow .4s cubic-bezier(.25,.8,.25,1),background-color .4s cubic-bezier(.25,.8,.25,1);
-    transition: box-shadow .4s cubic-bezier(.25,.8,.25,1),background-color .4s cubic-bezier(.25,.8,.25,1);
+    -webkit-transition: box-shadow 0.4s cubic-bezier(0.25, 0.8, 0.25, 1),
+      background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
+    transition: box-shadow 0.4s cubic-bezier(0.25, 0.8, 0.25, 1),
+      background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
     &:hover {
       background: #069;
     }
@@ -120,7 +119,9 @@ footer {
   body {
     margin: 0;
     padding: 40px 40px 40px 0;
-    header, section, footer {
+    header,
+    section,
+    footer {
       padding-left: 40px;
     }
   }

diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "build:lint-js":
       "eslint --ext js --ext json --ext md . --ignore-path .gitignore",
     "build": "npm run build:pre && npm run build:test && npm run build:lint-js",
+    "format": "prettier-eslint --write \"**/*.{js,json,css,scss}\"",
     "test": "npm run build:pre && npm run build:test",
     "lint-js": "npm run build:pre && npm run build:lint-js",
     "dev": "npm run build:pre && mvn jetty:run",

diff --git a/src/main/webapp/js/config.js b/src/main/webapp/js/config.js
@@ -1,4 +1,4 @@
 /* eslint-disable no-unused-vars */
 var config = {
-  'gaID': '',
+  gaID: '',
 };
diff --git a/src/main/webapp/js/override.js b/src/main/webapp/js/override.js
@@ -1,32 +1,31 @@
 define(['angular'], function(angular) {
   // see https://uw-madison-doit.github.io/uw-frame/configuration.html for howto
-  return angular.module('override', [])
-    .constant('OVERRIDE', {
-      'APP_FLAGS': {
-        'defaultTheme': 'uwMadison',
-        'showSearch': false,
-        'isWeb': false,
-        'loginOnLoad': false,
+  return angular.module('override', []).constant('OVERRIDE', {
+    APP_FLAGS: {
+      defaultTheme: 'uwMadison',
+      showSearch: false,
+      isWeb: false,
+      loginOnLoad: false,
+    },
+    NAMES: {
+      title: 'Widget Creator',
+      fname: 'widget-creator',
+    },
+    SERVICE_LOC: {
+      kvURL: null,
+      groupURL: 'staticFeeds/groups.json',
+      sessionInfo: 'staticFeeds/guest-session.json',
+      shibbolethSessionURL: 'staticFeeds/Shibboleth.sso/Session.json',
+      templates: 'json/starter-templates',
+      widgetApi: {
+        // For local testing, change to 'staticFeeds/'
+        entry: 'data:application/json;base64,',
+        entrySuffix: '',
+        entries: null,
       },
-      'NAMES': {
-        'title': 'Widget Creator',
-        'fname': 'widget-creator',
-      },
-      'SERVICE_LOC': {
-        'kvURL': null,
-        'groupURL': 'staticFeeds/groups.json',
-        'sessionInfo': 'staticFeeds/guest-session.json',
-        'shibbolethSessionURL': 'staticFeeds/Shibboleth.sso/Session.json',
-        'templates': 'json/starter-templates',
-        'widgetApi': {
-          // For local testing, change to 'staticFeeds/'
-          'entry': 'data:application/json;base64,',
-          'entrySuffix': '',
-          'entries': null,
-        },
-      },
-      'MISC_URLS': {
-        'rootURL': 'https://my.wisc.edu',
-      },
-    });
+    },
+    MISC_URLS: {
+      rootURL: 'https://my.wisc.edu',
+    },
+  });
 });
diff --git a/src/main/webapp/json/starter-templates.json b/src/main/webapp/json/starter-templates.json
@@ -169,7 +169,8 @@
           "widgetType": "time-sensitive-content",
           "title": "Time Sensitive Content",
           "mdIcon": "widgets",
-          "description": "A widget for displaying content before, during, and after a specified period of time",
+          "description":
+            "A widget for displaying content before, during, and after a specified period of time",
           "widgetConfig": {
             "callsToAction": [
               {
@@ -183,8 +184,8 @@
                 "daysLeftMessage": "to make it happen.",
                 "lastDayMessage": "Today is the last day it could happen.",
                 "actionButton": {
-                    "url": "//www.example.com",
-                    "label": "Do it to it"
+                  "url": "//www.example.com",
+                  "label": "Do it to it"
                 },
                 "learnMoreUrl": "//www.example.com",
                 "feedbackUrl": "//www.example.com"

diff --git a/src/main/webapp/my-app/main.js b/src/main/webapp/my-app/main.js
@@ -1,4 +1,5 @@
-define([
+define(
+  [
     'angular',
     'require',
     './view-home/routes', // add all the paths to your routes here
@@ -13,15 +14,18 @@ define([
     './view-home/controllers', // add all your paths to your other js files here
     './view-home/directives',
     './view-home/services',
-  ], function(
+  ],
+  function(
     angular,
     require,
     homeRoutes,
     settingsRoutes,
     aboutRoute,
     mainRoutes
-  ) { // notice each route file is now an object
-    return angular.module('my-app', [
+  ) {
+    // notice each route file is now an object
+    return angular
+      .module('my-app', [
         'app-config',
         'my-app.view-home.controllers', // add in your modules here
         'my-app.view-home.directives',
@@ -30,17 +34,21 @@ define([
         'ngSanitize',
         'ngStorage',
         'portal',
-    ])
-    .config(['$routeProvider', '$locationProvider',
-      function($routeProvider, $locationProvider) {
-        $locationProvider.html5Mode(true);
-        // IMPORTANT: Keep theses paths in sync with web.xml for html5mode
-        $routeProvider
-          .when('/home', homeRoutes.home)
-          .when('/settings', settingsRoutes.betaSettings)
-          .when('/user-settings', settingsRoutes.userSettings)
-          .when('/about', aboutRoute)
-          .when('/access-denied', mainRoutes.accessDenied)
-          .otherwise({'redirectTo': '/home'});
-    }]);
-});
+      ])
+      .config([
+        '$routeProvider',
+        '$locationProvider',
+        function($routeProvider, $locationProvider) {
+          $locationProvider.html5Mode(true);
+          // IMPORTANT: Keep theses paths in sync with web.xml for html5mode
+          $routeProvider
+            .when('/home', homeRoutes.home)
+            .when('/settings', settingsRoutes.betaSettings)
+            .when('/user-settings', settingsRoutes.userSettings)
+            .when('/about', aboutRoute)
+            .when('/access-denied', mainRoutes.accessDenied)
+            .otherwise({redirectTo: '/home'});
+        },
+      ]);
+  }
+);
diff --git a/src/main/webapp/my-app/my-app.css b/src/main/webapp/my-app/my-app.css
@@ -3,26 +3,26 @@
 }
 
 .widget-creator .portlet-body {
-	padding: 10px;
+  padding: 10px;
 }
 
 .widget-creator .container__select-template {
-	padding-bottom: 20px;
+  padding-bottom: 20px;
 }
 
 .widget-creator preview-widget {
-	width: 300px;
+  width: 300px;
 }
 
 .widget-creator .help-notes p {
-	color: #999;
-	font-size: 12px;
-	margin-bottom: 0;
+  color: #999;
+  font-size: 12px;
+  margin-bottom: 0;
 }
 
 .widget-creator textarea {
-	padding: 10px 14px;
-	overflow-y: scroll;
+  padding: 10px 14px;
+  overflow-y: scroll;
 }
 
 .widget-creator .hint {
@@ -41,26 +41,28 @@
 }
 
 .widget-creator ::-webkit-input-placeholder {
-	color: @grayscale6;
-	font-size: 12px;
+  color: @grayscale6;
+  font-size: 12px;
 }
 
-.widget-creator  :-moz-placeholder { /* Firefox 18- */
-	color: @grayscale6;
-	font-size: 12px;
+.widget-creator :-moz-placeholder {
+  /* Firefox 18- */
+  color: @grayscale6;
+  font-size: 12px;
 }
 
-.widget-creator  ::-moz-placeholder {  /* Firefox 19+ */
-	color: @grayscale6;
-	font-size: 12px;
+.widget-creator ::-moz-placeholder {
+  /* Firefox 19+ */
+  color: @grayscale6;
+  font-size: 12px;
 }
 
-.widget-creator  :-ms-input-placeholder {
-	color: @grayscale6;
-	font-size: 12px;
+.widget-creator :-ms-input-placeholder {
+  color: @grayscale6;
+  font-size: 12px;
 }
 
 .widget-middle {
-	width: 315px;
-	margin: auto;
+  width: 315px;
+  margin: auto;
 }