diff --git a/app/views/dashboard/components/index.blade.php b/app/views/dashboard/components/index.blade.php
index 8ed3cc92..8d8bad6a 100644
--- a/app/views/dashboard/components/index.blade.php
+++ b/app/views/dashboard/components/index.blade.php
@@ -1,7 +1,11 @@
@extends('layout.dashboard')
@section('content')
-
@stop
diff --git a/app/views/dashboard/groups.blade.php b/app/views/dashboard/groups.blade.php
new file mode 100644
index 00000000..2f7e6dd9
--- /dev/null
+++ b/app/views/dashboard/groups.blade.php
@@ -0,0 +1,36 @@
+@extends('layout.dashboard')
+
+@section('content')
+@if(isset($subMenu))
+@include('partials.dashboard.sub-sidebar')
+@endif
+
+
+
+
+
+ @forelse($groups as $group)
+
+
+ {{ $group->name }}
+
+
+
+ @empty
+
You should add a component.
+ @endforelse
+
+
+
+@stop
diff --git a/src/Http/Controllers/DashComponentController.php b/src/Http/Controllers/DashComponentController.php
index 68ab7c19..059c55bf 100644
--- a/src/Http/Controllers/DashComponentController.php
+++ b/src/Http/Controllers/DashComponentController.php
@@ -3,13 +3,39 @@
namespace CachetHQ\Cachet\Http\Controllers;
use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\ComponentGroup;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\URL;
use Illuminate\Support\Facades\View;
class DashComponentController extends Controller
{
+ protected $subMenu = [];
+ protected $subTitle = 'Components';
+
+ public function __construct()
+ {
+ $this->subMenu = [
+ 'components' => [
+ 'title' => 'Components',
+ 'url' => URL::route('dashboard.components'),
+ 'icon' => 'ion-ios-keypad',
+ 'active' => false,
+ ],
+ 'groups' => [
+ 'title' => 'Component Groups',
+ 'url' => URL::route('dashboard.components.groups'),
+ 'icon' => 'ion-folder',
+ 'active' => false,
+ ],
+ ];
+
+ View::share('subTitle', $this->subTitle);
+ View::share('subMenu', $this->subMenu);
+ }
+
/**
* Shows the components view.
*
@@ -19,9 +45,28 @@ class DashComponentController extends Controller
{
$components = Component::orderBy('order')->orderBy('created_at')->get();
+ $this->subMenu['components']['active'] = true;
+
return View::make('dashboard.components.index')->with([
'pageTitle' => 'Components - Dashboard',
'components' => $components,
+ 'subMenu' => $this->subMenu,
+ ]);
+ }
+
+ /**
+ * Shows the component groups view.
+ *
+ * @return \Illuminate\View\View
+ */
+ public function showComponentGroups()
+ {
+ $this->subMenu['groups']['active'] = true;
+
+ return View::make('dashboard.groups')->with([
+ 'pageTitle' => 'Component Groups - Dashboard',
+ 'groups' => ComponentGroup::all(),
+ 'subMenu' => $this->subMenu,
]);
}
@@ -34,9 +79,12 @@ class DashComponentController extends Controller
*/
public function showEditComponent(Component $component)
{
+ $groups = ComponentGroup::all();
+
return View::make('dashboard.components.edit')->with([
'pageTitle' => 'Editing "'.$component->name.'" Component - Dashboard',
'component' => $component,
+ 'groups' => $groups,
]);
}
@@ -62,8 +110,11 @@ class DashComponentController extends Controller
*/
public function showAddComponent()
{
+ $groups = ComponentGroup::all();
+
return View::make('dashboard.components.add')->with([
'pageTitle' => 'Add Component - Dashboard',
+ 'groups' => $groups,
]);
}
@@ -93,4 +144,25 @@ class DashComponentController extends Controller
return Redirect::back();
}
+
+ /**
+ * Shows the add component group view.
+ *
+ * @return \Illuminate\View\View
+ */
+ public function showAddComponentGroup()
+ {
+ return View::make('dashboard.components.add-group')->with([
+ 'pageTitle' => 'Create Component Group',
+ ]);
+ }
+
+ public function postAddComponentGroup()
+ {
+ $_group = Binput::get('group');
+
+ $group = ComponentGroup::create($_group);
+
+ return Redirect::back()->withGroup($group);
+ }
}
diff --git a/src/Models/Component.php b/src/Models/Component.php
index 1f9e8373..e992a676 100644
--- a/src/Models/Component.php
+++ b/src/Models/Component.php
@@ -43,7 +43,26 @@ class Component extends Model implements TransformableInterface
*
* @var string[]
*/
- protected $fillable = ['name', 'description', 'status', 'user_id', 'tags', 'link', 'order'];
+ protected $fillable = [
+ 'name',
+ 'description',
+ 'status',
+ 'user_id',
+ 'tags',
+ 'link',
+ 'order',
+ 'group_id',
+ ];
+
+ /**
+ * Components can belong to a group.
+ *
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+ */
+ public function group()
+ {
+ return $this->belongsTo('CachetHQ\Cachet\Models\ComponentGroup', 'group_id', 'id');
+ }
/**
* Lookup all of the incidents reported on the component.
diff --git a/src/Models/ComponentGroup.php b/src/Models/ComponentGroup.php
new file mode 100644
index 00000000..9fda4290
--- /dev/null
+++ b/src/Models/ComponentGroup.php
@@ -0,0 +1,45 @@
+ 'required|unique:component_groups',
+ ];
+
+ /**
+ * The fillable properties.
+ *
+ * @var string[]
+ */
+ protected $fillable = ['name'];
+
+ /**
+ * A group can have many components.
+ *
+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
+ */
+ public function components()
+ {
+ return $this->hasMany('CachetHQ\Cachet\Models\Component', 'id', 'group_id');
+ }
+}