Skip to content

Commit

Permalink
Merge pull request #55 from Disfactory/master
Browse files Browse the repository at this point in the history
2.0
  • Loading branch information
Yukaii authored Nov 25, 2020
2 parents 2d3c63e + a5c6ecf commit 3526716
Show file tree
Hide file tree
Showing 57 changed files with 2,999 additions and 1,361 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
npm ci
npm run build
- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@3.5.9
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
BASE_BRANCH: master
Expand Down
87 changes: 78 additions & 9 deletions package-lock.json

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

13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@disfactory/exif-js": "^2.3.0",
"@vue/composition-api": "^0.3.2",
"axios": "^0.19.0",
"copy-to-clipboard": "^3.3.1",
"core-js": "^3.4.2",
"@disfactory/exif-js": "^2.3.0",
"fibers": "^4.0.2",
"normalize.css": "^8.0.1",
"register-service-worker": "^1.6.2",
"vue": "^2.6.10",
"vue-carousel": "^0.18.0",
"vue-gtag": "^1.1.1"
"vue-gtag": "^1.1.1",
"vuetify": "^2.3.17"
},
"devDependencies": {
"@types/ol": "^5.3.6",
Expand All @@ -39,12 +39,15 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.0.1",
"fibers": "^4.0.3",
"lint-staged": "^9.4.3",
"ol": "^5.3.3",
"sass": "^1.23.7",
"sass-loader": "^8.0.0",
"typescript": "^3.7.2",
"vue-template-compiler": "^2.6.10"
"vue-cli-plugin-vuetify": "~2.0.6",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.3.0"
},
"gitHooks": {
"pre-commit": "lint-staged"
Expand Down
6 changes: 3 additions & 3 deletions public/images/locate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/marker-0.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/marker-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/marker-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/marker-3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/marker-4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/marker-5.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3526716

Please sign in to comment.