Skip to content

Commit

Permalink
Merge pull request #29 from fga-eps-mds/release/v0.2.0
Browse files Browse the repository at this point in the history
Release/v0.2.0
  • Loading branch information
shayanealcantara authored Nov 15, 2019
2 parents 667c916 + 46a55d2 commit 29274ab
Show file tree
Hide file tree
Showing 55 changed files with 9,655 additions and 3,285 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env"]
}
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VUE_APP_API_URL=http://0.0.0.0:8000/
1 change: 1 addition & 0 deletions .env.staging
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VUE_APP_API_URL=https://acacia-backend-staging.herokuapp.com
11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
extends: [
// add more generic rulesets here, such as:
// 'eslint:recommended',
'plugin:vue/recommended'
],
rules: {
// override/add rules settings here, such as:
// 'vue/no-unused-vars': 'error'
},
}
25 changes: 25 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

name: CD

on:
push:
branches:
- develop
- release/*
- feature/124-relationship-heroku-actions

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: setup environment
run: docker build -t acacia-front-heroku .
- name: Run container
run: docker run -d -p 8080:8080 acacia-front-heroku
- name: heroku login
uses: actions/heroku@master
with:
args: "apps"
29 changes: 19 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@

name: CI

on:
pull_request:
branches:
- master
- develop
- release/*
on: push

jobs:
test:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: setup environment
- name: Setup environment
run: docker-compose up -d --build
- name: Run tests
run: docker exec acacia-frontend npm run test:unit
Expand All @@ -25,4 +18,20 @@ jobs:
token: ${{secrets.CODECOV_TOKEN}}
file: ./coverage/clover.xml
flags: unittests
name: codecov-umbrella
name: codecov-umbrella
style-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: setup environment
run: docker-compose up -d --build
- name: Run linter
run: docker exec acacia-frontend npm run lint
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Setup enviroment
run: docker-compose up -d --build
- name: Build
run: docker exec acacia-frontend npm run build
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules/
public/
dist/

# Log files
npm-debug.log*
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ ADD . /app

EXPOSE 8080

CMD ["npm", "run", "serve"]
CMD npm run build:stage; npm start
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p align="center"> <img src="src/assets/wordmark_1.svg" width="400"></p>
<p align="center"> <img src="src/assets/images/wordmark_1.svg" width="400"></p>

## Visão geral

Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ services:
build:
context: .
dockerfile: Dockerfile
command: "npm run serve"
ports:
- "8000:8080"
- "8080:8080"
volumes:
- .:/app
- /app/node_modules
10 changes: 8 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module.exports = {
'js',
'jsx',
'json',
'ts',
'vue'
],
transform: {
'^.+\\.vue$': 'vue-jest',
'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
'^.+\\.jsx?$': 'babel-jest'
'^.+\\.js$': "<rootDir>/node_modules/babel-jest"
},
transformIgnorePatterns: [
'/node_modules/'
Expand All @@ -28,5 +29,10 @@ module.exports = {
'jest-watch-typeahead/testname'
],
collectCoverage: true,
collectCoverageFrom: ["**/src/**.{js,vue}", "!**/node_modules/**", "!**src/main.js**", "!**src/router.js**"]
collectCoverageFrom: ["**/src/**.{js,vue}", "!**/node_modules/**", "!**src/main.js**", "!**src/router.js**"],
verbose: true,
coverageReporters: [
"html",
"text-summary"
]
}
Loading

0 comments on commit 29274ab

Please sign in to comment.