Master

.travis.yml

@@ -24,6 +24,7 @@ before_script:
   - php artisan migrate --force
   - php artisan key:generate
   - npm install
+  - npm rebuild node-sass
   - bower install
 
 script:

.vagrant/machines/default/virtualbox/action_provision

@@ -0,0 +1 @@
+1.5:2e6108b8-4dfe-49b1-85a7-cab9fd54f243

.vagrant/machines/default/virtualbox/action_set_name

@@ -0,0 +1 @@
+1478975685

.vagrant/machines/default/virtualbox/creator_uid

@@ -0,0 +1 @@
+501

.vagrant/machines/default/virtualbox/id

@@ -0,0 +1 @@
+2e6108b8-4dfe-49b1-85a7-cab9fd54f243

.vagrant/machines/default/virtualbox/index_uuid

@@ -0,0 +1 @@
+426ce599211a4f3d97a0634dbadf7f75

.vagrant/machines/default/virtualbox/private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA7rNdTaJvOREP0iHMzPbJIkxGXOl3hjwmWMXLDmdNvJ7zEp40
+qMGRDYD/9uBzaYS2LRYpls2Zf57gLf7srPjkiXBiHSPmkFzP/T3/h5YnLEDLAiah
+0YS/aOuH2HsR9yReYh+9pplCKrsmuRIf9U7RcVoTfYFc74CCQmPkh/iF9XQzYOrv
+FMXa5S22bb+KMsTj6RisuPN4POGo6g42H+3PRESIZvgYkWpgdud3MIW7zYirSf9f
+ExEY6sUcw68U9JBkjml3LFWIMYTwUqlXEGaABs0FLwJZNhOB9z7Mhp6eKO/vNUC6
+3yU/KMDLsWXSfh+/2aaBtM6F0yPHQGbG/t5mQQIDAQABAoIBAQDkQEecERNh8lq6
+iO+ZnvK+BUnTVrygc6wHfzuoTkgbcbLlvrqEFHRsAUrB++bgo7LAckzak0eQrY+Y
+7AfNb0K52ek4DDhRGy8X7c0HDiHvQxXcvKxH+TQ/U9nWu/h15yUJl2h2gl6vFb71
+gctlezTzuzqf7K+9pZjpezPwgUk3Z0kth9RxcS3Yq4GsfnADKdXtrGF4GRM5NF0w
+49ZVyK8eG5Cuu0yGMzt0zytgFcfUluKWbO59QNhfW8qGmNWeZuzwZ4IleqPJ4Fh8
+3etaK5JIyIopi1wGLL+8QeBXMxwDeOfs/bTlyLFUgyACnq7+KsReSiZL3by0NYnH
+OrcoaFpBAoGBAP7uKC7IR08vp5c7Weh9PTQ+jNIf6O0s7p7K0NLu2whvxl6Hil/q
+uwf0uW6mvX1CjvSJg5iAohTFAVo8IesTmdTVUpyk3UOaypZDEYnSI8xaGsVHlRsD
+oJ7NnCZ4ooV+AUHoz6YJ8YY6BdVNCIcX3lM+oK/Mp4tFoia4Vzz9hv7lAoGBAO+z
+xhfDFX+Pk6RRySxhfEa/ocT6WjABjjH0On+ZuB5FT2MJjatPvYna+jfctBCNXcir
+7f00TRqZE3FXnLwb9wWJpvZzSV3hkKA8kT+bZ0TjLc0fby5XRrIrxPGsD5fhiYBr
+xnu2R7W9xgn12HFvh4/UmEo+R9pF7XrU8FHdQ7gtAoGBAJVx4caDDCKkqhdi6LL8
+8Cs3W/A2WqLnSz91X/O3qFmKxPxXcswF2/yu/yGZx82tfgZmsulsxxdr4f4W8D9R
+r0VwhMxlbXybOpXZ3Wcw9GFwlO7/pq4+cyOFHzwCTiv5kR0lMM2CWL86Nn8zeINR
+f7jHJwXH8JQZjxQpzqJncYLtAoGBANzZB+SQy1fyExfMesu3LeeJXCS+fSXJ6RdB
+bDxwhuDs/w3CmZKDL6C57txVLlopxYTEU8t8yqV88Br3m+L86QVjJD/hTHGBB916
+sGCob+daYLKjCa7qnqo+BYCdBOjs1eFKa19EPKHILZSzvC4XkhEE0SNmapFC6GDJ
+nHnwoRopAoGAFNa9gyZLiB3kyo/AMsKENCDs3EpMAzWFVA4voLDLNzW39rAkeSub
+ClIzhYLTpayEStojhQLZwhkTiQM2SSm4DFxd+FCmtqzTmddubwYHx8snRhhXu7k+
+i+KlJUUQHgEE+RBZY0dx8c/F9hRNiuVx3GDqUg1TuJTFnNLkN8FdmwE=
+-----END RSA PRIVATE KEY-----

.vagrant/machines/default/virtualbox/synced_folders

@@ -0,0 +1 @@
+{"virtualbox":{"/home/vagrant/laravel-angular-admin":{"type":null,"mount_options":[],"guestpath":"/home/vagrant/laravel-angular-admin","hostpath":"/Users/fontanellif/Code/laravel-angular-admin","disabled":false,"__vagrantfile":true},"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/fontanellif/Code/laravel-angular-admin","disabled":false,"__vagrantfile":true}}}

Vagrantfile

@@ -0,0 +1,28 @@
+require 'json'
+require 'yaml'
+
+VAGRANTFILE_API_VERSION ||= "2"
+confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__))
+
+homesteadYamlPath = "Homestead.yaml"
+homesteadJsonPath = "Homestead.json"
+afterScriptPath = "after.sh"
+aliasesPath = "aliases"
+
+require File.expand_path(confDir + '/scripts/homestead.rb')
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+    if File.exists? aliasesPath then
+        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
+    end
+
+    if File.exists? homesteadYamlPath then
+        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
+    elsif File.exists? homesteadJsonPath then
+        Homestead.configure(config, JSON.parse(File.read(homesteadJsonPath)))
+    end
+
+    if File.exists? afterScriptPath then
+        config.vm.provision "shell", path: afterScriptPath
+    end
+end

angular/app/components/charts-flot/charts-flot.component.html

@@ -0,0 +1,116 @@
+<section class="content-header">
+  <h1>Flot Chart<small>Preview sample</small></h1>
+  <ol class="breadcrumb">
+    <li><a ui-sref="app.landing"><i class="fa fa-dashboard"></i> Home</a></li>
+    <li>Charts</li>
+    <li class="active">Flot</li>
+  </ol>
+</section>
+<section class="content">
+  <div class="row">
+    <div class="col-md-6">
+      <div class="box box-primary">
+        <div class="box-header with-border">
+          <h3 class="box-title">Interactive Area Chart</h3>
+          <div class="box-tools pull-right">
+            <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+            <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+          </div>
+        </div>
+        <div class="box-body">
+          <!-- <div id="interactive" style="height: 300px;"></div> -->
+          <flot dataset="interactiveChartData" options="interactiveChartOptions" height="480px"></flot>
+          <div id="legend" style="width: 200px; height: 200px;"></div>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-6">
+      <div class="box box-info">
+        <div class="box-header with-border">
+          <h3 class="box-title">Line Chart</h3>
+          <div class="box-tools pull-right">
+            <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+            <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+          </div>
+        </div>
+        <div class="box-body">
+          <div class="row">
+            <div class="col-md-12">
+              <p class="text-center">
+                <strong>Sales: 1 Jan, 2014 - 30 Jul, 2014</strong>
+              </p>
+              <div class="chart">
+                <canvas id="line" class="chart chart-line" chart-data="vm.lineChartData" chart-labels="vm.lineChartLabels" chart-legend="false" chart-series="vm.lineChartSeries" chart-click="vm.onClick" style="height: 180px;">
+                </canvas>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="box box-danger">
+        <div class="box-header with-border">
+          <h3 class="box-title">Donut Chart</h3>
+          <div class="box-tools pull-right">
+            <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+            <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+          </div>
+        </div>
+        <div class="box-body">
+          <div class="row">
+            <div class="col-md-8">
+              <div class="chart-responsive">
+                <canvas id="doughnut" height="200" class="chart chart-doughnut" chart-data="vm.pieData" chart-labels="vm.pieLabels">
+                </canvas>
+              </div>
+            </div>
+            <div class="col-md-4">
+              <ul class="chart-legend clearfix">
+                <li><i class="fa fa-circle-o text-red"></i> Chrome</li>
+                <li><i class="fa fa-circle-o text-green"></i> IE</li>
+                <li><i class="fa fa-circle-o text-yellow"></i> FireFox</li>
+                <li><i class="fa fa-circle-o text-aqua"></i> Safari</li>
+                <li><i class="fa fa-circle-o text-light-blue"></i> Opera</li>
+                <li><i class="fa fa-circle-o text-gray"></i> Navigator</li>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <div class="box-footer no-padding">
+          <ul class="nav nav-pills nav-stacked">
+            <li><a>United States of America <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 12%</span></a></li>
+            <li><a>India <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 4%</span></a></li>
+            <li><a>China<span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-6">
+      <div class="box box-success">
+        <div class="box-header with-border">
+          <h3 class="box-title">Bar Chart</h3>
+          <div class="box-tools pull-right">
+            <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+            <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+          </div>
+        </div>
+        <div class="box-body">
+          <div class="row">
+            <div class="col-md-12">
+              <p class="text-center">
+                <strong>Sales: 1 Jan, 2014 - 30 Jul, 2014</strong>
+              </p>
+              <div class="chart">
+                <canvas id="area" class="chart chart-bar" chart-data="vm.barChartData" chart-labels="vm.barChartLabels" chart-legend="false" chart-series="vm.barChartSeries" chart-click="vm.onClick" chart-colours="vm.barChartColours" style="height: 250px;">
+                </canvas>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>

angular/app/components/charts-flot/charts-flot.component.js

@@ -0,0 +1,28 @@
+class ChartsFlotController {
+  constructor ($rootScope, $scope, $auth, $state, $stateParams, API, AclService) {
+    'ngInject'
+
+
+      $scope.interactiveChartData = [{ data: [], yaxis: 1, label: 'sin' }];
+      $scope.interactiveChartOptions = {
+      legend: {
+        container: '#legend',
+        show: true
+      }
+    };
+
+    for (var i = 0; i < 14; i += 0.5) {
+      $scope.interactiveChartData[0].data.push([i, Math.sin(i)]);
+    }
+
+  }
+
+  $onInit () {}
+}
+
+export const ChartsFlotComponent = {
+  templateUrl: './views/app/components/charts-flot/charts-flot.component.html',
+  controller: ChartsFlotController,
+  controllerAs: 'vm',
+  bindings: {}
+}

angular/app/components/nav-sidebar/nav-sidebar.component.html

@@ -70,7 +70,7 @@
         <ul class="treeview-menu">
           <li><a ui-sref="app.chartjs"><i class="fa fa-circle-o"></i> ChartJS</a></li>
           <li><a ui-sref="app.comingsoon"><i class="fa fa-circle-o"></i> Morris</a></li>
-          <li><a ui-sref="app.comingsoon"><i class="fa fa-circle-o"></i> Flot</a></li>
+          <li><a ui-sref="app.flot"><i class="fa fa-circle-o"></i> Flot</a></li>
           <li><a ui-sref="app.comingsoon"><i class="fa fa-circle-o"></i> Inline charts</a></li>
         </ul>
       </li>

angular/app/pages/layout/layout.page.html

@@ -1,5 +1,8 @@
+<div class="wrapper">
 <div ui-view="header"></div>
 <div class="content-wrapper">
     <div ui-view="main"></div>
 </div>
-<div ui-view="footer"></div>
+<div ui-view="footer"></div>
+</div>
+<!-- ./wrapper -->

angular/config/routes.config.js

@@ -129,6 +129,17 @@ export function RoutesConfig ($stateProvider, $urlRouterProvider) {
         }
       }
     })
+    .state('app.flot', {
+      url: '/charts-flot',
+      data: {
+        auth: true
+      },
+      views: {
+        'main@app': {
+          template: '<charts-flot></charts-flot>'
+        }
+      }
+    })
     .state('app.comingsoon', {
       url: '/comingsoon',
       data: {

angular/index.components.js

@@ -6,6 +6,7 @@ import { UiIconsComponent } from './app/components/ui-icons/ui-icons.component'
 import { UiGeneralComponent } from './app/components/ui-general/ui-general.component'
 import { FormsGeneralComponent } from './app/components/forms-general/forms-general.component'
 import { ChartsChartjsComponent } from './app/components/charts-chartjs/charts-chartjs.component'
+import { ChartsFlotComponent } from './app/components/charts-flot/charts-flot.component'
 import { WidgetsComponent } from './app/components/widgets/widgets.component'
 import { UserProfileComponent } from './app/components/user-profile/user-profile.component'
 import { UserVerificationComponent } from './app/components/user-verification/user-verification.component'
@@ -36,6 +37,7 @@ angular.module('app.components')
   .component('uiGeneral', UiGeneralComponent)
   .component('formsGeneral', FormsGeneralComponent)
   .component('chartsChartjs', ChartsChartjsComponent)
+  .component('chartsFlot', ChartsFlotComponent)
   .component('widgets', WidgetsComponent)
   .component('userProfile', UserProfileComponent)
   .component('userVerification', UserVerificationComponent)

angular/index.modules.js

@@ -17,5 +17,5 @@ angular.module('app.components', [
   'ui.router', 'angular-loading-bar',
   'restangular', 'ngStorage', 'satellizer',
   'ui.bootstrap', 'chart.js', 'mm.acl', 'datatables',
-  'datatables.bootstrap', 'checklist-model'
+  'datatables.bootstrap', 'checklist-model','angular-flot'
 ])

bower.json

@@ -19,13 +19,15 @@
     "angular-loading-bar": "~0.9.0",
     "satellizer": "^0.14.0",
     "angular-bootstrap": "^1.3.1",
-    "bootstrap": "^3.3.6",
-    "AdminLTE": "admin-lte#^2.3.3",
+    "bootstrap": "^3.3.7",
+    "AdminLTE": "admin-lte#^2.3.8",
     "angular-chart.js": "^0.10.0",
     "angular-acl": "^0.1.5",
     "angular-datatables": "^0.5.4",
     "sweetalert": "^1.1.3",
-    "checklist-model": "^0.9.0"
+    "checklist-model": "^0.9.0",
+    "angular-flot": "^0.0.16",
+    "Flot": "flot#^0.8.3"
   },
   "resolutions": {
     "angular": "~1.5.x"

composer.json

@@ -20,7 +20,8 @@
         "phpunit/phpunit": "~4.0",
         "symfony/css-selector": "2.8.*|3.0.*",
         "symfony/dom-crawler": "2.8.*|3.0.*",
-        "squizlabs/php_codesniffer": "*"
+        "squizlabs/php_codesniffer": "*",
+        "laravel/homestead": "^3.0"
     },
     "autoload": {
         "classmap": [