Skip to content

Commit bdb38c2

Browse files
vedovellivedovelli
committed
Merge branch 'release/1.0.3'
2 parents 2beb0bb + 7d47017 commit bdb38c2

Some content is hidden

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

82 files changed

+2538
-1104
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ npm-debug.log
33

44
.vscode/launch.json
55
.idea
6+
7+
client/npm-debug.log.1734035463

‎.styleci.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
preset: laravel
2+
3+
finder:
4+
exclude:
5+
- tests
6+
- views
7+
8+
not-name:
9+
- index.php
10+
- server.php
11+
- AuthServiceProvider.php

‎.travis.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
language: php
2+
3+
php:
4+
- 5.6
5+
- 7.0
6+
- 7.1
7+
8+
# This triggers builds to run on the new TravisCI infrastructure.
9+
# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
10+
sudo: false
11+
12+
## Cache composer for faster builds
13+
cache:
14+
directories:
15+
- $HOME/.composer/cache
16+
17+
before_script:
18+
- cd ./webservice
19+
- cp .env.travis .env
20+
- travis_retry composer self-update
21+
- travis_retry composer update --no-interaction --prefer-dist
22+
- php artisan key:gen
23+
- php artisan jwt:secret -f
24+
25+
script:
26+
- vendor/bin/phpunit

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Codecast's Single Page Application Starter Kit
22

3+
[![Build Status](https://travis-ci.org/codecasts/spa-starter-kit.svg?branch=develop)](https://travis-ci.org/codecasts/spa-starter-kit)
4+
35
![Cover](http://vedovelli.com.br/spas.png)
46

57
> A **highly opinionated** Single Page Application starter kit built on top of Vue.js and Laravel.
@@ -25,7 +27,7 @@ The live demo can be found in [https://spa.codecasts.rocks/](https://spa.codecas
2527
* Pagination integrated with [Laravel's LengthAwarePaginator](https://laravel.com/docs/5.3/pagination#converting-results-to-json)
2628
* Alerts and Confirmation Alerts provided by [SweetAlert](http://t4t5.github.io/sweetalert/)
2729
2. Server side
28-
* Laravel 5.3
30+
* [Laravel 5.3](https://github.com/laravel/laravel/tree/v5.3.16)
2931
* Authentication with JWT
3032
* [Fractal](http://fractal.thephpleague.com/)
3133
* Web service RESTful with Dingo *(planned)*
@@ -95,15 +97,15 @@ $ composer test
9597
## Contributing
9698

9799
1. Fork it!
98-
2. Create your feature branch from **develop**: `git checkout -b my-new-feature`
100+
2. Create your feature branch from **develop**: `git checkout -b feature/my-new-feature`
99101
3. Write your code. Comment your code.
100102
4. Commit your changes: `git commit -am 'Add some feature'`
101-
5. Push to the branch: `git push origin my-new-feature`
103+
5. Push to the branch: `git push origin feature/my-new-feature`
102104
6. Submit a pull request to **develop** branch :D
103105

104106
## Credits
105107

106-
[Fábio Vedovelli](https://github.com/vedovelli)
108+
[Fábio Vedovelli](https://github.com/vedovelli) and dedicated [contributors](https://github.com/codecasts/spa-starter-kit/graphs/contributors).
107109

108110
## License
109111

‎client/.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module.exports = {
2424
},
2525
// add your custom rules here
2626
'rules': {
27+
'import/no-unresolved': [2, { ignore: ['^plugins\/.*', '^utils\/.*'] }],
2728
// don't require .vue extension when importing
2829
'import/extensions': ['error', 'always', {
2930
'js': 'never',

‎client/build/webpack.base.conf.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ module.exports = {
2424
fallback: [path.join(__dirname, '../node_modules')],
2525
alias: {
2626
'src': path.resolve(__dirname, '../src'),
27+
'plugins': path.resolve(__dirname, '../src/plugins'),
28+
'utils': path.resolve(__dirname, '../src/utils'),
2729
'assets': path.resolve(__dirname, '../src/assets'),
2830
'components': path.resolve(__dirname, '../src/components')
2931
}

‎client/config/dev.env.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ var prodEnv = require('./prod.env')
44
module.exports = merge(prodEnv, {
55
NODE_ENV: '"development"',
66
API_URL: '"http://localhost:8000/api"',
7-
VERSION: '"1.0.2"',
7+
VERSION: '"1.0.3"',
88
})

‎client/config/prod.env.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
22
NODE_ENV: '"production"',
33
API_URL: '"https://spa.vedcasts.com.br/api"',
4-
VERSION: '"1.0.2"',
4+
VERSION: '"1.0.3"',
55
}

‎client/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<title>Codecasts.com.br - SPA - Starter Kit</title>
6+
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-default/index.css">
67
</head>
78
<body>
89
<a href="https://github.com/codecasts/spa-starter-kit"><img style="position: absolute; top: 0; left: 0; border: 0; z-index: 2;" src="https://camo.githubusercontent.com/121cd7cbdc3e4855075ea8b558508b91ac463ac2/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_green_007200.png"></a>

‎client/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codecasts-spa-starter-kit",
3-
"version": "1.0.0",
3+
"version": "1.0.3",
44
"description": "Client for Codecast's SPA Starter Kit",
55
"author": "Fabio Vedovelli <[email protected]>",
66
"private": true,
@@ -15,13 +15,15 @@
1515
"dependencies": {
1616
"axios": "^0.15.2",
1717
"bootstrap-sass": "^3.3.7",
18+
"element-ui": "^1.0.7",
1819
"font-awesome": "^4.7.0",
1920
"jquery": "^3.1.1",
2021
"lodash": "^4.17.2",
2122
"sweetalert": "^1.1.3",
2223
"vue": "^2.0.1",
2324
"vue-router": "^2.0.1",
24-
"vuex": "^2.0.0"
25+
"vuex": "^2.0.0",
26+
"vuex-router-sync": "^3.0.0"
2527
},
2628
"devDependencies": {
2729
"autoprefixer": "^6.4.0",

0 commit comments

Comments
 (0)