ddimaria / Laravel-REST-CMS

app/LaravelRestCms/Page/Page.php

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 	/**
 	 * Joins the templates table
 	 * 
-	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function template()
     {
@@ -75,7 +75,7 @@ 
 	/**
 	 * Joins the seo table
 	 * 
-	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function seo()
     {
@@ -85,7 +85,7 @@ 
 	/**
 	 * Joins the pages table
 	 * 
-	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function parent()
     {

Indentation +69 added lines, -69 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * Rules to validate when creating a model
 	 * 
-	* @var array
+	 * @var array
 	 */
 	protected static $createRules = [
 		'parent_id' => 'integer',
@@ -48,7 +48,7 @@ 
 	/**
 	 * Indicates if the model should be attributed with created_by and updated_by
 	 * 
-	* @var bool
+	 * @var bool
 	 */
 	public $attirbution = true;
 
@@ -58,9 +58,9 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function detail()
-    {
-        return $this->hasMany(PageDetail::class, 'page_id', 'id');
-    }
+	{
+		return $this->hasMany(PageDetail::class, 'page_id', 'id');
+	}
 
 	/**
 	 * Joins the templates table
@@ -68,9 +68,9 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
 	 */
 	public function template()
-    {
-        return $this->hasMany(Template::class, 'id', 'template_id');
-    }
+	{
+		return $this->hasMany(Template::class, 'id', 'template_id');
+	}
 
 	/**
 	 * Joins the seo table
@@ -78,9 +78,9 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
 	 */
 	public function seo()
-    {
-        return $this->hasMany(Seo::class, 'id', 'seo_id');
-    }
+	{
+		return $this->hasMany(Seo::class, 'id', 'seo_id');
+	}
 
 	/**
 	 * Joins the pages table
@@ -88,64 +88,64 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
 	 */
 	public function parent()
-    {
-        return $this->hasMany(Page::class, 'id', 'parent_id');
-    }
-
-    /**
-     * Returns a page and associated detail and template data
-     * 
-     * @param  string $slug
-     * @return array
-     */
-    public function showBySlug($slug)
-    {        
-        $data = Page::where(['url' => $slug])->with('template', 'detail.templateDetail')->firstOrFail();
+	{
+		return $this->hasMany(Page::class, 'id', 'parent_id');
+	}
+
+	/**
+	 * Returns a page and associated detail and template data
+	 * 
+	 * @param  string $slug
+	 * @return array
+	 */
+	public function showBySlug($slug)
+	{        
+		$data = Page::where(['url' => $slug])->with('template', 'detail.templateDetail')->firstOrFail();
         
-        return $this->packagePage($data);
-    }
-
-    /**
-     * Pacages a Page collection into an array for public consumption
-     * 
-     * @param  Page   $data 
-     * @return array
-     */
-    protected function packagePage(Page $data)
-    {
-    	$seo = $data->seo->first();
-    	$template = $data->template->first();
+		return $this->packagePage($data);
+	}
+
+	/**
+	 * Pacages a Page collection into an array for public consumption
+	 * 
+	 * @param  Page   $data 
+	 * @return array
+	 */
+	protected function packagePage(Page $data)
+	{
+		$seo = $data->seo->first();
+		$template = $data->template->first();
     	
-    	$page = [
-        	'nav_name' => $data->nav_name,
-        	'url' => $data->url,
-        	'title' => $data->title,
-        	'vars' => [],
-        	'template' => [
-        		'name' => $template->name,
-	            'class' => $template->class,
-	            'method' => $template->method,
-	            'params' => $template->params,
-	            'template_name' => $template->template_name,
-	            'layout' => $template->layout,
-        	],
-        	'seo' => [
-        		'title' => $seo->title, 
-	            'keywords' => $seo->keywords, 
-	            'description' => $seo->description,
-	            'og_title' => $seo->og_title,
-	            'og_description' => $seo->og_description,
-	            'og_image' => $seo->og_image,
-	            'og_type' => $seo->og_type,
-	            'fb_app_id' => $seo->fb_app_id,
-	            'meta' => $seo->meta,
-        	]
-        ];
-
-        foreach ($data->detail as $detail) {
-        	$page['vars'][$detail->templateDetail->first()->var] = $detail->data;
-        }
-
-        return $page;
-    }
+		$page = [
+			'nav_name' => $data->nav_name,
+			'url' => $data->url,
+			'title' => $data->title,
+			'vars' => [],
+			'template' => [
+				'name' => $template->name,
+				'class' => $template->class,
+				'method' => $template->method,
+				'params' => $template->params,
+				'template_name' => $template->template_name,
+				'layout' => $template->layout,
+			],
+			'seo' => [
+				'title' => $seo->title, 
+				'keywords' => $seo->keywords, 
+				'description' => $seo->description,
+				'og_title' => $seo->og_title,
+				'og_description' => $seo->og_description,
+				'og_image' => $seo->og_image,
+				'og_type' => $seo->og_type,
+				'fb_app_id' => $seo->fb_app_id,
+				'meta' => $seo->meta,
+			]
+		];
+
+		foreach ($data->detail as $detail) {
+			$page['vars'][$detail->templateDetail->first()->var] = $detail->data;
+		}
+
+		return $page;
+	}
 }

app/LaravelRestCms/Page/PageTransformer.php

Doc Comments +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
      * Include Page Detail
      * 
      * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeDetail(Page $page)
     {
@@ -65,7 +65,7 @@ 
      * Include Template
      *
      * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeTemplate(Page $page)
     {
@@ -76,7 +76,7 @@ 
      * Include Seo
      *
      * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeSeo(Page $page)
     {

Indentation +56 added lines, -56 removed lines

@@ -11,7 +11,7 @@ 
 
 class PageTransformer extends BaseTransformer {
 
-    use HierarchyTransformerTrait;
+	use HierarchyTransformerTrait;
 
 	/**
 	 * List of resources possible to include
@@ -21,65 +21,65 @@ 
 	protected $availableIncludes = [
 		'detail',
 		'template',
-        'seo',
+		'seo',
 	];
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setupHierarchy(self::class, 'parent');
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->setupHierarchy(self::class, 'parent');
+	}
 
-    /**
-     * Transforms a Page model
-     * 
-     * @param  \App\LaravelRestCms\BaseModel $page
-     * @return array
-     */
-    public function transform(BaseModel $page)
-    {
-        return [
-            'id' => (int) $page->id,
-            'parent_id' => (int)$page->parent_id,
-            'template_id' => (int) $page->template_id,
-            'nav_name' => $page->nav_name,
-            'url' => $page->url,
-            'title' => $page->title,
-        ];
-    }
+	/**
+	 * Transforms a Page model
+	 * 
+	 * @param  \App\LaravelRestCms\BaseModel $page
+	 * @return array
+	 */
+	public function transform(BaseModel $page)
+	{
+		return [
+			'id' => (int) $page->id,
+			'parent_id' => (int)$page->parent_id,
+			'template_id' => (int) $page->template_id,
+			'nav_name' => $page->nav_name,
+			'url' => $page->url,
+			'title' => $page->title,
+		];
+	}
 
-    /**
-     * Include Page Detail
-     * 
-     * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeDetail(Page $page)
-    {
-        return $this->collection($page->detail, new PageDetailTransformer);
-    }
+	/**
+	 * Include Page Detail
+	 * 
+	 * @param \App\LaravelRestCms\Page\Page
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeDetail(Page $page)
+	{
+		return $this->collection($page->detail, new PageDetailTransformer);
+	}
 
-    /**
-     * Include Template
-     *
-     * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeTemplate(Page $page)
-    {
-        return $this->collection($page->template, new TemplateTransformer);
-    }
+	/**
+	 * Include Template
+	 *
+	 * @param \App\LaravelRestCms\Page\Page
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeTemplate(Page $page)
+	{
+		return $this->collection($page->template, new TemplateTransformer);
+	}
 
-    /**
-     * Include Seo
-     *
-     * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeSeo(Page $page)
-    {
-        return $this->collection($page->seo, new SeoTransformer);
-    }
+	/**
+	 * Include Seo
+	 *
+	 * @param \App\LaravelRestCms\Page\Page
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeSeo(Page $page)
+	{
+		return $this->collection($page->seo, new SeoTransformer);
+	}
 }
\ No newline at end of file

app/LaravelRestCms/Seo/SeoTransformer.php

Doc Comments -1 removed lines

@@ -15,7 +15,6 @@
     /**
      * Transforms a Page model
      * 
-     * @param  \App\LaravelRestCms\BaseModel $page
      * @return array
      */
     public function transform(BaseModel $seo)

Indentation +21 added lines, -21 removed lines

@@ -12,25 +12,25 @@
 	 */
 	protected $availableIncludes = [];
 
-    /**
-     * Transforms a Page model
-     * 
-     * @param  \App\LaravelRestCms\BaseModel $page
-     * @return array
-     */
-    public function transform(BaseModel $seo)
-    {
-        return [
-            'id' => (int) $seo->id,
-            'title' => $seo->title, 
-            'keywords' => $seo->keywords, 
-            'description' => $seo->description,
-            'og_title' => $seo->og_title,
-            'og_description' => $seo->og_description,
-            'og_image' => $seo->og_image,
-            'og_type' => $seo->og_type,
-            'fb_app_id' => $seo->fb_app_id,
-            'meta' => $seo->meta,
-        ];
-    }
+	/**
+	 * Transforms a Page model
+	 * 
+	 * @param  \App\LaravelRestCms\BaseModel $page
+	 * @return array
+	 */
+	public function transform(BaseModel $seo)
+	{
+		return [
+			'id' => (int) $seo->id,
+			'title' => $seo->title, 
+			'keywords' => $seo->keywords, 
+			'description' => $seo->description,
+			'og_title' => $seo->og_title,
+			'og_description' => $seo->og_description,
+			'og_image' => $seo->og_image,
+			'og_type' => $seo->og_type,
+			'fb_app_id' => $seo->fb_app_id,
+			'meta' => $seo->meta,
+		];
+	}
 }

app/LaravelRestCms/Seo/Seo.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	/**
 	 * Rules to validate when creating a model
 	 * 
-	* @var array
+	 * @var array
 	 */
 	protected static $createRules = [	
 		'first_name' => 'required',

app/Http/Controllers/API/V1/PageController.php

Indentation +32 added lines, -32 removed lines

@@ -39,41 +39,41 @@
 		],
 	];
 
-    /**
-     * Returns a page and associated detail and template data
-     * 
-     * @param  string $slug
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showBySlug($slug)
-    {        
-        try {
-            return \Response::json($this->model->showBySlug($slug));
+	/**
+	 * Returns a page and associated detail and template data
+	 * 
+	 * @param  string $slug
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showBySlug($slug)
+	{        
+		try {
+			return \Response::json($this->model->showBySlug($slug));
         
-        } catch (\Exception $e) {
+		} catch (\Exception $e) {
 
-            return $this->respondNotFound();
-        }
-    }
+			return $this->respondNotFound();
+		}
+	}
 
-    /**
-     * Returns a page and associated detail and template data
-     * 
-     * @param  mixed $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showWithDetail($id)
-    {        
-        $this->manager->parseIncludes([
-        	'parent',
-        	'detail',
-        	'detail.template_detail',
-        	'template',
-        	'seo',
-        	//'detail.template_detail.parent',
-        ]);
+	/**
+	 * Returns a page and associated detail and template data
+	 * 
+	 * @param  mixed $id
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showWithDetail($id)
+	{        
+		$this->manager->parseIncludes([
+			'parent',
+			'detail',
+			'detail.template_detail',
+			'template',
+			'seo',
+			//'detail.template_detail.parent',
+		]);
 
-        return $this->show($id);
-    }
+		return $this->show($id);
+	}
 
 }
\ No newline at end of file