Skip to content

Commit b80be5e

Browse files
committed
works for 5.4
1 parent 3312e73 commit b80be5e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"type": "project",
77
"require": {
88
"php": ">=5.6.4",
9-
"laravel/framework": "5.3.*",
9+
"laravel/framework": "5.4.*",
1010
"dingo/api": "1.0.x@dev",
1111
"tymon/jwt-auth": "1.0.*@dev",
12-
"darkaonline/l5-swagger": "~3.0"
12+
"darkaonline/l5-swagger": "~4.0"
1313
},
1414
"require-dev": {
1515
"fzaninotto/faker": "~1.4",

resources/assets/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require('./bootstrap');
1616
* the application, or feel free to tweak this setup for your needs.
1717
*/
1818

19-
var VueRouter = require('vue-router');
19+
import VueRouter from 'vue-router';
2020
Vue.use(VueRouter);
2121

2222
var VueResource = require('vue-resource');

resources/assets/js/pages/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<span class="icon-bar"></span>
1212
<span class="icon-bar"></span>
1313
</button>
14-
<a class="navbar-brand" href="#">Laravel/Vue.js</a>
14+
<a class="navbar-brand" href="#">Laravel 5.4 / Vue.js 2.x</a>
1515
<ul class="nav navbar-nav">
1616
<router-link tag="li" to="/" exact><a>One</a></router-link>
1717
<router-link tag="li" to="/two"><a>Two</a></router-link>

resources/views/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<meta name="csrf-token" content="{{ csrf_token() }}">
88

9-
<title>Laravel5/Vue.js2</title>
9+
<title>Laravel 5.4 / Vue.js 2.x</title>
1010

1111
<!-- Fonts -->
1212
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">

0 commit comments

Comments
 (0)