Skip to content
This repository was archived by the owner on May 26, 2021. It is now read-only.

Commit 993cfe9

Browse files
D3SOXD3SOX
committed
updated dependencies, some formatting & todos, re-apply prettier
1 parent a1e62dc commit 993cfe9

19 files changed

+223
-235
lines changed

‎.eslintrc.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ module.exports = {
1616
rules: {
1717
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
1818
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
19+
// TODO: Needed for Vuetify data tables slots. Remove once https://github.com/vuejs/eslint-plugin-vue/issues/1165 / https://github.com/vuejs/eslint-plugin-vue/issues/1229 is resolved
20+
'vue/valid-v-slot': 'off',
1921
'vuetify/no-deprecated-classes': 'error',
2022
'vuetify/grid-unknown-attributes': 'error',
2123
'vuetify/no-legacy-grid': 'error',

‎.github/dependabot.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "npm"
4-
directory: "/"
5-
schedule:
6-
interval: "daily"
7-
open-pull-requests-limit: 15
8-
- package-ecosystem: "github-actions"
9-
directory: "/"
10-
schedule:
11-
interval: "daily"
12-
open-pull-requests-limit: 15
3+
- package-ecosystem: 'npm'
4+
directory: '/'
5+
schedule:
6+
interval: 'daily'
7+
open-pull-requests-limit: 15
8+
- package-ecosystem: 'github-actions'
9+
directory: '/'
10+
schedule:
11+
interval: 'daily'
12+
open-pull-requests-limit: 15

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
name: "CodeQL"
1+
name: 'CodeQL'
22

33
on:
4-
push:
5-
branches: [master, ]
6-
pull_request:
7-
# The branches below must be a subset of the branches above
8-
branches: [master]
9-
schedule:
10-
- cron: '0 6 * * 3'
4+
push:
5+
branches: [master]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [master]
9+
schedule:
10+
- cron: '0 6 * * 3'
1111

1212
jobs:
13-
analyse:
14-
name: Analyse
15-
runs-on: ubuntu-latest
16-
17-
steps:
18-
- name: Checkout repository
19-
uses: actions/checkout@v2
20-
with:
21-
# We must fetch at least the immediate parents so that if this is
22-
# a pull request then we can checkout the head.
23-
fetch-depth: 2
24-
25-
# If this run was triggered by a pull request event, then checkout
26-
# the head of the pull request instead of the merge commit.
27-
- run: git checkout HEAD^2
28-
if: ${{ github.event_name == 'pull_request' }}
29-
30-
# Initializes the CodeQL tools for scanning.
31-
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@v1
33-
# Override language selection by uncommenting this and choosing your languages
34-
# with:
35-
# languages: go, javascript, csharp, python, cpp, java
36-
37-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
38-
# If this step fails, then you should remove it and run the build manually (see below)
39-
- name: Autobuild
40-
uses: github/codeql-action/autobuild@v1
41-
42-
# ℹ️ Command-line programs to run using the OS shell.
43-
# 📚 https://git.io/JvXDl
44-
45-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
46-
# and modify them (or add more) to build your code if your project
47-
# uses a compiled language
48-
49-
#- run: |
50-
# make bootstrap
51-
# make release
52-
53-
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@v1
13+
analyse:
14+
name: Analyse
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v2
20+
with:
21+
# We must fetch at least the immediate parents so that if this is
22+
# a pull request then we can checkout the head.
23+
fetch-depth: 2
24+
25+
# If this run was triggered by a pull request event, then checkout
26+
# the head of the pull request instead of the merge commit.
27+
- run: git checkout HEAD^2
28+
if: ${{ github.event_name == 'pull_request' }}
29+
30+
# Initializes the CodeQL tools for scanning.
31+
- name: Initialize CodeQL
32+
uses: github/codeql-action/init@v1
33+
# Override language selection by uncommenting this and choosing your languages
34+
# with:
35+
# languages: go, javascript, csharp, python, cpp, java
36+
37+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
38+
# If this step fails, then you should remove it and run the build manually (see below)
39+
- name: Autobuild
40+
uses: github/codeql-action/autobuild@v1
41+
42+
# ℹ️ Command-line programs to run using the OS shell.
43+
# 📚 https://git.io/JvXDl
44+
45+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
46+
# and modify them (or add more) to build your code if your project
47+
# uses a compiled language
48+
49+
#- run: |
50+
# make bootstrap
51+
# make release
52+
53+
- name: Perform CodeQL Analysis
54+
uses: github/codeql-action/analyze@v1

‎.github/workflows/docker-image.yml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
name: Docker Image CI
22

33
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
88

99
jobs:
10+
build:
11+
runs-on: ubuntu-latest
1012

11-
build:
12-
13-
runs-on: ubuntu-latest
14-
15-
steps:
16-
- name: Check out the repo
17-
uses: actions/checkout@v2.3.1
18-
- name: Build and push Docker images
19-
uses: docker/build-push-action@v1.1.0
20-
with:
21-
username: ${{ github.actor }}
22-
password: ${{ secrets.GITHUB_TOKEN }}
23-
registry: docker.pkg.github.com
24-
repository: cardsity/vue-client/cardsity-vue-client
25-
tags: latest
26-
tag_with_ref: true
13+
steps:
14+
- name: Check out the repo
15+
uses: actions/checkout@v2.3.1
16+
- name: Build and push Docker images
17+
uses: docker/build-push-action@v1.1.0
18+
with:
19+
username: ${{ github.actor }}
20+
password: ${{ secrets.GITHUB_TOKEN }}
21+
registry: docker.pkg.github.com
22+
repository: cardsity/vue-client/cardsity-vue-client
23+
tags: latest
24+
tag_with_ref: true

‎.github/workflows/node.js.yml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
name: Node.js CI
22

33
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
88

99
jobs:
10+
build:
11+
runs-on: ubuntu-latest
1012

11-
build:
12-
13-
runs-on: ubuntu-latest
14-
15-
steps:
16-
- name: Check out the repo
17-
uses: actions/checkout@v2.3.1
18-
- name: Use Node.js
19-
uses: actions/setup-node@v1
20-
with:
21-
node-version: '14.x'
22-
- run: yarn install
23-
- run: yarn build
24-
- name: Archive production artifacts
25-
uses: actions/upload-artifact@v2.1.4
26-
with:
27-
name: dist
28-
path: dist
13+
steps:
14+
- name: Check out the repo
15+
uses: actions/checkout@v2.3.1
16+
- name: Use Node.js
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: '14.x'
20+
- run: yarn install
21+
- run: yarn build
22+
- name: Archive production artifacts
23+
uses: actions/upload-artifact@v2.1.4
24+
with:
25+
name: dist
26+
path: dist

‎package.json‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
{
2-
"name": "cardsity-vue-client",
3-
"version": "0.1.0",
4-
"description": "Web client for the Cards Against Humanity clone Cardsity",
5-
"license": "GPL-3.0-or-later",
6-
"homepage": "https://cardsity.app",
7-
"repository": {
8-
"type": "git",
9-
"url": "https://github.com/Cardsity/vue-client.git"
10-
},
11-
"scripts": {
12-
"serve": "vue-cli-service serve",
13-
"build": "vue-cli-service build",
14-
"lint": "vue-cli-service lint"
15-
},
16-
"dependencies": {
17-
"@trainiac/html2canvas": "^1.0.0",
18-
"core-js": "^3.6.5",
19-
"register-service-worker": "^1.7.1",
20-
"roboto-fontface": "*",
21-
"vue": "^2.6.12",
22-
"vue-router": "^3.4.3",
23-
"vue-toasted": "^1.1.28",
24-
"vuelidate": "^0.7.5",
25-
"vuetify": "^2.3.10",
26-
"vuex": "^3.5.1",
27-
"websocket-as-promised": "^1.0.1"
28-
},
29-
"devDependencies": {
30-
"@mdi/font": "^5.6.55",
31-
"@vue/cli-plugin-babel": "~4.5.6",
32-
"@vue/cli-plugin-eslint": "~4.5.6",
33-
"@vue/cli-plugin-pwa": "~4.5.6",
34-
"@vue/cli-plugin-router": "~4.5.6",
35-
"@vue/cli-plugin-vuex": "~4.5.6",
36-
"@vue/cli-service": "~4.5.6",
37-
"@vue/eslint-config-prettier": "^6.0.0",
38-
"babel-eslint": "^10.1.0",
39-
"eslint": "^7.9.0",
40-
"eslint-plugin-prettier": "^3.1.4",
41-
"eslint-plugin-vue": "^6.2.2",
42-
"eslint-plugin-vuetify": "^1.0.0-beta.7",
43-
"node-sass": "^4.14.1",
44-
"prettier": "^2.1.2",
45-
"sass": "^1.26.11",
46-
"sass-loader": "^9.0.3",
47-
"vue-cli-plugin-vuetify": "~2.0.7",
48-
"vue-template-compiler": "^2.6.12",
49-
"vuetify-loader": "^1.6.0"
50-
}
2+
"name": "cardsity-vue-client",
3+
"version": "0.1.0",
4+
"description": "Web client for the Cards Against Humanity clone Cardsity",
5+
"license": "GPL-3.0-or-later",
6+
"homepage": "https://cardsity.app",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/Cardsity/vue-client.git"
10+
},
11+
"scripts": {
12+
"serve": "vue-cli-service serve",
13+
"build": "vue-cli-service build",
14+
"lint": "vue-cli-service lint"
15+
},
16+
"dependencies": {
17+
"@trainiac/html2canvas": "^1.0.0",
18+
"core-js": "^3.6.5",
19+
"register-service-worker": "^1.7.1",
20+
"roboto-fontface": "*",
21+
"vue": "^2.6.12",
22+
"vue-router": "^3.4.5",
23+
"vue-toasted": "^1.1.28",
24+
"vuelidate": "^0.7.5",
25+
"vuetify": "^2.3.12",
26+
"vuex": "^3.5.1",
27+
"websocket-as-promised": "^1.0.1"
28+
},
29+
"devDependencies": {
30+
"@mdi/font": "^5.6.55",
31+
"@vue/cli-plugin-babel": "~4.5.6",
32+
"@vue/cli-plugin-eslint": "~4.5.6",
33+
"@vue/cli-plugin-pwa": "~4.5.6",
34+
"@vue/cli-plugin-router": "~4.5.6",
35+
"@vue/cli-plugin-vuex": "~4.5.6",
36+
"@vue/cli-service": "~4.5.6",
37+
"@vue/eslint-config-prettier": "^6.0.0",
38+
"babel-eslint": "^10.1.0",
39+
"eslint": "^7.10.0",
40+
"eslint-plugin-prettier": "^3.1.4",
41+
"eslint-plugin-vue": "^7.0.0",
42+
"eslint-plugin-vuetify": "^1.0.0-beta.7",
43+
"node-sass": "^4.14.1",
44+
"prettier": "^2.1.2",
45+
"sass": "^1.26.11",
46+
"sass-loader": "^10.0.2",
47+
"vue-cli-plugin-vuetify": "~2.0.7",
48+
"vue-template-compiler": "^2.6.12",
49+
"vuetify-loader": "^1.6.0"
50+
}
5151
}

‎src/App.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
<v-snackbar v-model="$store.state.updateAvailable" :timeout="-1" bottom right>
5757
New version available!
5858
<template v-slot:action="{ attrs }">
59-
<v-btn v-bind="attrs" dark text color="green" @click="refreshApp">
60-
Refresh
61-
</v-btn>
59+
<v-btn v-bind="attrs" dark text color="green" @click="refreshApp"> Refresh </v-btn>
6260
<v-btn
6361
icon
6462
v-bind="attrs"

‎src/components/AboutDialog.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
<v-icon>mdi-information</v-icon>
77
<span>Cardsity</span>
88
<br />
9-
<span class="text-h6">
10-
Vue client, version 0.1
11-
</span>
9+
<span class="text-h6"> Vue client, version 0.1 </span>
1210
</div>
1311
<v-spacer></v-spacer>
1412
<v-btn icon @click="$store.state.aboutDialog = false" aria-label="Close">

‎src/components/Card.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
};
9696
</script>
9797

98-
<style lang="scss" scoped>
98+
<style scoped lang="scss">
9999
.cah-card {
100100
position: relative;
101101
width: 10rem;

‎src/components/Chat.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
{{ item.sender.name }}
1616
</div>
1717

18-
<div style="margin-top: 5px;"></div>
18+
<div style="margin-top: 5px"></div>
1919

2020
<v-card
2121
outlined
2222
class="content"
2323
:color="item.sender.color"
24-
style="background-color: unset !important;"
24+
style="background-color: unset !important"
2525
>
2626
<div v-text="item.message"></div>
2727
</v-card>
@@ -79,6 +79,7 @@
7979
container: chatBox,
8080
});
8181
}
82+
// TODO: this focuses the chat even if it should not. maybe only do it if it was focussed before
8283
this.$el.querySelector('#chat-input-field').focus();
8384
});
8485
}

0 commit comments

Comments
 (0)