diff --git a/SRC/app/Http/Controllers/ImageController.php b/SRC/app/Http/Controllers/ImageController.php
new file mode 100644
index 0000000..f96b9bc
--- /dev/null
+++ b/SRC/app/Http/Controllers/ImageController.php
@@ -0,0 +1,56 @@
+resize($size, $size, function ($constraint) {
+ $constraint->aspectRatio();
+ });
+
+ $r = $img->response('jpg');
+
+ //Met en cache l'image avec son header pendant 2 semaine sur le serveur
+ Cache::add($key, $r, 10080*2 );
+ }
+ return $r;
+ }
+
+}
diff --git a/SRC/app/Http/routes.php b/SRC/app/Http/routes.php
index b3ab11c..fc421f7 100755
--- a/SRC/app/Http/routes.php
+++ b/SRC/app/Http/routes.php
@@ -18,6 +18,9 @@ Route::get('changerref/{id}', 'HomeController@changerRef');
Route::get('api/searchRef/{reg?}', 'APIController@refByName');
Route::get('api/searchOeuvres', 'APIController@searchOeuvres');
+//API FOR IMAGE RESIZE
+Route::get('/image/{size}/{url}', 'ImageController@getImage');
+
// LOGIN RESET
Route::get('password/reset/{token}', array(
@@ -69,4 +72,4 @@ Route::group(['middleware' => 'ifAdmin'], function ()
Route::get('admin/updateUser/{id}', 'AdminController@updateUser');
Route::get('admin/logAs/{id}', 'AdminController@logAs');
Route::get('logout', 'LoginController@logout');
-});
\ No newline at end of file
+});
diff --git a/SRC/composer.json b/SRC/composer.json
index 088060a..b82f3cb 100755
--- a/SRC/composer.json
+++ b/SRC/composer.json
@@ -5,7 +5,8 @@
"license": "MIT",
"type": "project",
"require": {
- "laravel/framework": "5.0.*"
+ "laravel/framework": "5.0.*",
+ "intervention/image": "~2.1"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
diff --git a/SRC/composer.lock b/SRC/composer.lock
index 4534b1d..cbcbda6 100755
--- a/SRC/composer.lock
+++ b/SRC/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "24c3946acc997e3f3eca7fc5c99585b2",
+ "hash": "6c08ae99a1a7676a1c006b9be992507a",
"packages": [
{
"name": "classpreloader/classpreloader",
@@ -222,6 +222,62 @@
],
"time": "2014-12-20 21:24:13"
},
+ {
+ "name": "intervention/image",
+ "version": "2.1.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Intervention/image.git",
+ "reference": "572806fd083b622dd430d76c34564459596fef2a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/572806fd083b622dd430d76c34564459596fef2a",
+ "reference": "572806fd083b622dd430d76c34564459596fef2a",
+ "shasum": ""
+ },
+ "require": {
+ "ext-fileinfo": "*",
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9.2",
+ "phpunit/phpunit": "3.*"
+ },
+ "suggest": {
+ "ext-gd": "to use GD library based image processing.",
+ "ext-imagick": "to use Imagick based image processing.",
+ "intervention/imagecache": "Caching extension for the Intervention Image library"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Intervention\\Image\\": "src/Intervention/Image"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Oliver Vogel",
+ "email": "oliver@olivervogel.net",
+ "homepage": "http://olivervogel.net/"
+ }
+ ],
+ "description": "Image handling and manipulation library with support for Laravel integration",
+ "homepage": "http://image.intervention.io/",
+ "keywords": [
+ "gd",
+ "image",
+ "imagick",
+ "laravel",
+ "thumbnail",
+ "watermark"
+ ],
+ "time": "2015-03-09 13:03:15"
+ },
{
"name": "ircmaxell/password-compat",
"version": "v1.0.4",
diff --git a/SRC/config/app.php b/SRC/config/app.php
index d97f488..faea564 100755
--- a/SRC/config/app.php
+++ b/SRC/config/app.php
@@ -144,6 +144,8 @@ return [
'App\Providers\ConfigServiceProvider',
'App\Providers\EventServiceProvider',
'App\Providers\RouteServiceProvider',
+
+ 'Intervention\Image\ImageServiceProvider'
],
@@ -192,6 +194,7 @@ return [
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
+ 'Image' => 'Intervention\Image\Facades\Image',
],
diff --git a/SRC/public/css/fonts/icomoon.eot b/SRC/public/css/fonts/icomoon.eot
index d1d3e61..a2a625d 100755
Binary files a/SRC/public/css/fonts/icomoon.eot and b/SRC/public/css/fonts/icomoon.eot differ
diff --git a/SRC/public/css/fonts/icomoon.svg b/SRC/public/css/fonts/icomoon.svg
index 7e27f08..9391c7c 100755
--- a/SRC/public/css/fonts/icomoon.svg
+++ b/SRC/public/css/fonts/icomoon.svg
@@ -9,4 +9,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/SRC/public/css/fonts/icomoon.ttf b/SRC/public/css/fonts/icomoon.ttf
index 70234e0..14dcb49 100755
Binary files a/SRC/public/css/fonts/icomoon.ttf and b/SRC/public/css/fonts/icomoon.ttf differ
diff --git a/SRC/public/css/fonts/icomoon.woff b/SRC/public/css/fonts/icomoon.woff
index 5f9f617..c08ee68 100755
Binary files a/SRC/public/css/fonts/icomoon.woff and b/SRC/public/css/fonts/icomoon.woff differ
diff --git a/SRC/public/css/fonts/style.css b/SRC/public/css/fonts/style.css
index 39eef00..28f669b 100755
--- a/SRC/public/css/fonts/style.css
+++ b/SRC/public/css/fonts/style.css
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
- src:url('./icomoon.eot?-e1jt8');
- src:url('./icomoon.eot?#iefix-e1jt8') format('embedded-opentype'),
- url('./icomoon.woff?-e1jt8') format('woff'),
- url('./icomoon.ttf?-e1jt8') format('truetype'),
- url('./icomoon.svg?-e1jt8#icomoon') format('svg');
+ src:url('icomoon.eot?-68zv75');
+ src:url('icomoon.eot?#iefix-68zv75') format('embedded-opentype'),
+ url('icomoon.woff?-68zv75') format('woff'),
+ url('icomoon.ttf?-68zv75') format('truetype'),
+ url('icomoon.svg?-68zv75#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -23,6 +23,18 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-info:before {
+ content: "\e604";
+}
+
+.icon-info-circle:before {
+ content: "\e603";
+}
+
+.icon-trophy:before {
+ content: "\e602";
+}
+
.icon-home:before {
content: "\e601";
}
@@ -31,3 +43,11 @@
content: "\e600";
}
+.icon-search:before {
+ content: "\e986";
+}
+
+.icon-spinner11:before {
+ content: "\e984";
+}
+
diff --git a/SRC/public/css/frontend.css b/SRC/public/css/frontend.css
old mode 100755
new mode 100644
index 9755de8..38f6724
--- a/SRC/public/css/frontend.css
+++ b/SRC/public/css/frontend.css
@@ -145,6 +145,7 @@ button:active {
list-style: none;
display: inline-block;
}
+<<<<<<< HEAD
#breadcrumb li {
float: left;
line-height: 40px;
@@ -227,4 +228,6 @@ button:active {
}
#breadcrumb li a:active:after {
border-left-color: #16a085;
-}
\ No newline at end of file
+}
+=======
+>>>>>>> origin/master
diff --git a/SRC/public/imgs/Search.png b/SRC/public/imgs/Search.png
new file mode 100644
index 0000000..8df50c4
Binary files /dev/null and b/SRC/public/imgs/Search.png differ
diff --git a/SRC/resources/views/backend/ref_listeoeuvres.blade.php b/SRC/resources/views/backend/ref_listeoeuvres.blade.php
index 70679bc..4b7e0d8 100755
--- a/SRC/resources/views/backend/ref_listeoeuvres.blade.php
+++ b/SRC/resources/views/backend/ref_listeoeuvres.blade.php
@@ -1,10 +1,10 @@
Résultat de ma recherche
@foreach($oeuvres as $oeuvre)
-
+
@endforeach
{!! $oeuvres->render() !!}
-Ajouter à la liste courante
\ No newline at end of file
+Ajouter à la liste courante
diff --git a/SRC/resources/views/emails/password.blade.php b/SRC/resources/views/emails/password.blade.php
index a712ec7..2568b54 100755
--- a/SRC/resources/views/emails/password.blade.php
+++ b/SRC/resources/views/emails/password.blade.php
@@ -1,4 +1,151 @@
-Bonjour,
-Cliquez ici pour changer votre mot de passe : {{ url('password/reset/'.$token) }}
-Pour vous connecter : {{ url('login') }}
-Merci et à bientôt !
\ No newline at end of file
+
+
+
+
+ Mail de confirmation d'inscription
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Application: musée des augustins
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bienvenue
+
+
+
Vous venez de vous inscrire à notre site web, nous vous proposons de cliquer sur le lien ci-dessous pour initialiser votre mot de passe:
+
J'initialise mon mot de passe
+
Vous venez de vous créer un compte en tant que référent au sein de notre site web. Pour vous connecter en tant que référent vous pouvez vous connecter grâce au lien ci-dessous ou en ajoutant "/login"
à votre barre d'adresse.
+
+
Se connecter
+
Merci et à bientôt!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SRC/resources/views/frontend/home.blade.php b/SRC/resources/views/frontend/home.blade.php
index 6963c01..ccb8ea5 100755
--- a/SRC/resources/views/frontend/home.blade.php
+++ b/SRC/resources/views/frontend/home.blade.php
@@ -2,10 +2,10 @@
@section('content')
@if ($referents != [])
-
+ Jeux Educatifs du musée Augustin
-
-
+
+
@foreach ($referents as $referent)
@@ -19,8 +19,14 @@
@else
Aucun référent trouvé
@endif
+
@endsection
+@section('page-css')
+
+@endsection
@section('page-scripts')