Skip to content

Commit

Permalink
Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Wartner committed Aug 23, 2016
1 parent 7cbbbce commit 04638e8
Show file tree
Hide file tree
Showing 18 changed files with 3,639 additions and 2,967 deletions.
483 changes: 256 additions & 227 deletions .idea/workspace.xml

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion app/Providers/RouteServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function map()

$this->mapApiRoutes();

//
$this->mapPublicRoutes();
}

/**
Expand Down Expand Up @@ -76,4 +76,22 @@ protected function mapApiRoutes()
require base_path('routes/api.php');
});
}

/**
* Define the "public" routes for the application.
*
* These routes all receive session state, CSRF protection, etc.
*
* @return void
*/
protected function mapPublicRoutes()
{
Route::group([
'middleware' => 'web',
'namespace' => $this->namespace,
'prefix' => 'public',
], function ($router) {
require base_path('routes/public.php');
});
}
}
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.3.*",
"laravel/framework": "5.3",
"pusher/pusher-php-server": "^2.4",
"pda/pheanstalk": "^3.1",
"spatie/laravel-permission": "^1.5",
Expand Down Expand Up @@ -60,6 +60,6 @@
"config": {
"preferred-install": "dist"
},
"minimum-stability": "dev",
"minimum-stability": "stable",
"prefer-stable": true
}
58 changes: 29 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,31 @@
"dev": "gulp watch"
},
"devDependencies": {
"bootstrap-sass": "^3.3.7",
"gulp": "^3.9.1",
"jquery": "^3.1.0",
"laravel-elixir": "^6.0.0-9",
"laravel-elixir-vue": "^0.1.4",
"laravel-elixir-webpack-official": "^1.0.2",
"lodash": "^4.14.0",
"vue": "^1.0.26",
"vue-resource": "^0.9.3"
"laravel-elixir-webpack-official": "^1.0.2"
},
"dependencies": {
"algoliasearch": "^3.18.0",
"algoliasearch-helper": "^2.12.0",
"autocomplete.js": "^0.21.3",
"bootstrap-material-design": "^0.5.10",
"bootstrap-sass": "^3.3.7",
"instantsearch.js": "^1.7.1",
"jquery": "^3.1.0",
"jquery-textcomplete": "^1.6.2",
"laravel-echo": "^0.1.2",
"lodash": "^4.14.0",
"marked": "^0.3.6",
"moment": "^2.14.1",
"places.js": "^1.4.3",
"pusher-js": "^3.2.1",
"selectize": "^0.12.2",
"sweetalert": "^1.1.3",
"toastr": "^2.1.2"
"toastr": "^2.1.2",
"vue": "^1.0.26",
"vue-multiselect": "^1.1.2",
"vue-resource": "^0.9.3"
}
}
Loading

0 comments on commit 04638e8

Please sign in to comment.