diff --git a/application/class/Application.php b/application/class/Application.php index 54b2c9e..892752e 100644 --- a/application/class/Application.php +++ b/application/class/Application.php @@ -23,11 +23,16 @@ class Application public function launch() { - //print_r($this->route); + //on declare la session lors du chargement du controlleur, + // ainsi on instancie la page précédente et le javascript et le css asynchrone + \MVC\Object\Session::createAndTestSession(); + $controlleur = new Controlleur($this); //si la page n'est un controlleur d'action alors on affiche l'écran if (!$this->url->page['control']) { print($controlleur->vue->ecran); + //si on affiche l'écran alors on vide les alertes de la session + \MVC\Object\Alert::remove(); } } } diff --git a/application/class/Asynchonous.php b/application/class/Asynchonous.php deleted file mode 100644 index 8063785..0000000 --- a/application/class/Asynchonous.php +++ /dev/null @@ -1,38 +0,0 @@ -_css = ""; - $this->_javascript = ""; - } - - public function addCss($code) - { - $this->_css .= "\n"; - $this->_css .= $code; - } - - public function addJs($code) - { - $this->_javascript .= "\n"; - $this->_javascript .= $code; - } - - public function printCss() - { - echo $this->_css; - } - - public function printJs() - { - echo $this->_javascript; - } -} diff --git a/application/class/Bdd.php b/application/class/Bdd.php index bdd0e37..88b2143 100644 --- a/application/class/Bdd.php +++ b/application/class/Bdd.php @@ -25,6 +25,11 @@ class Bdd public function faireSQLRequete($sql) { $req = $this->bdd->query($sql); + // Print Pdo::ERRORs + if (!$req && (ENV == 'TEST' || ENV == 'DEV')) { + echo "\nPDO::errorInfo():\n"; + print_r($this->bdd->errorInfo()); + } return $req; } @@ -57,6 +62,11 @@ class Bdd } } $req->execute(); + // Print Pdo::ERRORs + if (!$req && (ENV == 'TEST' || ENV == 'DEV')) { + echo "\nPDO::errorInfo():\n"; + print_r($this->bdd->errorInfo()); + } //$req->closeCursor(); return $req; } diff --git a/application/config/app-parameters.php b/application/config/app-parameters.php index 7768f4e..421631c 100644 --- a/application/config/app-parameters.php +++ b/application/config/app-parameters.php @@ -7,5 +7,7 @@ // ou : "my-app/dev/ define("BASE_SERVER_DIRECTORY", ""); -// Optionnel! il n'est nécessaire que si vous l'utilisez dans les fichier de traitement -define('PATH_URL', $_SERVER['REQUEST_SCHEME'] . "://www.domain.org"); \ No newline at end of file +// Optionnel! il n'est nécessaire que si vous l'utilisez dans les fichiers de traitement +define('PATH_URL', $_SERVER['REQUEST_SCHEME'] . "://www.domain.org"); + +define('ENV', "TEST"); \ No newline at end of file diff --git a/application/include/actions/DefaultAction.php b/application/include/actions/DefaultAction.php index c7447d8..222ea54 100644 --- a/application/include/actions/DefaultAction.php +++ b/application/include/actions/DefaultAction.php @@ -53,7 +53,7 @@ class DefaultAction extends Action return $this->render('action', array('var1' => $var1, 'var2' => $var2, 'var3' => $var3)); } - public function makeHttp11($data) + public function makeHttp11() { $data = array('myval' => 25); //Dumper::dump($data); @@ -61,7 +61,7 @@ class DefaultAction extends Action $request = new HttpMethodRequete(); $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->get($data); $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->post($data); - $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10' => 'val10']))->put($data); + $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->put($data); $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->delete($data); } } diff --git a/application/include/controlleurs/admin.php b/application/include/controlleurs/admin.php index a4abe2d..cd179de 100644 --- a/application/include/controlleurs/admin.php +++ b/application/include/controlleurs/admin.php @@ -1,2 +1,3 @@ +
+ +
+
+ @yield('content') +
+
+ +
+ +@endsection diff --git a/application/include/vues/layout/body.blade.php b/application/include/vues/layout/body.blade.php index be55250..cb31e00 100644 --- a/application/include/vues/layout/body.blade.php +++ b/application/include/vues/layout/body.blade.php @@ -9,7 +9,7 @@
- + +
+
+ Vous êtes connecté en tant que {{$_SESSION['user_login']}} + Se Deconnecter +
+
+
+ + + @if(isset($_SESSION['alerts'])) + @foreach($_SESSION['alerts'] as $alert) + + @endforeach + @endif + @yield('content') +
diff --git a/application/include/vues/system/system.blade.php b/application/include/vues/system/system.blade.php index b9e6f6f..df91786 100644 --- a/application/include/vues/system/system.blade.php +++ b/application/include/vues/system/system.blade.php @@ -8,6 +8,24 @@ + + + + + + + + + + + + + + + + + + @section('top-css') diff --git a/application/include/vues/view/error-access-denied.blade.php b/application/include/vues/view/error-access-denied.blade.php new file mode 100644 index 0000000..45aa3f2 --- /dev/null +++ b/application/include/vues/view/error-access-denied.blade.php @@ -0,0 +1,34 @@ +{{-- Vue Blade de la page d'erreur 403 accès restreint--}} +@extends('body-nomenu') + +@section('content') +
+
+

Accès non Autorisé

+

+ Vous ne possédez pas les accès à cette application. +
+ Si c'est une erreur : veuillez bien contacter l'administrateur de l'application afin qu'il vous alloue un accès +
+ administrateur@sand-framework.fr +

+

+
+ + + + + + + + + + + + + +
+
+
+ +@endsection \ No newline at end of file diff --git a/application/include/vues/view/gitlist.blade.php b/application/include/vues/view/gitlist.blade.php index 49c0852..618b31b 100644 --- a/application/include/vues/view/gitlist.blade.php +++ b/application/include/vues/view/gitlist.blade.php @@ -1 +1 @@ -{{$app->load('gitlist')}} \ No newline at end of file +{{$app->load('gitlist')}} diff --git a/application/objets/Alert.php b/application/objets/Alert.php new file mode 100644 index 0000000..8a2aa75 --- /dev/null +++ b/application/objets/Alert.php @@ -0,0 +1,23 @@ + $title, + 'message' => $message, + 'type' => $type + ); + + $_SESSION['alerts'][] = $alert; + } + + public static function remove(){ + $_SESSION['alerts'] = array(); + } + +} \ No newline at end of file diff --git a/application/objets/Asynchronous.php b/application/objets/Asynchronous.php new file mode 100644 index 0000000..28ba513 --- /dev/null +++ b/application/objets/Asynchronous.php @@ -0,0 +1,36 @@ + diff --git a/public/android-icon-144x144.png b/public/android-icon-144x144.png new file mode 100644 index 0000000..cbf5dde Binary files /dev/null and b/public/android-icon-144x144.png differ diff --git a/public/android-icon-192x192.png b/public/android-icon-192x192.png new file mode 100644 index 0000000..7593631 Binary files /dev/null and b/public/android-icon-192x192.png differ diff --git a/public/android-icon-36x36.png b/public/android-icon-36x36.png new file mode 100644 index 0000000..ad5afed Binary files /dev/null and b/public/android-icon-36x36.png differ diff --git a/public/android-icon-48x48.png b/public/android-icon-48x48.png new file mode 100644 index 0000000..71b7099 Binary files /dev/null and b/public/android-icon-48x48.png differ diff --git a/public/android-icon-72x72.png b/public/android-icon-72x72.png new file mode 100644 index 0000000..ab02574 Binary files /dev/null and b/public/android-icon-72x72.png differ diff --git a/public/android-icon-96x96.png b/public/android-icon-96x96.png new file mode 100644 index 0000000..6dc0a44 Binary files /dev/null and b/public/android-icon-96x96.png differ diff --git a/public/apple-icon-114x114.png b/public/apple-icon-114x114.png new file mode 100644 index 0000000..fd83c12 Binary files /dev/null and b/public/apple-icon-114x114.png differ diff --git a/public/apple-icon-120x120.png b/public/apple-icon-120x120.png new file mode 100644 index 0000000..3c37468 Binary files /dev/null and b/public/apple-icon-120x120.png differ diff --git a/public/apple-icon-144x144.png b/public/apple-icon-144x144.png new file mode 100644 index 0000000..cbf5dde Binary files /dev/null and b/public/apple-icon-144x144.png differ diff --git a/public/apple-icon-152x152.png b/public/apple-icon-152x152.png new file mode 100644 index 0000000..baad77a Binary files /dev/null and b/public/apple-icon-152x152.png differ diff --git a/public/apple-icon-180x180.png b/public/apple-icon-180x180.png new file mode 100644 index 0000000..271a292 Binary files /dev/null and b/public/apple-icon-180x180.png differ diff --git a/public/apple-icon-57x57.png b/public/apple-icon-57x57.png new file mode 100644 index 0000000..2e6d577 Binary files /dev/null and b/public/apple-icon-57x57.png differ diff --git a/public/apple-icon-60x60.png b/public/apple-icon-60x60.png new file mode 100644 index 0000000..e2c792f Binary files /dev/null and b/public/apple-icon-60x60.png differ diff --git a/public/apple-icon-72x72.png b/public/apple-icon-72x72.png new file mode 100644 index 0000000..ab02574 Binary files /dev/null and b/public/apple-icon-72x72.png differ diff --git a/public/apple-icon-76x76.png b/public/apple-icon-76x76.png new file mode 100644 index 0000000..83dcff0 Binary files /dev/null and b/public/apple-icon-76x76.png differ diff --git a/public/apple-icon-precomposed.png b/public/apple-icon-precomposed.png new file mode 100644 index 0000000..1541f33 Binary files /dev/null and b/public/apple-icon-precomposed.png differ diff --git a/public/apple-icon.png b/public/apple-icon.png new file mode 100644 index 0000000..1541f33 Binary files /dev/null and b/public/apple-icon.png differ diff --git a/public/assets/css/custom.css b/public/assets/css/custom.css index 01e410a..7d52d79 100644 --- a/public/assets/css/custom.css +++ b/public/assets/css/custom.css @@ -55,7 +55,6 @@ dl, ol, ul { width: 250px; border: 2px solid transparent; margin: 0 auto; - margin-left: auto; padding: 23px 30px; color: #fff; font-weight: 400; @@ -77,7 +76,15 @@ dl, ol, ul { padding-bottom: 2rem; } -/** Sub Menu top bar, invisible on mobile **/ +/** Sub Menu sub bar, visible on mobile **/ +#sub-bar{ + height: 25px; + background-color: antiquewhite; + font-size: 0.7rem; + margin-bottom: 2rem; + padding-top: 5px; +} +/** Sub Menu top bar , invisible on mobile **/ .top-menu{ display: flex; justify-content: end; @@ -117,6 +124,17 @@ li.actual > a { .actual{ background-color: white; } -header{ - margin-bottom: 2rem; +/** ACCESS DENIED **/ +#access-denied{ + display:block; + position: relative; + width: 70%; + height: 70%; + border: 1px dotted grey; + border-radius:15px; + text-align: center; + margin: 5% auto; +} +#access-denied > .container{ + padding-top: 10%; } \ No newline at end of file diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 0000000..c554148 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,2 @@ + +#ffffff \ No newline at end of file diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png new file mode 100644 index 0000000..cd00f98 Binary files /dev/null and b/public/favicon-16x16.png differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png new file mode 100644 index 0000000..d5e06b3 Binary files /dev/null and b/public/favicon-32x32.png differ diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png new file mode 100644 index 0000000..6dc0a44 Binary files /dev/null and b/public/favicon-96x96.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 4ec0d29..b659b48 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/humans.txt b/public/humans.txt index 72be02a..7c6578c 100644 --- a/public/humans.txt +++ b/public/humans.txt @@ -13,7 +13,7 @@ /* SITE */ Standards: HTML5, CSS3 - Components: Modernizr, jQuery + Components: Blade, Vue.js Software: diff --git a/public/manifest.json b/public/manifest.json new file mode 100644 index 0000000..013d4a6 --- /dev/null +++ b/public/manifest.json @@ -0,0 +1,41 @@ +{ + "name": "App", + "icons": [ + { + "src": "\/android-icon-36x36.png", + "sizes": "36x36", + "type": "image\/png", + "density": "0.75" + }, + { + "src": "\/android-icon-48x48.png", + "sizes": "48x48", + "type": "image\/png", + "density": "1.0" + }, + { + "src": "\/android-icon-72x72.png", + "sizes": "72x72", + "type": "image\/png", + "density": "1.5" + }, + { + "src": "\/android-icon-96x96.png", + "sizes": "96x96", + "type": "image\/png", + "density": "2.0" + }, + { + "src": "\/android-icon-144x144.png", + "sizes": "144x144", + "type": "image\/png", + "density": "3.0" + }, + { + "src": "\/android-icon-192x192.png", + "sizes": "192x192", + "type": "image\/png", + "density": "4.0" + } + ] +} \ No newline at end of file diff --git a/public/ms-icon-144x144.png b/public/ms-icon-144x144.png new file mode 100644 index 0000000..cbf5dde Binary files /dev/null and b/public/ms-icon-144x144.png differ diff --git a/public/ms-icon-150x150.png b/public/ms-icon-150x150.png new file mode 100644 index 0000000..acdb52c Binary files /dev/null and b/public/ms-icon-150x150.png differ diff --git a/public/ms-icon-310x310.png b/public/ms-icon-310x310.png new file mode 100644 index 0000000..2a84177 Binary files /dev/null and b/public/ms-icon-310x310.png differ diff --git a/public/ms-icon-70x70.png b/public/ms-icon-70x70.png new file mode 100644 index 0000000..426f90b Binary files /dev/null and b/public/ms-icon-70x70.png differ