Skip to content

Commit

Permalink
chore: Update eslint & dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tobi2K
Tobi2K committed Oct 12, 2024
1 parent 997da35 commit 6e81f0c
Show file tree
Hide file tree
Showing 8 changed files with 4,587 additions and 3,090 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 35
versionName "2.9.3"
versionName "2.9.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
7,325 changes: 4,407 additions & 2,918 deletions package-lock.json
View file

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "top-tips-app",
"version": "2.9.3",
"version": "2.9.4",
"private": true,
"description": "Lightweight app for a handball guessing game",
"scripts": {
Expand Down Expand Up @@ -54,17 +54,19 @@
"@typescript-eslint/eslint-plugin": "^8.5.0",
"@typescript-eslint/parser": "^8.5.0",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-pwa": "~5.0.8",
"@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/compiler-sfc": "^3.5.6",
"@vue/eslint-config-typescript": "13.0.0",
"@vue/eslint-config-typescript": "14.0.1",
"@vue/test-utils": "^2.4.6",
"eslint": "^8.57.1",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-config-google": "^0.14.0",
"eslint-plugin-vue": "^9.28.0",
"eslint-webpack-plugin": "^4.2.0",
"eslint-plugin-vue": "^9.29.0",
"typescript": "^5.6.2",
"vue-loader-v16": "npm:vue-loader@^16.1.0"
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/GuessModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ import {
IonInput,
IonItem,
IonIcon,
IonPopover,
} from "@ionic/vue";
import {
Expand Down Expand Up @@ -300,6 +301,7 @@ export default defineComponent({
IonInput,
IonItem,
IonIcon,
IonPopover,
GameGuesses,
TeamStats,
},
Expand Down
97 changes: 49 additions & 48 deletions src/components/RankingModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ion-col>
<ion-title class="align-middle">{{
groupData?.season.name
}}</ion-title>
}}</ion-title>
</ion-col>
<ion-col>
<ion-buttons class="ion-float-right">
Expand All @@ -24,72 +24,72 @@
<ion-row class="tiny-text ion-margin-bottom">
<ion-col size="6">
<ion-item>
<ion-checkbox
v-model="this.games"
:checked="this.games"
label-placement="end"
justify="start"
>Games</ion-checkbox>
<ion-checkbox v-model="this.games" :checked="this.games" label-placement="end"
justify="start">Games</ion-checkbox>
</ion-item>
</ion-col>
<ion-col size="6">
<ion-item>
<ion-checkbox
v-model="this.goals"
:checked="this.goals"
label-placement="end"
justify="start"
>Goals</ion-checkbox>
<ion-checkbox v-model="this.goals" :checked="this.goals" label-placement="end"
justify="start">Goals</ion-checkbox>
</ion-item>
</ion-col>
</ion-row>
<ion-row class="tiny-text ion-margin-bottom">
<ion-col size="auto" class="colNoPaddingRight">
<table class="coolTable">
<tr class="border-bottom">
<th>#</th>
<th class="text-left">Team</th>
</tr>
<tr v-for="list in ranking" :key="list">
<td>{{ list.position }}</td>
<td class="text-left">{{ list.name }}</td>
</tr>
<thead>
<tr class="border-bottom">
<th>#</th>
<th class="text-left">Team</th>
</tr>
</thead>
<tbody>
<tr v-for="list in ranking" :key="list">
<td>{{ list.position }}</td>
<td class="text-left">{{ list.name }}</td>
</tr>
</tbody>
</table>
</ion-col>
<ion-col style="overflow-x: scroll" class="colNoPaddingLeft">
<table class="coolTable">
<tr class="border-bottom">
<th v-if="games">P</th>
<th v-if="games">W</th>
<th v-if="games">L</th>
<th v-if="games">D</th>
<th v-if="goals">Diff</th>
<th v-if="goals">+/-</th>
<th v-if="goals">AVG</th>
<th v-if="goals">MAX</th>
<th v-if="goals">MIN</th>
</tr>
<tr v-for="list in ranking" :key="list">
<td v-if="games">
{{ list.win * 2 + list.draw }}:{{ list.lose * 2 + list.draw }}
</td>
<td v-if="games">{{ list.win }}</td>
<td v-if="games">{{ list.lose }}</td>
<td v-if="games">{{ list.draw }}</td>
<td v-if="goals">{{ list.goals_for - list.goals_against }}</td>
<td v-if="goals">
{{ list.goals_for + "/" + list.goals_against }}
</td>
<td v-if="goals">{{ list.goals_avg }}</td>
<td v-if="goals">{{ list.goals_max }}</td>
<td v-if="goals">{{ list.goals_min }}</td>
</tr>
<thead>
<tr class="border-bottom">
<th v-if="games">P</th>
<th v-if="games">W</th>
<th v-if="games">L</th>
<th v-if="games">D</th>
<th v-if="goals">Diff</th>
<th v-if="goals">+/-</th>
<th v-if="goals">AVG</th>
<th v-if="goals">MAX</th>
<th v-if="goals">MIN</th>
</tr>
</thead>
<tbody>
<tr v-for="list in ranking" :key="list">
<td v-if="games">
{{ list.win * 2 + list.draw }}:{{ list.lose * 2 + list.draw }}
</td>
<td v-if="games">{{ list.win }}</td>
<td v-if="games">{{ list.lose }}</td>
<td v-if="games">{{ list.draw }}</td>
<td v-if="goals">{{ list.goals_for - list.goals_against }}</td>
<td v-if="goals">
{{ list.goals_for + "/" + list.goals_against }}
</td>
<td v-if="goals">{{ list.goals_avg }}</td>
<td v-if="goals">{{ list.goals_max }}</td>
<td v-if="goals">{{ list.goals_min }}</td>
</tr>
</tbody>
</table>
</ion-col>
</ion-row>
<ion-row class="align-middle">
<small><ion-icon :icon="informationCircleOutline" />
Leaderboards are updated daily at 04:00 AM CEST.</small>
Leaderboards are updated daily at 04:00 AM CEST.</small>
</ion-row>
</ion-grid>
</ion-content>
Expand Down Expand Up @@ -161,6 +161,7 @@ export default defineComponent({
table {
font-size: 120%;
}

th,
td {
text-align: center;
Expand Down
106 changes: 55 additions & 51 deletions src/components/ScoreSection.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,58 @@
</ion-button>
</ion-col>
<ion-col size="4">
<ion-button
@click="goRight()"
class="ion-float-right"
fill="clear"
color="medium"
>
<ion-button @click="goRight()" class="ion-float-right" fill="clear" color="medium">
<ion-icon :icon="arrowForward" />
</ion-button>
</ion-col>
</ion-row>
<ion-row>
<ion-col size="auto" class="colNoPaddingRight">
<table class="coolTable ion-float-right">
<tr>
<th>
{{ pointsForGroup[0][0] }}
</th>
</tr>
<tr v-for="list in pointsForGroup.slice(1)" :key="list">
<td>{{ list[0] }}</td>
</tr>
<thead>
<tr>
<th>
{{ pointsForGroup[0][0] }}
</th>
</tr>
</thead>
<tbody>
<tr v-for="list in pointsForGroup.slice(1)" :key="list">
<td>{{ list[0] }}</td>
</tr>
</tbody>
</table>
</ion-col>
<ion-col size="auto" class="colNoPaddingLeft">
<table class="coolTable ion-float-right">
<tr>
<th>
{{ pointsForGroup[0][1] }}
</th>
</tr>
<tr v-for="list in pointsForGroup.slice(1)" :key="list">
<td>{{ list[1] }}</td>
</tr>
<thead>
<tr>
<th>
{{ pointsForGroup[0][1] }}
</th>
</tr>
</thead>
<tbody>
<tr v-for="list in pointsForGroup.slice(1)" :key="list">
<td>{{ list[1] }}</td>
</tr>
</tbody>
</table>
</ion-col>
<ion-col style="overflow-x: scroll" class="colNoPaddingLeft">
<table class="coolTable">
<tr>
<th
v-for="(title, index) in pointsForGroup[0].slice(2)"
:key="title"
:id="'title-' + index"
>
{{ title }}
</th>
</tr>
<tr v-for="list in pointsForGroup.slice(1)" :key="list">
<td v-for="item in list.slice(2)" :key="item">{{ item }}</td>
</tr>
<thead>
<tr>
<th v-for="(title, index) in pointsForGroup[0].slice(2)" :key="title" :id="'title-' + index">
{{ title }}
</th>
</tr>
</thead>
<tbody>
<tr v-for="list in pointsForGroup.slice(1)" :key="list">
<td v-for="item in list.slice(2)" :key="item">{{ item }}</td>
</tr>
</tbody>
</table>
</ion-col>
</ion-row>
Expand Down Expand Up @@ -107,7 +110,7 @@ export default defineComponent({
},
goRight() {
const element = document.getElementById(
"title-" + (this.pointsForGroup[0].length - 3),
"title-" + (this.pointsForGroup[0].length - 3),
);
if (element != null) {
element.scrollIntoView({
Expand All @@ -119,7 +122,7 @@ export default defineComponent({
},
goCurrent() {
const element = document.getElementById(
"title-" + (this.$store.state.currentGameday - 1),
"title-" + (this.$store.state.currentGameday - 1),
);
if (element != null) {
element.scrollIntoView({
Expand All @@ -132,21 +135,21 @@ export default defineComponent({
},
mounted() {
this.$store
.dispatch("refreshScores")
.then(() => {
this.$emit("done");
const element = document.getElementById(
"title-" + (this.$store.state.currentGameday - 1),
);
if (element != null) {
element.scrollIntoView({
behavior: "smooth",
block: "center",
inline: "start",
});
}
})
.catch();
.dispatch("refreshScores")
.then(() => {
this.$emit("done");
const element = document.getElementById(
"title-" + (this.$store.state.currentGameday - 1),
);
if (element != null) {
element.scrollIntoView({
behavior: "smooth",
block: "center",
inline: "start",
});
}
})
.catch();
},
computed: mapState(["pointsForGroup", "groupData"]),
});
Expand All @@ -156,6 +159,7 @@ export default defineComponent({
table {
font-size: 120%;
}
th,
td {
text-align: center;
Expand Down
Loading

0 comments on commit 6e81f0c

Please sign in to comment.