Merge pull request #108 from odirleiborgert/rc2.0.0

Rc2.0.0

README.md

@@ -12,17 +12,11 @@
 
 > Quality
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ad3c062e22ba4c25b8017041b619e217)](https://www.codacy.com/app/odirleiborgert/borgert-cms?utm_source=github.com&utm_medium=referral&utm_content=odirleiborgert/borgert-cms&utm_campaign=Badge_Grade) [![StyleCI](https://styleci.io/repos/60208254/shield?branch=master)](https://styleci.io/repos/60208254) [![Build Status](https://scrutinizer-ci.com/g/odirleiborgert/borgert-cms/badges/build.png?b=master)](https://scrutinizer-ci.com/g/odirleiborgert/borgert-cms/build-status/master)
-
-> Tags / Releases
-
-[![GitHub tag](https://img.shields.io/github/tag/odirleiborgert/borgert-cms.svg)](https://github.com/odirleiborgert/borgert-cms/releases)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ad3c062e22ba4c25b8017041b619e217)](https://www.codacy.com/app/odirleiborgert/borgert-cms?utm_source=github.com&utm_medium=referral&utm_content=odirleiborgert/borgert-cms&utm_campaign=Badge_Grade) [![StyleCI](https://styleci.io/repos/60208254/shield?branch=master)](https://styleci.io/repos/60208254) 
 
 > Contributions / Donate
 
-[![Beerpay](https://beerpay.io/odirleiborgert/borgert-cms/badge.svg)](https://beerpay.io/odirleiborgert/borgert-cms)
-[![GitHub issues](https://img.shields.io/github/issues/odirleiborgert/borgert-cms.svg)](https://github.com/odirleiborgert/borgert-cms/issues)  
-[![Donate](https://img.shields.io/badge/Donate-PAYPAL-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=odirleiborgert%40gmail%2ecom&lc=MQ&item_name=Odirlei%20Borgert&currency_code=BRL&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
+[![GitHub issues](https://img.shields.io/github/issues/odirleiborgert/borgert-cms.svg)](https://github.com/odirleiborgert/borgert-cms/issues) [![Beerpay](https://img.shields.io/beerpay/odirleiborgert/borgert-cms.svg)](https://beerpay.io/odirleiborgert/borgert-cms) [![Donate](https://img.shields.io/badge/Donate-PAYPAL-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=odirleiborgert%40gmail%2ecom&lc=MQ&item_name=Odirlei%20Borgert&currency_code=BRL&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
 
 ## Documentation
 
@@ -45,14 +39,13 @@
 <a name="screenshots"></a>
 ## Screenshots
 
-![Imgur](http://i.imgur.com/3Yci6u0.png)
-
-![Imgur](http://i.imgur.com/SipAkyQ.png)
+<img src="https://i.imgur.com/eYoez0g.png" /> <br><br>
 
-![Imgur](http://i.imgur.com/GTiisSM.png)
+<img src="https://i.imgur.com/pZ8NfzQ.png" /> <br><br>
 
-![Imgur](http://i.imgur.com/VGpDAPx.png)
+<img src="https://i.imgur.com/MimQStg.png" /> <br><br>
 
+<img src="https://i.imgur.com/VpE9ysJ.png" /> <br><br>
 
 <a name="contributions"></a>
 ## Contributions

app/Http/Controllers/Admin/Pages/ContentsController.php

@@ -67,6 +67,8 @@ public function store(Request $request)
             'category_id' => 'required|integer',
             'title' => 'required',
             'description' => 'required',
+            'seo_title' => 'required',
+            'seo_description' => 'required',
         ]);
 
         $contentDetails = $request->all();
@@ -108,6 +110,8 @@ public function update(Request $request, $id)
             'category_id' => 'required|integer',
             'title' => 'required',
             'description' => 'required',
+            'seo_title' => 'required',
+            'seo_description' => 'required',
         ]);
 
         $content = $this->contents->find($id);

app/Http/Controllers/Admin/Users/UsersController.php

@@ -5,7 +5,6 @@
 use App\User;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use function App\Helpers\issetStatus;
 
 class UsersController extends Controller
 {
@@ -62,7 +61,7 @@ public function store(Request $request)
 
         $userDetails = $request->all();
         $userDetails['password'] = \Hash::make($request['password']);
-        $userDetails['status'] = issetStatus($request['status']);
+        $userDetails['status'] = isset($request['status']) ? 1 : 0;
         $this->users->create($userDetails);
 
         \Session::flash('success', trans('admin/users.store.messages.success'));
@@ -106,7 +105,7 @@ public function update(Request $request, $id)
         if ($request['password']) {
             $userDetails['password'] = \Hash::make($request['password']);
         }
-        $userDetails['status'] = issetStatus($request['status']);
+        $userDetails['status'] = isset($request['status']) ? 1 : 0;
         $user->update($userDetails);
 
         \Session::flash('success', trans('admin/users.update.messages.success'));

app/Http/Controllers/Site/CompanyController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Site;
+
+use App\Http\Controllers\Controller;
+use Symfony\Component\HttpFoundation\Request;
+
+class CompanyController extends Controller
+{
+    // -------------------------------------------------------------------
+
+    public function index(Request $request)
+    {
+        // rules
+    }
+
+    // -------------------------------------------------------------------
+}

app/Http/Controllers/Site/ContactController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Site;
+
+use App\Http\Controllers\Controller;
+use Symfony\Component\HttpFoundation\Request;
+
+class ContactController extends Controller
+{
+    // -------------------------------------------------------------------
+
+    public function index(Request $request)
+    {
+        // rules
+    }
+
+    // -------------------------------------------------------------------
+}

bower.json

@@ -22,18 +22,13 @@
     "tests"
   ],
   "dependencies": {
-    "bootstrap": "^3.3.6",
-    "jquery": "^3.3.0",
-    "font-awesome": "Font-Awesome#^4.6.3",
-    "animate.css": "^3.5.1",
-    "metisMenu": "^2.5.2",
-    "slimScroll": "^1.3.7",
-    "PACE": "pace#^1.0.2",
-    "jquery-ui": "^1.11.4",
-    "summernote": "^0.8.1",
-    "blueimp-file-upload": "^9.12.5",
-    "awesome-bootstrap-checkbox": "^0.3.7",
-    "datetimepicker": "^2.5.4",
-    "switchery": "^0.8.1"
+    "bootstrap": "^4.1.2",
+    "font-awesome": "fontawesome#^4.7.0",
+    "metisMenu": "metismenu#^2.7.9",
+    "jquery": "^3.3.1",
+    "blueimp-file-upload": "^9.22.0",
+    "switchery": "^0.8.2",
+    "summernote": "^0.8.10",
+    "datetimepicker": "^2.5.20"
   }
 }

composer.json

@@ -32,10 +32,7 @@
         ],
         "psr-4": {
             "App\\": "app/"
-        },
-        "files": [
-            "app/Helpers/helper.php"
-        ]
+        }
     },
     "autoload-dev": {
         "classmap": [

config/borgert.php

@@ -9,8 +9,8 @@
     */
 
     'name' => 'Borgert CMS',
-    'laravel' => 'Laravel 5.5',
-    'version' => '1.0.5',
+    'laravel' => 'Laravel 5.6',
+    'version' => '2.0.0',
     'opensource' => 'https://github.com/odirleiborgert/borgert-cms',
 
 ];

config/logging.php

@@ -32,7 +32,7 @@
     'channels' => [
         'stack' => [
             'driver' => 'stack',
-            'channels' => ['single'],
+            'channels' => ['daily'],
         ],
 
         'single' => [

docs/en/libraries.md

@@ -7,20 +7,17 @@
 * [laravel/laravel](https://github.com/laravel/laravel) - A PHP Framework For Web Artisans
 * [thomaswelton/laravel-gravatar](https://github.com/thomaswelton/laravel-gravatar) - Image gravatar
 * [kyslik/column-sortable](https://github.com/Kyslik/column-sortable) - Order by column
+* [rap2hpoutre/laravel-log-viewer](https://github.com/rap2hpoutre/laravel-log-viewer) - Log viewer
+* [nicolaslopezj/searchable](https://github.com/nicolaslopezj/searchable) - Search for blog
 
 
 -----
 #### Javascript Libraries
 
-* [Animate.css](http://daneden.github.io/animate.css/) - Animation with CSS
 * [Bootstrap](http://getbootstrap.com) - Framework CSS
-* [Chart.js](http://chartjs.org) - Charts
 * [Font Awesome](http://http://fontawesome.io/) - Best Icones
 * [Jquery](http://jquery.com) - Framework Javascript
-* [Jquery UI](http://jqueryui.com) - User Interface
 * [Metis Menu](https://github.com/onokumus/metisMenu) - Menu toogle
-* [Pace](https://github.com/HubSpot/pace) - Loading pages
-* [Slim Scroll](https://github.com/rochal/jQuery-slimScroll) - Scroll
 * [Summer Note](https://github.com/summernote/summernote) - Editor text
 * [Blueimp - jQuery File Upload](https://github.com/blueimp/jQuery-File-Upload) - Upload files (ajax)
 

docs/en/usage.md

@@ -56,25 +56,20 @@ Route::group(['prefix' => 'blog', 'as' => 'blog.'], function () {
 
 <a name="assets"></a>
 ## Assets
-* Using the command `gulp watch` in the background will be listening to the files LESS and JS that is in the `resources/assets/[js,less,sass]` and when detected some of them are compiled and saved in the `public/assets/[css,js]/`
+* Using the command `gulp watch` in the background will be listening to the files SASS and JS that is in the `resources/assets/[admin,blog,site,auth]/[js,sass]` and when detected some of them are compiled and saved in the `public/assets/[admin,blog,site,auth]/[css,js]/`
 
 <a name="languages"></a>
 ## Languages
-Two languages currently available for Rocket, Portuguès and English by default by setting will be English.
-The file config / app.php look for locale and fallback_locale and change to `pt_BR`.
+Four languages currently available for Borgert CMS, Portuguese, Spanish, and English, by default we will be setting English.
+In the config/app.php file, look for locale and fallback_locale and change to `pt`.
 
-The files for translations are located in the `resources\lang\[en,pt_BR\admin\**`
+The files for translations are located in the `resources/lang/[en,pt,es,zh_cn]/[admin,blog]/**`
 
 ```php
     'locale' => 'en',
     'fallback_locale' => 'en',
 ```
 
-<a name="phpcsfixer"></a>
-## PhpCsFixer
-* We use the command `php artisan borgert:phpcsfixer`, requires file phpcsfixer.phar
-
-
 #### You want to join?
 - Making a pull request or by creating an [issue] (https://github.com/odirleiborgert/borgert-cms/issues).
 

docs/pt-br/libraries.md

@@ -7,20 +7,17 @@
 * [laravel/laravel](https://github.com/laravel/laravel) - A PHP Framework For Web Artisans
 * [thomaswelton/laravel-gravatar](https://github.com/thomaswelton/laravel-gravatar) - Image gravatar
 * [kyslik/column-sortable](https://github.com/Kyslik/column-sortable) - Ordenação por colunas
+* [rap2hpoutre/laravel-log-viewer](https://github.com/rap2hpoutre/laravel-log-viewer) - Visualizador de logs
+* [nicolaslopezj/searchable](https://github.com/nicolaslopezj/searchable) - Buscador para blog
 
 
 -----
 #### Javascript Libraries
 
-* [Animate.css](http://daneden.github.io/animate.css/) - Animações com CSS
 * [Bootstrap](http://getbootstrap.com) - Framework CSS
-* [Chart.js](http://chartjs.org) - Gráficos
 * [Font Awesome](http://http://fontawesome.io/) - Ícones
 * [Jquery](http://jquery.com) - Framework Javascript
-* [Jquery UI](http://jqueryui.com) - User Interface
 * [Metis Menu](https://github.com/onokumus/metisMenu) - Menu toogle
-* [Pace](https://github.com/HubSpot/pace) - Loading páginas
-* [Slim Scroll](https://github.com/rochal/jQuery-slimScroll) - Barra de rolagem 
 * [Summer Note](https://github.com/summernote/summernote) - Editor de texto
 * [Blueimp - jQuery File Upload](https://github.com/blueimp/jQuery-File-Upload) - Upload de arquivos (ajax)
 

docs/pt-br/usage.md

@@ -57,25 +57,20 @@ Route::group(['prefix' => 'blog', 'as' => 'blog.'], function () {
 
 <a name="assets"></a>
 ## Assets
-* Utilizando o comando `gulp watch` em background ficará escutando os arquivos LESS, JS que está  no diretório `resources/assets/[js,less,sass]` e quando for detectado alguma neles são compilados e salvos na pasta `public/assets/[css,js]/`
+* Utilizando o comando `gulp watch` em background ficará escutando os arquivos SASS, JS que está  no diretório `resources/assets/[admin,blog,auth,site]/[js,sass]` e quando for detectado alguma neles são compilados e salvos na pasta `public/assets/[admin,blog,auth,site]/[css,js]/`
 
 <a name="languages"></a>
 ## Idiomas
-Dois idiomas disponíveis no momento para o Rocket, Portuguès e Inglês, por padrão estaremos setando o inglês. 
-No arquivo config/app.php procure por locale e fallback_locale e altere para `pt_BR`.
+Quatro idiomas disponíveis no momento para o Borgert CMS, Portuguès, Espanhol, e Inglês, por padrão estaremos setando o inglês. 
+No arquivo config/app.php procure por locale e fallback_locale e altere para `pt`.
 
-Os arquivos para traduções estarão localizados na pasta `resources\lang\[en,pt_BR\admin\**`
+Os arquivos para traduções estarão localizados na pasta `resources/lang/[en,pt,es,zh_cn]/[admin,blog]/**`
 
 ```php
     'locale' => 'en',
     'fallback_locale' => 'en',
 ```
 
-<a name="phpcsfixer"></a>
-## PhpCsFixer
-* Utilizamos o comando `php artisan borgert:phpcsfixer`, requer o arquivo phpcsfixer.phar 
-
-
 #### Quer participar?
 - Fazendo um pull request ou criando uma [issue](https://github.com/odirleiborgert/borgert-cms/issues).
 

gulpfile.js

@@ -1,7 +1,5 @@
 const elixir = require('laravel-elixir');
 
-require('laravel-elixir-vue-2');
-
 /*
  |--------------------------------------------------------------------------
  | Elixir Asset Management
@@ -18,22 +16,24 @@ elixir.config.sourcemaps = false;
 
 elixir(function(mix) {
 
-	/**
-	* Compile CSS with LESS, SASS or STYLUS
-	*/
+    // Auth
+    mix.sass(['auth/styles.scss'],'public/assets/auth/css/all.css');
+    mix.scripts(['auth/scripts.js'], 'public/assets/auth/js/all.js');
 
-    mix.less('admin/app.less','public/assets/admin/css');
-    // mix.stylus('admin/app.styl','public/assets/admin/css');
-    // mix.sass('admin/app.sass','public/assets/admin/css');
+    // Admin
+    mix.sass(['admin/styles.scss'],'public/assets/admin/css/all.css');
+    mix.scripts(['admin/scripts.js'], 'public/assets/admin/js/all.js');
 
+    // Blog
+    mix.sass(['blog/styles.scss'],'public/assets/blog/css/all.css');
+    mix.scripts(['blog/scripts.js'], 'public/assets/blog/js/all.js');
 
-    /**
-	* Compile Javascript with Webpack, rollup or scripts
-	*/
+    // Site
+    mix.sass(['site/styles.scss'],'public/assets/site/css/all.css');
+    mix.scripts(['site/scripts.js'], 'public/assets/site/js/all.js');
 
-    mix.webpack('app.js', 'public/assets/admin/js'); // for vue
-    // mix.rollup('app.js', 'public/assets/admin/js');
-    // mix.scripts('app.js', 'public/assets/admin/js');
-    // mix.scriptsIn('public/js/some/directory'); // for directory
+    // Errors
+    mix.sass(['errors/styles.scss'],'public/assets/errors/css/all.css');
+    mix.scripts(['errors/scripts.js'], 'public/assets/errors/js/all.js');
 
 });

package.json

@@ -5,16 +5,8 @@
     "dev": "gulp watch"
   },
   "devDependencies": {
-    "bootstrap-sass": "^3.0.0",
     "gulp": "^3.9.1",
-    "jquery": "^3.3.0",
-    "laravel-elixir": "^6.0.0-9",
-    "laravel-elixir-vue-2": "^0.2.0",
-    "laravel-elixir-webpack-official": "^1.0.2",
-    "lodash": "^4.16.2",
-    "node-sass": "^4.7.2",
-    "vue": "^2.0.1",
-    "vue-resource": "^1.0.3"
+    "laravel-elixir": "^6.0.0-18"
   },
   "dependencies": {}
 }