Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
sidya82
@ -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
|
||||
|
||||
2
SRC/.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
/vendor
|
||||
/node_modules
|
||||
.env
|
||||
.env
|
||||
@ -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.
|
||||
|
||||
@ -6263,4 +6263,4 @@ body,
|
||||
label,
|
||||
.checkbox label {
|
||||
font-weight: 300;
|
||||
}
|
||||
}
|
||||
0
SRC/public/pictures/homePic/bienvenue.png
Normal file → Executable file
|
Before 
(image error) Size: 31 KiB After 
(image error) Size: 31 KiB
|
0
SRC/public/pictures/homePic/fond.jpg
Normal file → Executable file
|
Before 
(image error) Size: 148 KiB After 
(image error) Size: 148 KiB
|
0
SRC/public/pictures/homePic/search.png
Normal file → Executable file
|
Before 
(image error) Size: 18 KiB After 
(image error) Size: 18 KiB
|
0
SRC/public/pictures/referent/francois.jpg
Normal file → Executable file
|
Before 
(image error) Size: 45 KiB After 
(image error) Size: 45 KiB
|
0
SRC/public/pictures/referent/hitler.jpg
Normal file → Executable file
|
Before 
(image error) Size: 60 KiB After 
(image error) Size: 60 KiB
|
0
SRC/public/pictures/referent/lepen.jpg
Normal file → Executable file
|
Before 
(image error) Size: 55 KiB After 
(image error) Size: 55 KiB
|
0
SRC/public/pictures/referent/nicolas.jpg
Normal file → Executable file
|
Before 
(image error) Size: 50 KiB After 
(image error) Size: 50 KiB
|
2
SRC/public/pictures/user_picture/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
*
|
||||
!default.jpg
|
||||
|
Before 
(image error) Size: 96 KiB |
|
Before 
(image error) Size: 24 KiB |
|
Before 
(image error) Size: 24 KiB |
|
Before 
(image error) Size: 80 KiB |
BIN
SRC/public/pictures/user_picture/default.jpg
Normal file
|
After 
(image error) Size: 3.3 KiB |
|
Before 
(image error) Size: 3.7 KiB |
@ -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>
|
||||
|
||||
|
||||