Skip to content

Commit 29ebe56

Browse files
odirleiborgertodirleiborgert
authored
Merge pull request #108 from odirleiborgert/rc2.0.0
Rc2.0.0
2 parents 77b67ae + f2d3977 commit 29ebe56

File tree

125 files changed

+2333
-55427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+2333
-55427
lines changed

‎README.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@
1212

1313
> Quality
1414
15-
[![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)
16-
17-
> Tags / Releases
18-
19-
[![GitHub tag](https://img.shields.io/github/tag/odirleiborgert/borgert-cms.svg)](https://github.com/odirleiborgert/borgert-cms/releases)
15+
[![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)
2016

2117
> Contributions / Donate
2218
23-
[![Beerpay](https://beerpay.io/odirleiborgert/borgert-cms/badge.svg)](https://beerpay.io/odirleiborgert/borgert-cms)
24-
[![GitHub issues](https://img.shields.io/github/issues/odirleiborgert/borgert-cms.svg)](https://github.com/odirleiborgert/borgert-cms/issues)
25-
[![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)
19+
[![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)
2620

2721
## Documentation
2822

@@ -45,14 +39,13 @@
4539
<a name="screenshots"></a>
4640
## Screenshots
4741

48-
![Imgur](http://i.imgur.com/3Yci6u0.png)
49-
50-
![Imgur](http://i.imgur.com/SipAkyQ.png)
42+
<img src="https://i.imgur.com/eYoez0g.png" /> <br><br>
5143

52-
![Imgur](http://i.imgur.com/GTiisSM.png)
44+
<img src="https://i.imgur.com/pZ8NfzQ.png" /> <br><br>
5345

54-
![Imgur](http://i.imgur.com/VGpDAPx.png)
46+
<img src="https://i.imgur.com/MimQStg.png" /> <br><br>
5547

48+
<img src="https://i.imgur.com/VpE9ysJ.png" /> <br><br>
5649

5750
<a name="contributions"></a>
5851
## Contributions

‎app/Helpers/helper.php

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ public function store(Request $request)
6767
'category_id' => 'required|integer',
6868
'title' => 'required',
6969
'description' => 'required',
70+
'seo_title' => 'required',
71+
'seo_description' => 'required',
7072
]);
7173

7274
$contentDetails = $request->all();
@@ -108,6 +110,8 @@ public function update(Request $request, $id)
108110
'category_id' => 'required|integer',
109111
'title' => 'required',
110112
'description' => 'required',
113+
'seo_title' => 'required',
114+
'seo_description' => 'required',
111115
]);
112116

113117
$content = $this->contents->find($id);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use App\User;
66
use Illuminate\Http\Request;
77
use App\Http\Controllers\Controller;
8-
use function App\Helpers\issetStatus;
98

109
class UsersController extends Controller
1110
{
@@ -62,7 +61,7 @@ public function store(Request $request)
6261

6362
$userDetails = $request->all();
6463
$userDetails['password'] = \Hash::make($request['password']);
65-
$userDetails['status'] = issetStatus($request['status']);
64+
$userDetails['status'] = isset($request['status']) ? 1 : 0;
6665
$this->users->create($userDetails);
6766

6867
\Session::flash('success', trans('admin/users.store.messages.success'));
@@ -106,7 +105,7 @@ public function update(Request $request, $id)
106105
if ($request['password']) {
107106
$userDetails['password'] = \Hash::make($request['password']);
108107
}
109-
$userDetails['status'] = issetStatus($request['status']);
108+
$userDetails['status'] = isset($request['status']) ? 1 : 0;
110109
$user->update($userDetails);
111110

112111
\Session::flash('success', trans('admin/users.update.messages.success'));

‎app/Http/Controllers/Site/CompanyController.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Site;
4+
5+
use App\Http\Controllers\Controller;
6+
use Symfony\Component\HttpFoundation\Request;
7+
8+
class CompanyController extends Controller
9+
{
10+
// -------------------------------------------------------------------
11+
12+
public function index(Request $request)
13+
{
14+
// rules
15+
}
16+
17+
// -------------------------------------------------------------------
18+
}

‎app/Http/Controllers/Site/ContactController.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Site;
4+
5+
use App\Http\Controllers\Controller;
6+
use Symfony\Component\HttpFoundation\Request;
7+
8+
class ContactController extends Controller
9+
{
10+
// -------------------------------------------------------------------
11+
12+
public function index(Request $request)
13+
{
14+
// rules
15+
}
16+
17+
// -------------------------------------------------------------------
18+
}

‎bower.json

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,13 @@
2222
"tests"
2323
],
2424
"dependencies": {
25-
"bootstrap": "^3.3.6",
26-
"jquery": "^3.3.0",
27-
"font-awesome": "Font-Awesome#^4.6.3",
28-
"animate.css": "^3.5.1",
29-
"metisMenu": "^2.5.2",
30-
"slimScroll": "^1.3.7",
31-
"PACE": "pace#^1.0.2",
32-
"jquery-ui": "^1.11.4",
33-
"summernote": "^0.8.1",
34-
"blueimp-file-upload": "^9.12.5",
35-
"awesome-bootstrap-checkbox": "^0.3.7",
36-
"datetimepicker": "^2.5.4",
37-
"switchery": "^0.8.1"
25+
"bootstrap": "^4.1.2",
26+
"font-awesome": "fontawesome#^4.7.0",
27+
"metisMenu": "metismenu#^2.7.9",
28+
"jquery": "^3.3.1",
29+
"blueimp-file-upload": "^9.22.0",
30+
"switchery": "^0.8.2",
31+
"summernote": "^0.8.10",
32+
"datetimepicker": "^2.5.20"
3833
}
3934
}

‎composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
],
3333
"psr-4": {
3434
"App\\": "app/"
35-
},
36-
"files": [
37-
"app/Helpers/helper.php"
38-
]
35+
}
3936
},
4037
"autoload-dev": {
4138
"classmap": [

‎config/borgert.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010

1111
'name' => 'Borgert CMS',
12-
'laravel' => 'Laravel 5.5',
13-
'version' => '1.0.5',
12+
'laravel' => 'Laravel 5.6',
13+
'version' => '2.0.0',
1414
'opensource' => 'https://github.com/odirleiborgert/borgert-cms',
1515

1616
];

‎config/logging.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
'channels' => [
3333
'stack' => [
3434
'driver' => 'stack',
35-
'channels' => ['single'],
35+
'channels' => ['daily'],
3636
],
3737

3838
'single' => [

‎docs/en/libraries.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@
77
* [laravel/laravel](https://github.com/laravel/laravel) - A PHP Framework For Web Artisans
88
* [thomaswelton/laravel-gravatar](https://github.com/thomaswelton/laravel-gravatar) - Image gravatar
99
* [kyslik/column-sortable](https://github.com/Kyslik/column-sortable) - Order by column
10+
* [rap2hpoutre/laravel-log-viewer](https://github.com/rap2hpoutre/laravel-log-viewer) - Log viewer
11+
* [nicolaslopezj/searchable](https://github.com/nicolaslopezj/searchable) - Search for blog
1012

1113

1214
-----
1315
#### Javascript Libraries
1416

15-
* [Animate.css](http://daneden.github.io/animate.css/) - Animation with CSS
1617
* [Bootstrap](http://getbootstrap.com) - Framework CSS
17-
* [Chart.js](http://chartjs.org) - Charts
1818
* [Font Awesome](http://http://fontawesome.io/) - Best Icones
1919
* [Jquery](http://jquery.com) - Framework Javascript
20-
* [Jquery UI](http://jqueryui.com) - User Interface
2120
* [Metis Menu](https://github.com/onokumus/metisMenu) - Menu toogle
22-
* [Pace](https://github.com/HubSpot/pace) - Loading pages
23-
* [Slim Scroll](https://github.com/rochal/jQuery-slimScroll) - Scroll
2421
* [Summer Note](https://github.com/summernote/summernote) - Editor text
2522
* [Blueimp - jQuery File Upload](https://github.com/blueimp/jQuery-File-Upload) - Upload files (ajax)
2623

‎docs/en/usage.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,20 @@ Route::group(['prefix' => 'blog', 'as' => 'blog.'], function () {
5656

5757
<a name="assets"></a>
5858
## Assets
59-
* 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]/`
59+
* 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]/`
6060

6161
<a name="languages"></a>
6262
## Languages
63-
Two languages currently available for Rocket, Portuguès and English by default by setting will be English.
64-
The file config / app.php look for locale and fallback_locale and change to `pt_BR`.
63+
Four languages currently available for Borgert CMS, Portuguese, Spanish, and English, by default we will be setting English.
64+
In the config/app.php file, look for locale and fallback_locale and change to `pt`.
6565

66-
The files for translations are located in the `resources\lang\[en,pt_BR\admin\**`
66+
The files for translations are located in the `resources/lang/[en,pt,es,zh_cn]/[admin,blog]/**`
6767

6868
```php
6969
'locale' => 'en',
7070
'fallback_locale' => 'en',
7171
```
7272

73-
<a name="phpcsfixer"></a>
74-
## PhpCsFixer
75-
* We use the command `php artisan borgert:phpcsfixer`, requires file phpcsfixer.phar
76-
77-
7873
#### You want to join?
7974
- Making a pull request or by creating an [issue] (https://github.com/odirleiborgert/borgert-cms/issues).
8075

‎docs/pt-br/libraries.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@
77
* [laravel/laravel](https://github.com/laravel/laravel) - A PHP Framework For Web Artisans
88
* [thomaswelton/laravel-gravatar](https://github.com/thomaswelton/laravel-gravatar) - Image gravatar
99
* [kyslik/column-sortable](https://github.com/Kyslik/column-sortable) - Ordenação por colunas
10+
* [rap2hpoutre/laravel-log-viewer](https://github.com/rap2hpoutre/laravel-log-viewer) - Visualizador de logs
11+
* [nicolaslopezj/searchable](https://github.com/nicolaslopezj/searchable) - Buscador para blog
1012

1113

1214
-----
1315
#### Javascript Libraries
1416

15-
* [Animate.css](http://daneden.github.io/animate.css/) - Animações com CSS
1617
* [Bootstrap](http://getbootstrap.com) - Framework CSS
17-
* [Chart.js](http://chartjs.org) - Gráficos
1818
* [Font Awesome](http://http://fontawesome.io/) - Ícones
1919
* [Jquery](http://jquery.com) - Framework Javascript
20-
* [Jquery UI](http://jqueryui.com) - User Interface
2120
* [Metis Menu](https://github.com/onokumus/metisMenu) - Menu toogle
22-
* [Pace](https://github.com/HubSpot/pace) - Loading páginas
23-
* [Slim Scroll](https://github.com/rochal/jQuery-slimScroll) - Barra de rolagem
2421
* [Summer Note](https://github.com/summernote/summernote) - Editor de texto
2522
* [Blueimp - jQuery File Upload](https://github.com/blueimp/jQuery-File-Upload) - Upload de arquivos (ajax)
2623

‎docs/pt-br/usage.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,20 @@ Route::group(['prefix' => 'blog', 'as' => 'blog.'], function () {
5757

5858
<a name="assets"></a>
5959
## Assets
60-
* 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]/`
60+
* 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]/`
6161

6262
<a name="languages"></a>
6363
## Idiomas
64-
Dois idiomas disponíveis no momento para o Rocket, Portuguès e Inglês, por padrão estaremos setando o inglês.
65-
No arquivo config/app.php procure por locale e fallback_locale e altere para `pt_BR`.
64+
Quatro idiomas disponíveis no momento para o Borgert CMS, Portuguès, Espanhol, e Inglês, por padrão estaremos setando o inglês.
65+
No arquivo config/app.php procure por locale e fallback_locale e altere para `pt`.
6666

67-
Os arquivos para traduções estarão localizados na pasta `resources\lang\[en,pt_BR\admin\**`
67+
Os arquivos para traduções estarão localizados na pasta `resources/lang/[en,pt,es,zh_cn]/[admin,blog]/**`
6868

6969
```php
7070
'locale' => 'en',
7171
'fallback_locale' => 'en',
7272
```
7373

74-
<a name="phpcsfixer"></a>
75-
## PhpCsFixer
76-
* Utilizamos o comando `php artisan borgert:phpcsfixer`, requer o arquivo phpcsfixer.phar
77-
78-
7974
#### Quer participar?
8075
- Fazendo um pull request ou criando uma [issue](https://github.com/odirleiborgert/borgert-cms/issues).
8176

‎gulpfile.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const elixir = require('laravel-elixir');
22

3-
require('laravel-elixir-vue-2');
4-
53
/*
64
|--------------------------------------------------------------------------
75
| Elixir Asset Management
@@ -18,22 +16,24 @@ elixir.config.sourcemaps = false;
1816

1917
elixir(function(mix) {
2018

21-
/**
22-
* Compile CSS with LESS, SASS or STYLUS
23-
*/
19+
// Auth
20+
mix.sass(['auth/styles.scss'],'public/assets/auth/css/all.css');
21+
mix.scripts(['auth/scripts.js'], 'public/assets/auth/js/all.js');
2422

25-
mix.less('admin/app.less','public/assets/admin/css');
26-
// mix.stylus('admin/app.styl','public/assets/admin/css');
27-
// mix.sass('admin/app.sass','public/assets/admin/css');
23+
// Admin
24+
mix.sass(['admin/styles.scss'],'public/assets/admin/css/all.css');
25+
mix.scripts(['admin/scripts.js'], 'public/assets/admin/js/all.js');
2826

27+
// Blog
28+
mix.sass(['blog/styles.scss'],'public/assets/blog/css/all.css');
29+
mix.scripts(['blog/scripts.js'], 'public/assets/blog/js/all.js');
2930

30-
/**
31-
* Compile Javascript with Webpack, rollup or scripts
32-
*/
31+
// Site
32+
mix.sass(['site/styles.scss'],'public/assets/site/css/all.css');
33+
mix.scripts(['site/scripts.js'], 'public/assets/site/js/all.js');
3334

34-
mix.webpack('app.js', 'public/assets/admin/js'); // for vue
35-
// mix.rollup('app.js', 'public/assets/admin/js');
36-
// mix.scripts('app.js', 'public/assets/admin/js');
37-
// mix.scriptsIn('public/js/some/directory'); // for directory
35+
// Errors
36+
mix.sass(['errors/styles.scss'],'public/assets/errors/css/all.css');
37+
mix.scripts(['errors/scripts.js'], 'public/assets/errors/js/all.js');
3838

3939
});

‎package.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,8 @@
55
"dev": "gulp watch"
66
},
77
"devDependencies": {
8-
"bootstrap-sass": "^3.0.0",
98
"gulp": "^3.9.1",
10-
"jquery": "^3.3.0",
11-
"laravel-elixir": "^6.0.0-9",
12-
"laravel-elixir-vue-2": "^0.2.0",
13-
"laravel-elixir-webpack-official": "^1.0.2",
14-
"lodash": "^4.16.2",
15-
"node-sass": "^4.7.2",
16-
"vue": "^2.0.1",
17-
"vue-resource": "^1.0.3"
9+
"laravel-elixir": "^6.0.0-18"
1810
},
1911
"dependencies": {}
2012
}

0 commit comments

Comments
 (0)