feat: merged with master

This commit is contained in:
Lexx YungCarter
2022-10-17 16:02:42 +03:00
26 changed files with 627 additions and 12577 deletions

View File

@@ -0,0 +1,36 @@
<?php
namespace Asantibanez\LivewireCharts\Charts;
use Asantibanez\LivewireCharts\Models\RadarChartModel;
use Livewire\Component;
/**
* Class LivewireRadarChart
* @package Asantibanez\LivewireCharts\Charts
*/
class LivewireRadarChart extends Component
{
public $radarChartModel;
public function mount(RadarChartModel $radarChartModel)
{
$this->radarChartModel = $radarChartModel->toArray();
}
public function onPointClick($point)
{
$onPointClickEventName = data_get($this->radarChartModel, 'onPointClickEventName', null);
if ($onPointClickEventName === null) {
return;
}
$this->emit($onPointClickEventName, $point);
}
public function render()
{
return view('livewire-charts::livewire-radar-chart');
}
}

View File

@@ -0,0 +1,25 @@
<?php
namespace Asantibanez\LivewireCharts\Charts;
use Asantibanez\LivewireCharts\Models\TreeMapChartModel;
use Livewire\Component;
/**
* Class LivewireTreeMapChart
* @package Asantibanez\LivewireCharts\Charts
*/
class LivewireTreeMapChart extends Component
{
public $treeMapChartModel;
public function mount(TreeMapChartModel $treeMapChartModel)
{
$this->treeMapChartModel = $treeMapChartModel->toArray();
}
public function render()
{
return view('livewire-charts::livewire-tree-map-chart');
}
}

View File

@@ -0,0 +1,17 @@
<?php
namespace Asantibanez\LivewireCharts\Console;
use Illuminate\Console\Command;
class InstallCommand extends Command
{
protected $signature = 'livewire-charts:install';
protected $description = 'Installs Livewire Charts';
public function handle()
{
$this->call('vendor:publish', ['--tag' => 'livewire-charts:public']);
}
}

View File

@@ -6,6 +6,8 @@ use Asantibanez\LivewireCharts\Models\AreaChartModel;
use Asantibanez\LivewireCharts\Models\ColumnChartModel;
use Asantibanez\LivewireCharts\Models\LineChartModel;
use Asantibanez\LivewireCharts\Models\PieChartModel;
use Asantibanez\LivewireCharts\Models\RadarChartModel;
use Asantibanez\LivewireCharts\Models\TreeMapChartModel;
use Illuminate\Support\Facades\Facade;
/**
@@ -17,6 +19,8 @@ use Illuminate\Support\Facades\Facade;
* @method static ColumnChartModel multiColumnChartModel()
* @method static AreaChartModel areaChartModel()
* @method static PieChartModel pieChartModel()
* @method static RadarChartModel radarChartModel()
* @method static TreeMapChartModel treeMapChartModel()
*/
class LivewireCharts extends Facade
{

View File

@@ -8,6 +8,8 @@ use Asantibanez\LivewireCharts\Models\AreaChartModel;
use Asantibanez\LivewireCharts\Models\ColumnChartModel;
use Asantibanez\LivewireCharts\Models\LineChartModel;
use Asantibanez\LivewireCharts\Models\PieChartModel;
use Asantibanez\LivewireCharts\Models\RadarChartModel;
use Asantibanez\LivewireCharts\Models\TreeMapChartModel;
class LivewireCharts
{
@@ -44,4 +46,14 @@ class LivewireCharts
{
return new PieChartModel;
}
public function radarChartModel()
{
return new RadarChartModel();
}
public function treeMapChartModel()
{
return new TreeMapChartModel();
}
}

View File

@@ -6,6 +6,9 @@ use Asantibanez\LivewireCharts\Charts\LivewireAreaChart;
use Asantibanez\LivewireCharts\Charts\LivewireColumnChart;
use Asantibanez\LivewireCharts\Charts\LivewireLineChart;
use Asantibanez\LivewireCharts\Charts\LivewirePieChart;
use Asantibanez\LivewireCharts\Charts\LivewireRadarChart;
use Asantibanez\LivewireCharts\Charts\LivewireTreeMapChart;
use Asantibanez\LivewireCharts\Console\InstallCommand;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\ServiceProvider;
use Livewire\Livewire;
@@ -14,7 +17,9 @@ class LivewireChartsServiceProvider extends ServiceProvider
{
public function boot()
{
$this->registerViews();
$this->registerCommands();
$this->registerViews();
$this->registerPublishables();
@@ -28,6 +33,16 @@ class LivewireChartsServiceProvider extends ServiceProvider
$this->app->bind('livewirecharts', LivewireCharts::class);
}
private function registerCommands()
{
if ($this->app->runningInConsole()) {
$this->commands([
InstallCommand::class,
]);
}
}
private function registerViews()
{
$this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-charts');
@@ -56,6 +71,8 @@ class LivewireChartsServiceProvider extends ServiceProvider
Livewire::component('livewire-column-chart', LivewireColumnChart::class);
Livewire::component('livewire-pie-chart', LivewirePieChart::class);
Livewire::component('livewire-area-chart', LivewireAreaChart::class);
Livewire::component('livewire-radar-chart', LivewireRadarChart::class);
Livewire::component('livewire-tree-map-chart', LivewireTreeMapChart::class);
}
private function registerDirectives()

View File

@@ -8,6 +8,8 @@ trait HasColors
{
private $colors;
private $enableShades;
public function setColors($colors)
{
$this->colors = $colors;
@@ -22,9 +24,25 @@ trait HasColors
return $this;
}
public function enableShades()
{
$this->enableShades = true;
return $this;
}
public function disableShades()
{
$this->enableShades = false;
return $this;
}
protected function initColors()
{
$this->colors = $this->defaultColors();
$this->enableShades = true;
}
private function defaultColors()
@@ -35,12 +53,15 @@ trait HasColors
protected function colorsFromArray($array)
{
$this->colors = data_get($array, 'colors', $this->defaultColors());
$this->enableShades = data_get($array, 'enableShades', true);
}
protected function colorsToArray()
{
return [
'colors' => $this->colors,
'enableShades' => $this->enableShades,
];
}
}

View File

@@ -13,6 +13,8 @@ class PieChartModel extends BaseChartModel
public $opacity;
public $type;
public $data;
public function __construct()
@@ -23,6 +25,8 @@ class PieChartModel extends BaseChartModel
$this->opacity = 0.75;
$this->type = 'pie';
$this->data = collect();
}
@@ -33,6 +37,13 @@ class PieChartModel extends BaseChartModel
return $this;
}
public function setType($type)
{
$this->type = $type;
return $this;
}
public function withOnSliceClickEvent($onSliceClickEventName)
{
$this->onSliceClickEventName = $onSliceClickEventName;
@@ -57,6 +68,7 @@ class PieChartModel extends BaseChartModel
return array_merge(parent::toArray(), [
'onSliceClickEventName' => $this->onSliceClickEventName,
'opacity' => $this->opacity,
'type' => $this->type,
'data' => $this->data->toArray(),
]);
}
@@ -69,6 +81,8 @@ class PieChartModel extends BaseChartModel
$this->opacity = data_get($array, 'opacity', 0.75);
$this->type = data_get($array, 'type', 'pie');
$this->data = collect(data_get($array, 'data', []));
}
}

View File

@@ -0,0 +1,95 @@
<?php
namespace Asantibanez\LivewireCharts\Models;
/**
* Class ColumnChartModel
* @package Asantibanez\LivewireCharts\Models
* @property boolean $isMultiColumn
* @property boolean $isStacked
*/
class RadarChartModel extends BaseChartModel
{
public $opacity;
public $colors;
public $onPointClickEventName;
public $data;
public function __construct()
{
parent::__construct();
$this->onPointClickEventName = null;
$this->opacity = 0.5;
$this->colors = ['#2E93fA', '#66DA26', '#546E7A', '#E91E63', '#FF9800'];
$this->data = collect();
}
public function setColors($colors)
{
$this->colors = $colors;
return $this;
}
public function setOpacity($opacity)
{
$this->opacity = $opacity;
return $this;
}
public function withOnPointClickEvent($onPointClickEventName)
{
$this->onPointClickEventName = $onPointClickEventName;
return $this;
}
public function addSeries($seriesName, $title, $value, $extras = [])
{
$series = $this->data->get($seriesName, collect());
$series->push([
'seriesName' => $seriesName,
'title' => $title,
'value' => $value,
'extras' => $extras,
]);
$this->data->put($seriesName, $series);
return $this;
}
public function toArray()
{
return array_merge(parent::toArray(), [
'onPointClickEventName' => $this->onPointClickEventName,
'opacity' => $this->opacity,
'colors' => $this->colors,
'data' => $this->data->toArray(),
]);
}
public function fromArray($array)
{
parent::fromArray($array);
$this->onPointClickEventName = data_get($array, 'onPointClickEventName', null);
$this->opacity = data_get($array, 'opacity', 0.5);
$this->colors = data_get($array, 'color', '#90cdf4');
$this->data = collect(data_get($array, 'data', []));
}
}

View File

@@ -0,0 +1,84 @@
<?php
namespace Asantibanez\LivewireCharts\Models;
/**
* Class TreeMapChartModel
* @package Asantibanez\LivewireCharts\Models
*/
class TreeMapChartModel extends BaseChartModel
{
use HasTitle;
use HasColors;
public $data;
public $distributed;
public $onBlockClickEventName;
public function __construct()
{
parent::__construct();
$this->data = collect();
$this->distributed = false;
$this->setColors(['#2E93fA']);
}
public function setDistributed($distributed)
{
$this->distributed = $distributed;
return $this;
}
public function addBlock($title, $value, $extras = [])
{
return $this->addSeriesBlock($this->title, $title, $value, $extras);
}
public function addSeriesBlock($seriesName, $title, $value, $extras = [])
{
$series = $this->data->get($seriesName, collect());
$series->push([
'seriesName' => $seriesName,
'title' => $title,
'value' => $value,
'extras' => $extras,
]);
$this->data->put($seriesName, $series);
return $this;
}
public function withOnBlockClickEvent($onBlockClickEventName)
{
$this->onBlockClickEventName = $onBlockClickEventName;
return $this;
}
public function toArray()
{
return array_merge(parent::toArray(), [
'data' => $this->data->toArray(),
'distributed' => $this->distributed,
'onBlockClickEventName' => $this->onBlockClickEventName,
]);
}
public function fromArray($array)
{
parent::fromArray($array);
$this->data = collect(data_get($array, 'data', []));
$this->distributed = data_get($array, 'distributed', false);
$this->onBlockClickEventName = data_get($array, 'onBlockClickEventName', null);
}
}