Skip to content

Commit

Permalink
Merge pull request #110 from Disfactory/master
Browse files Browse the repository at this point in the history
2.1.0
  • Loading branch information
Yukaii authored May 26, 2021
2 parents f22e07b + d0d9cf6 commit 897728d
Show file tree
Hide file tree
Showing 27 changed files with 22,024 additions and 424 deletions.
File renamed without changes.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ jobs:
needs: [lint, typecheck, unit-test]
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]') && github.event_name == 'push' && github.ref == 'refs/heads/master'"
env:
VUE_APP_PROTOMAP_API_KEY: e6cfbd46818cf623
steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.x
Expand All @@ -63,6 +65,7 @@ jobs:
- name: Install and Build
run: |
npm ci
echo "VUE_APP_BASE_URL=https://api.disfactory.tw/api" > .env
npm run build
- name: Deploy to GitHub Pages
uses: JamesIves/[email protected]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# local env files
.env.local
.env.*.local
.env

# Log files
npm-debug.log*
Expand Down
25 changes: 18 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,45 @@
# frontend
# Disfactory frontend

- Staging Server: https://dev.disfactory.tw (latest `master` branch)
- Production server: https://disfactory.tw (`production` branch)

## Project setup
```

```bash
cp .env.example .env
npm install
```

### Compiles and hot-reloads for development
```

```bash
npm run serve
```

### Compiles and minifies for production
```

```bash
npm run build
```

### Run your tests
```

```bash
npm run test
```

### Lints and fixes files
```

```bash
npm run lint
```

### Run your unit tests
```

```bash
npm run test:unit
```

### Customize configuration

See [Configuration Reference](https://cli.vuejs.org/config/).
Loading

0 comments on commit 897728d

Please sign in to comment.