From d84a0c0eff757aa79951ebd1879e69319908a56b Mon Sep 17 00:00:00 2001 From: fontanellif Date: Sat, 12 Nov 2016 19:40:01 +0100 Subject: [PATCH 1/4] Add Homestead --- .../default/virtualbox/action_provision | 1 + .../default/virtualbox/action_set_name | 1 + .../machines/default/virtualbox/creator_uid | 1 + .vagrant/machines/default/virtualbox/id | 1 + .../machines/default/virtualbox/index_uuid | 1 + .../machines/default/virtualbox/private_key | 27 ++++++++++ .../default/virtualbox/synced_folders | 1 + Vagrantfile | 28 +++++++++++ composer.json | 3 +- composer.lock | 50 ++++++++++++++++++- 10 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 .vagrant/machines/default/virtualbox/action_provision create mode 100644 .vagrant/machines/default/virtualbox/action_set_name create mode 100644 .vagrant/machines/default/virtualbox/creator_uid create mode 100644 .vagrant/machines/default/virtualbox/id create mode 100644 .vagrant/machines/default/virtualbox/index_uuid create mode 100644 .vagrant/machines/default/virtualbox/private_key create mode 100644 .vagrant/machines/default/virtualbox/synced_folders create mode 100644 Vagrantfile diff --git a/.vagrant/machines/default/virtualbox/action_provision b/.vagrant/machines/default/virtualbox/action_provision new file mode 100644 index 0000000..ae155ff --- /dev/null +++ b/.vagrant/machines/default/virtualbox/action_provision @@ -0,0 +1 @@ +1.5:2e6108b8-4dfe-49b1-85a7-cab9fd54f243 \ No newline at end of file diff --git a/.vagrant/machines/default/virtualbox/action_set_name b/.vagrant/machines/default/virtualbox/action_set_name new file mode 100644 index 0000000..4dd8847 --- /dev/null +++ b/.vagrant/machines/default/virtualbox/action_set_name @@ -0,0 +1 @@ +1478975685 \ No newline at end of file diff --git a/.vagrant/machines/default/virtualbox/creator_uid b/.vagrant/machines/default/virtualbox/creator_uid new file mode 100644 index 0000000..ec52cb8 --- /dev/null +++ b/.vagrant/machines/default/virtualbox/creator_uid @@ -0,0 +1 @@ +501 \ No newline at end of file diff --git a/.vagrant/machines/default/virtualbox/id b/.vagrant/machines/default/virtualbox/id new file mode 100644 index 0000000..7bfabe1 --- /dev/null +++ b/.vagrant/machines/default/virtualbox/id @@ -0,0 +1 @@ +2e6108b8-4dfe-49b1-85a7-cab9fd54f243 \ No newline at end of file diff --git a/.vagrant/machines/default/virtualbox/index_uuid b/.vagrant/machines/default/virtualbox/index_uuid new file mode 100644 index 0000000..e500b46 --- /dev/null +++ b/.vagrant/machines/default/virtualbox/index_uuid @@ -0,0 +1 @@ +426ce599211a4f3d97a0634dbadf7f75 \ No newline at end of file diff --git a/.vagrant/machines/default/virtualbox/private_key b/.vagrant/machines/default/virtualbox/private_key new file mode 100644 index 0000000..061f6f0 --- /dev/null +++ b/.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----- diff --git a/.vagrant/machines/default/virtualbox/synced_folders b/.vagrant/machines/default/virtualbox/synced_folders new file mode 100644 index 0000000..225e204 --- /dev/null +++ b/.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}}} \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..5c81259 --- /dev/null +++ b/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 diff --git a/composer.json b/composer.json index 1a2b081..a91832d 100644 --- a/composer.json +++ b/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": [ diff --git a/composer.lock b/composer.lock index 38fab74..627fec4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a1a937d192813240363a6c990d1b8142", - "content-hash": "12ebb9df02df084fb6d26b06775dc9a4", + "hash": "2193af37e428823530ebfd285a569bb9", + "content-hash": "a4d1d2badbacce02e8af7d933b9fbae9", "packages": [ { "name": "asm89/stack-cors", @@ -3178,6 +3178,52 @@ ], "time": "2015-05-11 14:41:42" }, + { + "name": "laravel/homestead", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/laravel/homestead.git", + "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/homestead/zipball/705449c3dbedbded4bd4f3ed725303c69253cad4", + "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/console": "~2.3|~3.0", + "symfony/process": "~2.3|~3.0" + }, + "bin": [ + "homestead" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Homestead\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "A virtual machine for web artisans.", + "time": "2016-02-16 22:31:00" + }, { "name": "mockery/mockery", "version": "0.9.5", From 0c65cddb3a8eda6b78a857f2afdb45a50993a670 Mon Sep 17 00:00:00 2001 From: fontanellif Date: Sat, 12 Nov 2016 20:12:27 +0100 Subject: [PATCH 2/4] update bootstrap to 3.3.7 update admin-lte to 2.3.8 --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 2d75b6f..f1f7c58 100644 --- a/bower.json +++ b/bower.json @@ -19,8 +19,8 @@ "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", From 4d1c06de887a8aca62e50681883452a60f685e05 Mon Sep 17 00:00:00 2001 From: fontanellif Date: Sun, 13 Nov 2016 23:52:52 +0100 Subject: [PATCH 3/4] add angular-flot and flot chart example page --- .../charts-flot/charts-flot.component.html | 116 ++++++++++++++++++ .../charts-flot/charts-flot.component.js | 28 +++++ .../components/charts-flot/charts-flot.scss | 0 .../nav-sidebar/nav-sidebar.component.html | 2 +- angular/app/pages/layout/layout.page.html | 5 +- angular/config/routes.config.js | 11 ++ angular/index.components.js | 2 + angular/index.modules.js | 2 +- bower.json | 4 +- 9 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 angular/app/components/charts-flot/charts-flot.component.html create mode 100644 angular/app/components/charts-flot/charts-flot.component.js create mode 100644 angular/app/components/charts-flot/charts-flot.scss diff --git a/angular/app/components/charts-flot/charts-flot.component.html b/angular/app/components/charts-flot/charts-flot.component.html new file mode 100644 index 0000000..e388160 --- /dev/null +++ b/angular/app/components/charts-flot/charts-flot.component.html @@ -0,0 +1,116 @@ +
+

Flot ChartPreview sample

+
    +
  1. Home
    2. +
  2. Charts
    3. +
  3. Flot
    4. +
+
+
+
+
+
+
+

Interactive Area Chart

+
+ + +
+
+
+ + +
+
+
+
+
+
+
+

Line Chart

+
+ + +
+
+
+
+
+

+ Sales: 1 Jan, 2014 - 30 Jul, 2014 +

+
+ + +
+
+
+
+
+
+
+
+
+
+
+

Donut Chart

+
+ + +
+
+
+
+
+
+ + +
+
+
+
    +
  • Chrome
    • +
  • IE
    • +
  • FireFox
    • +
  • Safari
    • +
  • Opera
    • +
  • Navigator
    • +
+
+
+
+
+ +
+
+
+
+
+
+

Bar Chart

+
+ + +
+
+
+
+
+

+ Sales: 1 Jan, 2014 - 30 Jul, 2014 +

+
+ + +
+
+
+
+
+
+
+
diff --git a/angular/app/components/charts-flot/charts-flot.component.js b/angular/app/components/charts-flot/charts-flot.component.js new file mode 100644 index 0000000..d06c3ef --- /dev/null +++ b/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: {} +} diff --git a/angular/app/components/charts-flot/charts-flot.scss b/angular/app/components/charts-flot/charts-flot.scss new file mode 100644 index 0000000..e69de29 diff --git a/angular/app/components/nav-sidebar/nav-sidebar.component.html b/angular/app/components/nav-sidebar/nav-sidebar.component.html index 0f1c5ee..221a1fc 100644 --- a/angular/app/components/nav-sidebar/nav-sidebar.component.html +++ b/angular/app/components/nav-sidebar/nav-sidebar.component.html @@ -70,7 +70,7 @@ diff --git a/angular/app/pages/layout/layout.page.html b/angular/app/pages/layout/layout.page.html index e5d1282..834b657 100644 --- a/angular/app/pages/layout/layout.page.html +++ b/angular/app/pages/layout/layout.page.html @@ -1,5 +1,8 @@ +
-
\ No newline at end of file +
+
+ \ No newline at end of file diff --git a/angular/config/routes.config.js b/angular/config/routes.config.js index a2cfaea..926e485 100644 --- a/angular/config/routes.config.js +++ b/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: '' + } + } + }) .state('app.comingsoon', { url: '/comingsoon', data: { diff --git a/angular/index.components.js b/angular/index.components.js index 9d700cf..f163870 100644 --- a/angular/index.components.js +++ b/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) diff --git a/angular/index.modules.js b/angular/index.modules.js index 92e4949..423ea36 100644 --- a/angular/index.modules.js +++ b/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' ]) diff --git a/bower.json b/bower.json index f1f7c58..6f8f1eb 100644 --- a/bower.json +++ b/bower.json @@ -25,7 +25,9 @@ "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" From d243b7ae8d9d5a097790ade3c1ba2ee06e5fab7e Mon Sep 17 00:00:00 2001 From: fontanellif Date: Mon, 14 Nov 2016 00:01:47 +0100 Subject: [PATCH 4/4] test --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 32aa247..2ac4f8e 100644 --- a/.travis.yml +++ b/.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: