Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb

.bash_history

@@ -82,3 +82,86 @@ ls
 nano loadCSVAugustin2014.py 
 git pull
 exit
+git pull
+exit
+cd ..
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+cd ModuleWeb/
+git pull
+rm SRC/resources/views/admin.blade.php 
+git pull
+nano SRC/app/Http/Middleware/RedirectIfNotAdmin.php 
+git commit -a
+git commit -a
+git commit -a
+git push
+git push
+
+git commit -a
+cd
+cd ..
+python loadCSVAugustin2014.py
+cd ModuleWeb/
+git pull
+cd Src
+cd SRC/
+php artisan bd:seed
+php artisan bd:seed
+php artisan bd:seed
+cd
+python loadCSVAugustin2014.py
+cd ..
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+python loadCSVAugustin2014.py
+cd ModuleWeb/
+git pull
+git commit -a 
+git push
+git commit -a
+git push
+python loadCSVAugustin2014.py
+cd ..
+python loadCSVAugustin2014.py

SRC/.gitignore

@@ -1,3 +1,3 @@
 /vendor
 /node_modules
-.env
+.env

SRC/app/User.php

@@ -12,7 +12,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
 	protected $table = 'users';
 
-	//public $timestamps = false;
+	public $timestamps = false;
 
     /**
      * The attributes that are mass assignable.

SRC/public/css/app.css

@@ -6263,4 +6263,4 @@ body,
 label,
 .checkbox label {
   font-weight: 300;
-}
+}

SRC/public/pictures/user_picture/.gitignore

@@ -0,0 +1,2 @@
+*
+!default.jpg

SRC/resources/views/home.blade.php

@@ -1,13 +1,10 @@
 @extends('app')
 
 @section('content')
-
-<br>
 <center>
  <!-- <img style="height:auto; width:auto; max-width:400px; alt="" src="./pictures/homePic/bienvenue.png"> -->
-  <br>
-<br>
-<form class="form-inline">
+<nav>
+<form class="form-inline navbar-right">
   <div class="form-group">
   <img alt="" src="./pictures/homePic/search.png">
     <div class="input-group">
@@ -15,6 +12,7 @@
     </div>
   </div>
 </form>
+</nav>
 <br>
 <br>