diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php new file mode 100644 index 000000000..ad87188b7 --- /dev/null +++ b/app/Http/Controllers/HomeController.php @@ -0,0 +1,43 @@ +activityService = $activityService; + $this->bookRepo = $bookRepo; + } + + + /** + * Display the homepage. + * + * @return Response + */ + public function index() + { + $books = $this->bookRepo->getAll(); + $activity = $this->activityService->latest(); + return view('home', ['books' => $books, 'activity' => $activity]); + } + +} diff --git a/app/Http/routes.php b/app/Http/routes.php index ecda75793..a6cda78e6 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -79,12 +79,9 @@ Route::group(['middleware' => 'auth'], function() { // Search Route::get('/pages/search/all', 'PageController@searchAll'); - Route::get('/', function () { - return view('home'); - }); - Route::get('/home', function () { - return view('home'); - }); + // Other Pages + Route::get('/', 'HomeController@index'); + Route::get('/home', 'HomeController@index'); }); diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php index 651723018..f0c527586 100644 --- a/app/Services/ActivityService.php +++ b/app/Services/ActivityService.php @@ -19,7 +19,6 @@ class ActivityService $this->user = Auth::user(); } - /** * Add activity data to database. * @para Entity $entity @@ -54,4 +53,15 @@ class ActivityService $this->activity->save(); } + /** + * Gets the latest activity. + * @param int $count + * @param int $page + */ + public function latest($count = 20, $page = 0) + { + return $this->activity->orderBy('created_at', 'desc') + ->skip($count*$page)->take($count)->get(); + } + } \ No newline at end of file diff --git a/bower.json b/bower.json index 7798e591a..671b0a164 100644 --- a/bower.json +++ b/bower.json @@ -18,6 +18,7 @@ "tinymce-dist": "~4.2.1", "bootstrap": "~3.3.5", "jquery-sortable": "~0.9.13", - "material-design-iconic-font": "~2.1.1" + "material-design-iconic-font": "~2.1.1", + "vue": "~0.12.10" } } diff --git a/package.json b/package.json index ecbb47b05..e28a44f23 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "laravel-elixir-livereload": "0.0.3" }, "dependencies": { - "laravel-elixir": "^2.0.0", - "bootstrap-sass": "^3.0.0" + "bootstrap-sass": "^3.0.0", + "laravel-elixir": "^2.0.0" } } diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index b967ed94c..23e7c900f 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -46,12 +46,13 @@ header { } .logo-container { - padding: $-xl $-s $-l $-s; + padding: $-l $-s; color: #CCC; .logo { + display: block; font-size: 2em; font-weight: bold; - margin-bottom: $-m; + padding: $-m 0; } i { padding-right: $-s; @@ -63,11 +64,12 @@ header { input { width: 100%; border-radius: 0; - padding: $-s $-m; + padding: $-m; background-color: rgba(0, 0, 0, 0.1); border: none; border-top: 1px solid #333; border-bottom: 1px solid #333; + color: #EEE; } } diff --git a/resources/lang/en/activities.php b/resources/lang/en/activities.php index b733eb11b..3f1f8def1 100644 --- a/resources/lang/en/activities.php +++ b/resources/lang/en/activities.php @@ -22,5 +22,6 @@ return [ 'book_create' => 'created book', 'book_update' => 'updated book', 'book_delete' => 'deleted book', + 'book_sort' => 'sorted book', ]; \ No newline at end of file diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index a9f16f9f4..e6c601ef3 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -12,7 +12,7 @@ - + - @stop \ No newline at end of file diff --git a/resources/views/pages/create.blade.php b/resources/views/pages/create.blade.php index f7b6f92e9..4d1443fca 100644 --- a/resources/views/pages/create.blade.php +++ b/resources/views/pages/create.blade.php @@ -2,8 +2,6 @@ @section('head') - - @stop @section('content') @@ -17,4 +15,5 @@ @section('bottom') @include('pages/image-manager') + @stop \ No newline at end of file diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index 421344774..987456e34 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -15,6 +15,5 @@ @section('bottom') @include('pages/image-manager') -
@stop \ No newline at end of file diff --git a/resources/views/partials/activity-list.blade.php b/resources/views/partials/activity-list.blade.php index fb8f4b8d3..11d0d17ea 100644 --- a/resources/views/partials/activity-list.blade.php +++ b/resources/views/partials/activity-list.blade.php @@ -1,11 +1,11 @@ {{--Requires an entity to be passed with the name $entity--}} -@if(count($entity->recentActivity()) > 0) +@if(count($activity) > 0)
- @foreach($entity->recentActivity() as $activity) + @foreach($activity as $activityItem)
- @include('partials/activity-item') + @include('partials/activity-item', ['activity' => $activityItem])
@endforeach