diff --git a/.gitignore b/.gitignore index 188291eb8..a01bdcf71 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ Homestead.yaml .idea /public/plugins /public/css +/public/js/all* /public/bower /storage/images \ No newline at end of file diff --git a/app/Http/routes.php b/app/Http/routes.php index 3065f7eb5..0b723b98a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -78,7 +78,10 @@ Route::group(['middleware' => 'auth'], function() { Route::get('/pages/search/all', 'PageController@searchAll'); Route::get('/', function () { - return view('base'); + return view('home'); + }); + Route::get('/home', function () { + return view('home'); }); diff --git a/config/app.php b/config/app.php index 690d5fb96..4667c23f3 100644 --- a/config/app.php +++ b/config/app.php @@ -78,7 +78,7 @@ return [ | */ - 'key' => env('APP_KEY', 'SomeRandomString'), + 'key' => env('APP_KEY', 'AbAZchsay4uBTU33RubBzLKw203yqSqr'), 'cipher' => 'AES-256-CBC', diff --git a/gulpfile.js b/gulpfile.js index f5d59ff8e..654f78d51 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,4 @@ var elixir = require('laravel-elixir'); -//require('laravel-elixir-livereload'); /* |-------------------------------------------------------------------------- @@ -13,5 +12,6 @@ var elixir = require('laravel-elixir'); */ elixir(function(mix) { - mix.sass('styles.scss');//.livereload(); + mix.sass('styles.scss'); + mix.babel('image-manager.js'); }); diff --git a/resources/assets/js/image-manager.js b/resources/assets/js/image-manager.js new file mode 100644 index 000000000..0bece9894 --- /dev/null +++ b/resources/assets/js/image-manager.js @@ -0,0 +1,63 @@ + +class ImageList extends React.Component { + + constructor(props) { + super(props); + this.state = { + images: [], + hasMore: false, + page: 0 + }; + } + + componentDidMount() { + $.getJSON('/images/all', data => { + this.setState({ + images: data.images, + hasMore: data.hasMore + }); + }); + } + + loadMore() { + this.state.page++; + $.getJSON('/images/all/' + this.state.page, data => { + this.setState({ + images: this.state.images.concat(data.images), + hasMore: data.hasMore + }); + }); + } + + render() { + var images = this.state.images.map(function(image) { + return ( +
+ +
+ ); + }); + return ( +
+ {images} +
Load More
+
+ ); + } + +} + +class ImageManager extends React.Component { + render() { + return ( +
+ +
+ ); + } +} + +React.render( + , + document.getElementById('container') +); \ No newline at end of file diff --git a/resources/assets/sass/image-manager.scss b/resources/assets/sass/image-manager.scss index d892f83a9..2bff88dd8 100644 --- a/resources/assets/sass/image-manager.scss +++ b/resources/assets/sass/image-manager.scss @@ -9,7 +9,7 @@ border-radius: 4px; box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3); overflow: hidden; - .image-manager-display img { + .image-list img { border-radius: 0; float: left; margin: 1px; @@ -36,34 +36,23 @@ pointer-events: none; } } -.image-manager-left { - background-color: #FFF; +.image-manager-display-wrap { + height: 100%; + padding-top: 87px; + position: absolute; + top: 0;width: 100%; +} +.image-manager-display { height: 100%; width: 100%; text-align: left; - position: relative; - .image-manager-display-wrap { - height: 100%; - padding-top: 87px; - position: absolute; - top: 0;width: 100%; - } - .image-manager-display { - height: 100%; - width: 100%; - text-align: left; - overflow-y: scroll; - } - .image-manager-header { - z-index: 50; - position: relative; - } + overflow-y: scroll; } #image-manager .load-more { width: 150px; height: 150px; - display: none; + display: block; float: left; text-align: center; background-color: #888; diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index f62331329..d1450f7cf 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -10,6 +10,7 @@ + diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php new file mode 100644 index 000000000..e158087fc --- /dev/null +++ b/resources/views/home.blade.php @@ -0,0 +1,5 @@ +@extends('base') + +@section('content') +
+@stop \ No newline at end of file