Skip to content

Commit

Permalink
Laravel 5.5 refactor (#72)
Browse files Browse the repository at this point in the history
* Started working on new version

* Removed gzero config

* Initial blade templates

* More work on blade templates

* Quick fix

* Added themsaid/laravel-langman

* Composer update

* added login and register methods and views

* Fixed trusted proxies config

* Fixed trusted proxies config to match docker IPs

* For now we'll allow all IPs for development

* Auth fixes

* Added barryvdh/laravel-ide-helper

* Form validation style fixes

* account views

* Used base user model

* Added barryvdh/laravel-debugbar

* Added navbar

* Navbar fixes

* Navbar fixes

* Fixed homepage to use multi language routes

* Added and configured darkaonline/l5-swagger

* Added gzero/admin

* Admin link and register form fix

* Language switcher

* Used views from base package

* Homepage fixes

* vue components

* More work on vue components

* vue components fixes

* Exception handler from base package

* Fixed api auth issues

* Removed translations

* composer update

* Added gzero/cms

* Added valitator translations

* User model fix

* Fixed home controller

* removed swagger security definitions

* Added gzero/cms

* Added gzero/cms

* Fixed user model

* composer update

* Added readme file

* Composer update with cms from master

* Composer update

* Composer update

* composer update

* Use new breadcrumbs partial. (#71)

* composer update

* Composer update

* composer update

* composer update

* Composer update

* composer update

* Enabled block load

* Homepage cleanup

* composer update

* composer update, updated home view

* composer update

* Fixed homepage view

* composer update

* Addec files configuration and directories

* Composer update

* Added ansible, travis & codeception

* Fixing travis setup

* Checking if develop scrip will work on travis

* Updated docker-compose in travis setup

* Disabled xdebug and added exec-root to develop script

* Quick fix

* Added missing croppa directories and config, validation translation fix

* composer update

* composer update

* Enabled cms tests

* Composer update

* Started working on npm packages

* Removed homepage controller and view

* Trying to setup frontend tests

* Added jQuery

* Added .eslintignore

* Updated webpack mix

* Added missing translations

* Added Ava snapshots, gzero/cms and gzero/core 3.0.0-alpha1

* Added gitlab cfg, license and release-it cfg

* Added missing configuration, images and js libraries

* Added manifest and vendor js files

* Fixed mapApiRequests and app name
  • Loading branch information
PSkierniewski authored and AdrianSkierniewski committed Jan 4, 2018
1 parent bdd8ee3 commit 58aeb64
Show file tree
Hide file tree
Showing 232 changed files with 55,720 additions and 29,469 deletions.
4 changes: 2 additions & 2 deletions .env.example
@@ -1,6 +1,6 @@
APP_NAME=GZERO-CMS
APP_ENV=local
APP_KEY=base64:aQH6a/dWOf67PeU3MW1K/ynoLdxJkOov5WY6LrAsHlo=
APP_KEY=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost
Expand Down Expand Up @@ -71,4 +71,4 @@ S3_SECRET=
S3_REGION=
S3_BUCKET=

UPLOAD_DISK=uploads
UPLOAD_DISK=uploads
36 changes: 8 additions & 28 deletions .env.testing
@@ -1,41 +1,21 @@
APP_ENV=testing
APP_KEY=base64:aQH6a/dWOf67PeU3MW1K/ynoLdxJkOov5WY6LrAsHlo=
APP_DEBUG=false
APP_KEY=base64:Ic6pTojx4LCATOES7Ugwx8H5c+U6DKGpNSopye4etVk=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost
APP_URL=http://dev.gzero.pl

DOMAIN=localhost
SESSION_DOMAIN=.localhost

MULTILANG_ENABLED=true
MULTILANG_SUBDOMAIN=false
DOMAIN=dev.gzero.pl
SESSION_DOMAIN=.dev.gzero.pl

DB_CONNECTION=pgsql
DB_HOST=db_tests_server
DB_PORT=5432
DB_DATABASE=gzero_cms
DB_USERNAME=gzero_cms
DB_PASSWORD=
DB_PASSWORD=test

BROADCAST_DRIVER=log
CACHE_DRIVER=array
SESSION_DRIVER=redis
SESSION_DRIVER=array
QUEUE_DRIVER=sync

REDIS_HOST=redis_server
REDIS_PASSWORD=null
REDIS_PORT=6379
REDIS_DB=1

MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

PUSHER_APP_ID=
PUSHER_KEY=
PUSHER_SECRET=

UPLOAD_DISK=test
UPLOAD_DISK=uploads
4 changes: 2 additions & 2 deletions .gitattributes
@@ -1,5 +1,5 @@
* text=auto
*.css linguist-vendored
*.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore
*.js linguist-vendored
CHANGELOG.md export-ignore
4 changes: 2 additions & 2 deletions .release.json → .release-it.json
Expand Up @@ -7,12 +7,12 @@
"increment": "patch",
"prereleaseId": null,
"commitMessage": "Release %s",
"tagName": "v%s",
"tagAnnotation": "Release %s",
"buildCommand": false,
"changelogCommand": "git log --pretty=format:'* %s (%h)' `git describe --tags --abbrev=0`..HEAD",
"requireCleanWorkingDir": false,
"src": {
"tagName": "v%s",
"pushRepo": null,
"beforeStartCommand": false,
"beforeStageCommand": false,
Expand All @@ -22,7 +22,7 @@
"publish": false,
"publishPath": ".",
"tag": "latest",
"private": false,
"private": true,
"forcePublishSourceRepo": false
},
"github": {
Expand Down
15 changes: 5 additions & 10 deletions .travis.yml
Expand Up @@ -13,7 +13,7 @@ services:
- docker

env:
DOCKER_COMPOSE_VERSION: 1.14.0
DOCKER_COMPOSE_VERSION: 1.18.0

before_install:
- sudo rm /usr/local/bin/docker-compose
Expand All @@ -26,19 +26,14 @@ before_script:
- docker-compose version
- docker-compose up -d
- docker-compose run --rm -w /var/www node_server npm -s install
- docker exec -i platform_web_server_1 phpdismod xdebug # disabling xdebug to speed up composer
- docker exec -i platform_web_server_1 composer install -d /var/www/ --prefer-dist --no-interaction --no-suggest --no-progress || true
- docker exec -i platform_web_server_1 phpenmod xdebug # enabling xdebug for code coverage
- docker-compose exec web_server phpdismod xdebug # disabling xdebug to speed up composer
- ./develop composer install -d /var/www/ --prefer-dist --no-interaction --no-suggest --no-progress || true
- ./develop artisan passport:keys

script:
- docker-compose run --rm -w /var/www node_server npm -s run lint
- docker-compose run --rm -w /var/www node_server npm -s test -- --verbose
- "docker exec -i platform_web_server_1 php /var/www/vendor/bin/codecept run -c /var/www/codeception.yml -o \"settings: lint:false\" --coverage --coverage-xml --env platform,ml_disabled"
- docker exec -i platform_web_server_1 mkdir -p /var/www/build/logs
- docker exec -i platform_web_server_1 cp /var/www/tests/_output/coverage.xml /var/www/build/logs/clover.xml

after_script:
- docker exec -i platform_web_server_1 bash -c "export TRAVIS=$TRAVIS && export TRAVIS_JOB_ID=$TRAVIS_JOB_ID && cd /var/www && vendor/bin/coveralls -v"
- ./develop test

matrix:
fast_finish: true
2 changes: 1 addition & 1 deletion LICENSE.md
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -92,7 +92,7 @@ Starting platform_web_server_1
- You can also seed database with example data using this command

```
./develop artisan db:seed --class='Gzero\\Core\\CMSSeeder'
./develop artisan db:seed --class='Gzero\\Cms\\CMSSeeder'
```

- You may want to publish vendor assets as well
Expand Down
4 changes: 3 additions & 1 deletion app/Console/Kernel.php
Expand Up @@ -29,12 +29,14 @@ protected function schedule(Schedule $schedule)
}

/**
* Register the Closure based commands for the application.
* Register the commands for the application.
*
* @return void
*/
protected function commands()
{
$this->load(__DIR__.'/Commands');

require base_path('routes/console.php');
}
}
31 changes: 24 additions & 7 deletions app/Exceptions/Handler.php
Expand Up @@ -5,14 +5,33 @@
use Exception;
use Gzero\Core\Exceptions\Handler as ExceptionHandler;

class Handler extends ExceptionHandler {
class Handler extends ExceptionHandler
{
/**
* A list of the exception types that are not reported.
*
* @var array
*/
protected $dontReport = [
//
];

/**
* A list of the inputs that are never flashed for validation exceptions.
*
* @var array
*/
protected $dontFlash = [
'password',
'password_confirmation',
];

/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $exception
*
* @param \Exception $exception
* @return void
*/
public function report(Exception $exception)
Expand All @@ -23,14 +42,12 @@ public function report(Exception $exception)
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
{
return parent::render($request, $exception);
}

}
Empty file added app/Http/Controllers/.gitkeep
Empty file.
35 changes: 0 additions & 35 deletions app/Http/Controllers/AccountController.php

This file was deleted.

32 changes: 0 additions & 32 deletions app/Http/Controllers/Auth/ForgotPasswordController.php

This file was deleted.

39 changes: 0 additions & 39 deletions app/Http/Controllers/Auth/LoginController.php

This file was deleted.

0 comments on commit 58aeb64

Please sign in to comment.