Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
kutaloweb committed Mar 21, 2019
2 parents cf9d9df + 6324018 commit 9d02b9f
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 65 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"require": {
"php": "^7.1.3",
"barryvdh/laravel-ide-helper": "^2.4",
"bepsvpt/secure-headers": "^4.1",
"bepsvpt/secure-headers": "^5.3",
"doctrine/dbal": "~2.3",
"fideloper/proxy": "^4.0",
"guzzlehttp/guzzle": "^6.3",
"intervention/image": "^2.4",
"jaybizzle/laravel-crawler-detect": "1.*",
"laravel/framework": "5.6.*",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0",
"mews/purifier": "^2.0",
"nutsweb/laravel-prerender": "^2.0",
Expand Down
24 changes: 16 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"name": "spala",
"version": "1.0.1",
"version": "1.0.2",
"author": "Alexey Kutalo <[email protected]>",
"license": "MIT",
"description": "A modern lightweight CMS for Laravel and Vue developers",
"keywords": [
"spala", "cms" ,"vue", "laravel"
"spala",
"cms",
"vue",
"laravel"
],
"repository": {
"type": "git",
Expand All @@ -21,16 +24,21 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"acorn": "^6.0.0",
"axios": "^0.18",
"browser-sync": "^2.18.13",
"browser-sync-webpack-plugin": "^1.2.0",
"cross-env": "^5.1",
"laravel-mix": "^2.0",
"normalize-scss": "^7.0.0",
"webpack-bundle-analyzer": "^2.9.0",
"browser-sync-webpack-plugin": "^2.2.2",
"codemirror": "^5.30.0",
"compression-webpack-plugin": "^1.0.1",
"lodash": "^4.17.4"
"cross-env": "^5.1",
"laravel-mix": "^4.0.7",
"lodash": "^4.17.4",
"normalize-scss": "^7.0.0",
"resolve-url-loader": "^2.3.1",
"sass": "^1.17.3",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.6.10",
"webpack-bundle-analyzer": "^2.9.0"
},
"dependencies": {
"js-cookie": "^2.1.4",
Expand Down
12 changes: 8 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<a href="https://packagist.org/packages/spala/spala"><img src="https://poser.pugx.org/spala/spala/license.svg" alt="License"></a>
</p>

SPA Content Management System based on [Laravel 5.6](https://laravel.com), [Vue 2.5](https://vuejs.org), [Bootstrap 4](https://getbootstrap.com/) and [Monster Admin Template](https://wrappixel.com/demos/admin-templates/monster-admin/Documentation/document.html)
SPA Content Management System based on [Laravel 5.8](https://laravel.com), [Vue 2.5](https://vuejs.org), [Bootstrap 4](https://getbootstrap.com/) and [Monster Admin Template](https://wrappixel.com/demos/admin-templates/monster-admin/Documentation/document.html)

![Screen](https://user-images.githubusercontent.com/17153568/53791966-80bcd980-3edf-11e9-9425-12fd7a789ad7.png "Dashboard")

Expand All @@ -32,7 +32,7 @@ Install the application dependencies

```
composer install
npm instal
npm install
```

Create the environment configuration file and edit it with your favorite IDE
Expand Down Expand Up @@ -78,9 +78,13 @@ Install the application (create default roles, permissions, etc.)
php artisan install
```

By default server-side rendering is used for the SEO purposes but if you need your own prerender server you can use [prerender.io](https://prerender.io/)

## First steps

Go to the page `/register`. The first registered user will get the admin role

By default server-side rendering is used for the SEO purposes but if you need your own prerender server you can use [prerender.io](https://prerender.io/)
If you need enable login and give other permissions to user role on the page `/configuration/permission/assign`

## Contributing

Expand All @@ -92,4 +96,4 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file

## Premium Support

Want help with implementation or new features? Start a conversation with me: [email protected]
Want help with implementation or new features? Start a conversation with me: [email protected]
Loading

0 comments on commit 9d02b9f

Please sign in to comment.