diff --git a/.bash_history b/.bash_history index f69ce60..8141fb0 100755 --- a/.bash_history +++ b/.bash_history @@ -1,6 +1,3 @@ -ls -git commit -a -git config --global user.email www@37.187.101.7 git config --global user.name www git commit -a git push @@ -480,3 +477,24 @@ ls python loader python loader.py python loader.py +ls +git status +git pull +git pull +nano SRC/config/mail.php +git commit -a +git push +ls +ls +ls +nano SRC/config/mail.php +nano .env +nano SRC/.env +git pull +rm SRC/resources/views/auth/reset.blade.php +git pull +ls +git commit -a +git commit -a +git push +exit diff --git a/.composer/cache/files/laravel/framework/43637b796f1ac0b1a960984231251ff04b438006.zip b/.composer/cache/files/laravel/framework/43637b796f1ac0b1a960984231251ff04b438006.zip old mode 100644 new mode 100755 diff --git a/.composer/cache/files/psy/psysh/2ce0e8f3020fd292c2ad2a496c5d83939823f642.zip b/.composer/cache/files/psy/psysh/2ce0e8f3020fd292c2ad2a496c5d83939823f642.zip old mode 100644 new mode 100755 diff --git a/.env b/.env old mode 100644 new mode 100755 diff --git a/INITBASE/inventaire.xml b/INITBASE/inventaire.xml old mode 100644 new mode 100755 diff --git a/INITBASE/loader.py b/INITBASE/loader.py old mode 100644 new mode 100755 diff --git a/SRC/app/Auteur.php b/SRC/app/Auteur.php old mode 100644 new mode 100755 diff --git a/SRC/app/ConfigJeu.php b/SRC/app/ConfigJeu.php old mode 100644 new mode 100755 diff --git a/SRC/app/Datation.php b/SRC/app/Datation.php old mode 100644 new mode 100755 diff --git a/SRC/app/Domaine.php b/SRC/app/Domaine.php old mode 100644 new mode 100755 diff --git a/SRC/app/Http/Controllers/APIController.php b/SRC/app/Http/Controllers/APIController.php old mode 100644 new mode 100755 diff --git a/SRC/app/Http/Controllers/LoginController.php b/SRC/app/Http/Controllers/LoginController.php index d4fcb69..f6367de 100755 --- a/SRC/app/Http/Controllers/LoginController.php +++ b/SRC/app/Http/Controllers/LoginController.php @@ -89,12 +89,12 @@ class LoginController extends Controller { return View::make('auth.reset')->with('token', $token); } - public function update($token) + public function update() { $credentials = Input::only('email', 'password','password_confirmation','token'); $response = Password::reset($credentials, function($user, $password) { - $user->password = Hash::make($password); + $user->motdepasse = Hash::make($password); $user->save(); }); diff --git a/SRC/app/Http/Middleware/ifAdmin.php b/SRC/app/Http/Middleware/ifAdmin.php old mode 100644 new mode 100755 diff --git a/SRC/app/Http/Middleware/ifGuest.php b/SRC/app/Http/Middleware/ifGuest.php old mode 100644 new mode 100755 diff --git a/SRC/app/Http/Middleware/ifGuestWithRef.php b/SRC/app/Http/Middleware/ifGuestWithRef.php old mode 100644 new mode 100755 diff --git a/SRC/app/Http/Middleware/ifReferent.php b/SRC/app/Http/Middleware/ifReferent.php old mode 100644 new mode 100755 diff --git a/SRC/app/Http/routes.php b/SRC/app/Http/routes.php index 2ed86b3..b3ab11c 100755 --- a/SRC/app/Http/routes.php +++ b/SRC/app/Http/routes.php @@ -24,7 +24,7 @@ Route::get('password/reset/{token}', array( 'uses' => 'LoginController@reset', 'as' => 'password.reset' )); -Route::post('password/reset/{token}', array( +Route::post('password/reset', array( 'uses' => 'LoginController@update', 'as' => 'password.update' )); diff --git a/SRC/app/Matiere.php b/SRC/app/Matiere.php old mode 100644 new mode 100755 diff --git a/SRC/app/Oeuvre.php b/SRC/app/Oeuvre.php old mode 100644 new mode 100755 diff --git a/SRC/app/Referent.php b/SRC/app/Referent.php old mode 100644 new mode 100755 diff --git a/SRC/app/Technique.php b/SRC/app/Technique.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_161651_create_referents_table.php b/SRC/database/migrations/2015_03_12_161651_create_referents_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_171332_create_config_jeus_table.php b/SRC/database/migrations/2015_03_12_171332_create_config_jeus_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_173137_create_oeuvres_table.php b/SRC/database/migrations/2015_03_12_173137_create_oeuvres_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_174954_create_techniques_table.php b/SRC/database/migrations/2015_03_12_174954_create_techniques_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_175036_create_domaines_table.php b/SRC/database/migrations/2015_03_12_175036_create_domaines_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_175042_create_matieres_table.php b/SRC/database/migrations/2015_03_12_175042_create_matieres_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_12_203142_create_auteurs_table.php b/SRC/database/migrations/2015_03_12_203142_create_auteurs_table.php old mode 100644 new mode 100755 diff --git a/SRC/database/migrations/2015_03_13_094102_create_datations_table.php b/SRC/database/migrations/2015_03_13_094102_create_datations_table.php old mode 100644 new mode 100755 diff --git a/SRC/public/css/bootstrap-multiselect.css b/SRC/public/css/bootstrap-multiselect.css old mode 100644 new mode 100755 diff --git a/SRC/public/css/fonts/icomoon.eot b/SRC/public/css/fonts/icomoon.eot old mode 100644 new mode 100755 diff --git a/SRC/public/css/fonts/icomoon.svg b/SRC/public/css/fonts/icomoon.svg old mode 100644 new mode 100755 diff --git a/SRC/public/css/fonts/icomoon.ttf b/SRC/public/css/fonts/icomoon.ttf old mode 100644 new mode 100755 diff --git a/SRC/public/css/fonts/icomoon.woff b/SRC/public/css/fonts/icomoon.woff old mode 100644 new mode 100755 diff --git a/SRC/public/css/fonts/style.css b/SRC/public/css/fonts/style.css old mode 100644 new mode 100755 diff --git a/SRC/public/css/frontend.css b/SRC/public/css/frontend.css old mode 100644 new mode 100755 diff --git a/SRC/public/css/image-picker.css b/SRC/public/css/image-picker.css old mode 100644 new mode 100755 diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/Trophy-Gold.png b/SRC/public/imgs/Trophy-Gold.png old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/adminbg.jpg b/SRC/public/imgs/adminbg.jpg new file mode 100644 index 0000000..e324029 Binary files /dev/null and b/SRC/public/imgs/adminbg.jpg differ diff --git a/SRC/public/imgs/avatar/1.jpg b/SRC/public/imgs/avatar/1.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/avatar/1.png b/SRC/public/imgs/avatar/1.png old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/avatar/default.jpg b/SRC/public/imgs/avatar/default.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/bg.png b/SRC/public/imgs/bg.png old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/memo.jpg b/SRC/public/imgs/memo.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/imgs/memory/logo-bw.png b/SRC/public/imgs/memory/logo-bw.png deleted file mode 100644 index 719dc15..0000000 Binary files a/SRC/public/imgs/memory/logo-bw.png and /dev/null differ diff --git a/SRC/public/imgs/memory/logo-bw2.png b/SRC/public/imgs/memory/logo-bw2.png deleted file mode 100644 index 38dbf96..0000000 Binary files a/SRC/public/imgs/memory/logo-bw2.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-01.png b/SRC/public/imgs/memory/monsters-01.png deleted file mode 100644 index 2f623ba..0000000 Binary files a/SRC/public/imgs/memory/monsters-01.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-02.png b/SRC/public/imgs/memory/monsters-02.png deleted file mode 100644 index 74619dd..0000000 Binary files a/SRC/public/imgs/memory/monsters-02.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-03.png b/SRC/public/imgs/memory/monsters-03.png deleted file mode 100644 index 883c11e..0000000 Binary files a/SRC/public/imgs/memory/monsters-03.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-04.png b/SRC/public/imgs/memory/monsters-04.png deleted file mode 100644 index 4d80858..0000000 Binary files a/SRC/public/imgs/memory/monsters-04.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-05.png b/SRC/public/imgs/memory/monsters-05.png deleted file mode 100644 index 3d8d37e..0000000 Binary files a/SRC/public/imgs/memory/monsters-05.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-06.png b/SRC/public/imgs/memory/monsters-06.png deleted file mode 100644 index f0b6975..0000000 Binary files a/SRC/public/imgs/memory/monsters-06.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-07.png b/SRC/public/imgs/memory/monsters-07.png deleted file mode 100644 index aef65d2..0000000 Binary files a/SRC/public/imgs/memory/monsters-07.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-08.png b/SRC/public/imgs/memory/monsters-08.png deleted file mode 100644 index 90d4f56..0000000 Binary files a/SRC/public/imgs/memory/monsters-08.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-09.png b/SRC/public/imgs/memory/monsters-09.png deleted file mode 100644 index 03377b7..0000000 Binary files a/SRC/public/imgs/memory/monsters-09.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-10.png b/SRC/public/imgs/memory/monsters-10.png deleted file mode 100644 index 18afe7d..0000000 Binary files a/SRC/public/imgs/memory/monsters-10.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-11.png b/SRC/public/imgs/memory/monsters-11.png deleted file mode 100644 index 3137744..0000000 Binary files a/SRC/public/imgs/memory/monsters-11.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-12.png b/SRC/public/imgs/memory/monsters-12.png deleted file mode 100644 index 89816d1..0000000 Binary files a/SRC/public/imgs/memory/monsters-12.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-13.png b/SRC/public/imgs/memory/monsters-13.png deleted file mode 100644 index 16a5bce..0000000 Binary files a/SRC/public/imgs/memory/monsters-13.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-14.png b/SRC/public/imgs/memory/monsters-14.png deleted file mode 100644 index f285502..0000000 Binary files a/SRC/public/imgs/memory/monsters-14.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-15.png b/SRC/public/imgs/memory/monsters-15.png deleted file mode 100644 index 015e230..0000000 Binary files a/SRC/public/imgs/memory/monsters-15.png and /dev/null differ diff --git a/SRC/public/imgs/memory/monsters-16.png b/SRC/public/imgs/memory/monsters-16.png deleted file mode 100644 index a583875..0000000 Binary files a/SRC/public/imgs/memory/monsters-16.png and /dev/null differ diff --git a/SRC/public/imgs/puzzle/balls.png b/SRC/public/imgs/puzzle/balls.png old mode 100644 new mode 100755 diff --git a/SRC/public/js/bootstrap-multiselect.js b/SRC/public/js/bootstrap-multiselect.js old mode 100644 new mode 100755 diff --git a/SRC/public/js/image-picker.min.js b/SRC/public/js/image-picker.min.js old mode 100644 new mode 100755 diff --git a/SRC/public/js/imagesloaded.pkgd.min.js b/SRC/public/js/imagesloaded.pkgd.min.js old mode 100644 new mode 100755 diff --git a/SRC/public/js/masonry.min.js b/SRC/public/js/masonry.min.js old mode 100644 new mode 100755 diff --git a/SRC/public/js/memory.js b/SRC/public/js/memory.js old mode 100644 new mode 100755 diff --git a/SRC/public/js/phaser.map b/SRC/public/js/phaser.map old mode 100644 new mode 100755 diff --git a/SRC/public/js/phaser.min.js b/SRC/public/js/phaser.min.js old mode 100644 new mode 100755 diff --git a/SRC/public/js/rechercheRef.js b/SRC/public/js/rechercheRef.js new file mode 100644 index 0000000..014cb55 --- /dev/null +++ b/SRC/public/js/rechercheRef.js @@ -0,0 +1,19 @@ +// fonction qui recherche le referent donnee en parametre +function rechercherReferent() +{ + // on recupere le mot cle rentrer dans le champs de recherche + var motCle = document.getElementById("searchfield").value; + + //boucle sur chaque item + var list = document.getElementsByClassName("item"); + + for (var i = 0; i < list.length; i++) + { + referent = list[i].getElementsByClassName('nomRef')[0].innerHTML; //recupere le nom du referent referent + if (referent.indexOf(motCle) > -1) //on compare si la recherche correspond à un nom + { + //on remplace la classe + list[i].className = "item active"; + } + } +} \ No newline at end of file diff --git a/SRC/public/js/responsivevoice.js b/SRC/public/js/responsivevoice.js old mode 100644 new mode 100755 diff --git a/SRC/resources/views/auth/register.blade.php b/SRC/resources/views/auth/register.blade.php index 1f2ffd0..dc86c27 100755 --- a/SRC/resources/views/auth/register.blade.php +++ b/SRC/resources/views/auth/register.blade.php @@ -18,7 +18,7 @@ @endif -
+
diff --git a/SRC/resources/views/auth/reset.blade.php b/SRC/resources/views/auth/reset.blade.php new file mode 100644 index 0000000..5f4df36 --- /dev/null +++ b/SRC/resources/views/auth/reset.blade.php @@ -0,0 +1,60 @@ +@extends('backend/template') + +@section('content') +
+
+
+
+
Réinitialiser Mot de Passe
+
+ @if (count($errors) > 0) +
+ Oouups! Il y a un problème.

+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + + + + + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+@endsection diff --git a/SRC/resources/views/backend/admin_home.blade.php b/SRC/resources/views/backend/admin_home.blade.php old mode 100644 new mode 100755 index 0ec00c7..71cd84c --- a/SRC/resources/views/backend/admin_home.blade.php +++ b/SRC/resources/views/backend/admin_home.blade.php @@ -4,14 +4,20 @@
@if (session('message_add')) -
+
{{ Session::get('message_add') }} +
@endif @if (session('message_delete')) -
+
{{ Session::get('message_delete') }} +
@endif
@@ -42,7 +48,7 @@
- +
@@ -100,3 +106,12 @@
@endsection + +@section('page-scripts') + +@endsection \ No newline at end of file diff --git a/SRC/resources/views/backend/navbar_signed.blade.php b/SRC/resources/views/backend/navbar_signed.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/backend/ref_home.blade.php b/SRC/resources/views/backend/ref_home.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/backend/ref_listeoeuvres.blade.php b/SRC/resources/views/backend/ref_listeoeuvres.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/backend/ref_navbar.blade.php b/SRC/resources/views/backend/ref_navbar.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/backend/template.blade.php b/SRC/resources/views/backend/template.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/games.blade.php b/SRC/resources/views/frontend/games.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/home.blade.php b/SRC/resources/views/frontend/home.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/memo.blade.php b/SRC/resources/views/frontend/memo.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/memo_level.blade.php b/SRC/resources/views/frontend/memo_level.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/puzzle.blade.php b/SRC/resources/views/frontend/puzzle.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/puzzle_level.blade.php b/SRC/resources/views/frontend/puzzle_level.blade.php old mode 100644 new mode 100755 diff --git a/SRC/resources/views/frontend/template.blade.php b/SRC/resources/views/frontend/template.blade.php old mode 100644 new mode 100755 diff --git a/UML/diagramClass2.0.png b/UML/diagramClass2.0.png old mode 100644 new mode 100755 diff --git a/UML/diagramClass2.png b/UML/diagramClass2.png old mode 100644 new mode 100755