Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue 53 about show chartjs extentions in laravel admin menu #67

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

issue 53 about show chartjs extentions in laravel admin menu #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b34e5f0
issue 53 about show chartjs extentions in laravel admin menu
saber13812002 Mar 2, 2020
8ba4646
install iseed
saber13812002 Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ APP_ENV=local
APP_KEY=base64:7nCO2EKoARvPBdpIK5Z7V5qoqk28htq5GbJ7CpASidY=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost
APP_URL=http://localhost:8000

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=laravel_admin_demo
DB_DATABASE=laravel_admin_demo_1
DB_USERNAME=root
DB_PASSWORD=

Expand Down
12 changes: 7 additions & 5 deletions app/Admin/Controllers/ChartjsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,18 @@ public function index(Content $content)
$bar = view('admin.chartjs.line');
$row->column(1/3, new Box('Line chart', $bar));

})->row(function (Row $row) {

$bar = view('admin.chartjs.line-stacked');
$row->column(99/100, new Box('Chart.js Line Chart - Stacked Area', $bar));

})->row(function (Row $row) {

$bar = view('admin.chartjs.doughnut');
$row->column(1/3, new Box('Doughnut chart', $bar));
$row->column(1/2, new Box('Doughnut chart', $bar));

$scatter = view('admin.chartjs.combo-bar-line');
$row->column(1/3, new Box('Chart.js Combo Bar Line Chart', $scatter));

$bar = view('admin.chartjs.line-stacked');
$row->column(1/3, new Box('Chart.js Line Chart - Stacked Area', $bar));
$row->column(1/2, new Box('Chart.js Combo Bar Line Chart', $scatter));

});
}
Expand Down
2 changes: 1 addition & 1 deletion app/Admin/Controllers/ImageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use App\Admin\Extensions\Tools\GridView;
use App\Models\Image;
use App\Models\User;
use App\User;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
Expand Down
1 change: 1 addition & 0 deletions app/Admin/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
], 'fa-plus')->title('Create'));

$navbar->left(new Nav\Dropdown());
// $navbar->left(new Nav\Dropdown());
});


1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"laravel/tinker": "~1.0",
"maatwebsite/excel": "~2.1.0",
"matthiasmullie/minify": "^1.3",
"orangehill/iseed": "^2.6",
"spatie/eloquent-sortable": "^3.4",
"spatie/laravel-backup": "^5.0"
},
Expand Down
Loading