Skip to content

Commit 4ac1d94

Browse files
chrissearlechrissearle
committed
Bump versions and linting
1 parent fe83f09 commit 4ac1d94

14 files changed

+322
-327
lines changed

‎gradle/libs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
ktor-version = "2.3.12"
44
kotlin-version = "2.0.20"
55
logback-version = "1.5.8"
6-
prometheus-version = "1.13.4"
6+
prometheus-version = "1.13.5"
77
gradle_versions_filter_version = "0.1.16"
88
detekt_version = "1.23.7"
99
kotlinter_version = "4.4.1"
1010
kotlin_logging_version = "7.0.0"
1111
arrow_version = "1.2.4"
1212
search_client_version = "2.2.2"
13-
kotlinx_serialization_version = "1.7.2"
14-
node_version = "7.0.2"
13+
kotlinx_serialization_version = "1.7.3"
14+
node_version = "7.1.0"
1515

1616
[libraries]
1717
arrow-core = { group = "io.arrow-kt", name = "arrow-core", version.ref = "arrow_version" }

‎web/package-lock.json

+109-109
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414
},
1515
"dependencies": {
1616
"@lite-embed/vue": "^1.0.4",
17-
"vue": "^3.4.29",
18-
"vue-router": "^4.3.3",
19-
"vuetify": "^3.7.1"
17+
"vue": "^3.5.11",
18+
"vue-router": "^4.4.5",
19+
"vuetify": "^3.7.2"
2020
},
2121
"devDependencies": {
2222
"@fortawesome/fontawesome-free": "^6.6.0",
2323
"@rushstack/eslint-patch": "^1.8.0",
2424
"@tsconfig/node20": "^20.1.4",
25-
"@types/node": "^20.14.5",
26-
"@vitejs/plugin-vue": "^5.0.5",
25+
"@types/node": "^22.7.4",
26+
"@vitejs/plugin-vue": "^5.1.4",
2727
"@vue/eslint-config-prettier": "^9.0.0",
2828
"@vue/eslint-config-typescript": "^13.0.0",
2929
"@vue/tsconfig": "^0.5.1",
3030
"autoprefixer": "^10.4.20",
3131
"eslint": "^8.57.0",
3232
"eslint-plugin-vue": "^9.23.0",
33-
"npm-run-all2": "^6.2.0",
34-
"prettier": "^3.2.5",
35-
"typescript": "~5.4.0",
36-
"vite": "^5.3.1",
37-
"vue-tsc": "^2.0.21"
33+
"npm-run-all2": "^6.2.3",
34+
"prettier": "^3.3.3",
35+
"typescript": "~5.6.2",
36+
"vite": "^5.4.8",
37+
"vue-tsc": "^2.1.6"
3838
}
3939
}

‎web/src/App.vue

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import {RouterView} from 'vue-router'
2+
import { RouterView } from 'vue-router'
33
</script>
44

55
<template>
@@ -12,16 +12,17 @@ import {RouterView} from 'vue-router'
1212
<RouterLink to="/videos">All Videos</RouterLink>
1313
</v-btn>
1414
<v-btn class="ms-16">
15-
<a href="https://java.no" target="_blank"><v-icon icon="fa-brands fa-java"/></a>
15+
<a href="https://java.no" target="_blank"><v-icon icon="fa-brands fa-java" /></a>
1616
</v-btn>
1717
<v-btn>
18-
<a href="https://github.com/javaBin/session_history" target="_blank"><v-icon icon="fa-brands fa-github"/></a>
18+
<a href="https://github.com/javaBin/session_history" target="_blank"
19+
><v-icon icon="fa-brands fa-github"
20+
/></a>
1921
</v-btn>
2022
</v-app-bar>
2123

22-
<v-main class="align-center justify-center" style="min-height: 300px;">
23-
<RouterView/>
24+
<v-main class="align-center justify-center" style="min-height: 300px">
25+
<RouterView />
2426
</v-main>
2527
</v-layout>
2628
</template>
27-

‎web/src/components/AggregateCard.vue

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import type {AggregateCardRow} from "@/types/helpers";
2+
import type { AggregateCardRow } from '@/types/helpers'
33
44
const props = defineProps<{
55
title: string
@@ -19,7 +19,6 @@ const performFilter = (value: string) => {
1919
const clearFilter = () => {
2020
emit('clear')
2121
}
22-
2322
</script>
2423

2524
<template>
@@ -32,12 +31,11 @@ const clearFilter = () => {
3231
<v-card-text>
3332
<v-row v-if="props.filter">
3433
<v-col class="text-body-2">
35-
<v-icon icon="far fa-window-close" @click="clearFilter()"/>
34+
<v-icon icon="far fa-window-close" @click="clearFilter()" />
3635
<div class="filter-link pl-2 d-inline-block" @click="clearFilter()">
3736
{{ props.filter }}
3837
</div>
3938
</v-col>
40-
4139
</v-row>
4240
<v-row v-else v-for="row in props.aggregate" :key="row.code" align="center" dense>
4341
<v-col class="text-body-2">
@@ -57,4 +55,4 @@ const clearFilter = () => {
5755
.filter-link:hover {
5856
text-decoration: underline;
5957
}
60-
</style>
58+
</style>

‎web/src/components/AggregateTotals.vue

+50-48
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script setup lang="ts">
2-
import type {Aggregate} from "@/types/api";
3-
import {displayFormat, displayLanguage} from "@/types/aggregates";
4-
import {computed} from "vue";
5-
import AggregateCard from "@/components/AggregateCard.vue";
6-
import type {AggregateCardRow} from "@/types/helpers";
2+
import type { Aggregate } from '@/types/api'
3+
import { displayFormat, displayLanguage } from '@/types/aggregates'
4+
import { computed } from 'vue'
5+
import AggregateCard from '@/components/AggregateCard.vue'
6+
import type { AggregateCardRow } from '@/types/helpers'
77
88
const props = defineProps<{
99
aggregate: Aggregate
@@ -21,78 +21,80 @@ const emit = defineEmits<{
2121
2222
const languageRow = computed(() => {
2323
return props.aggregate.languages.map((item) => {
24-
return {
25-
code: item.language,
26-
name: displayLanguage(item.language),
27-
count: item.count,
28-
} as AggregateCardRow
29-
}
30-
)
24+
return {
25+
code: item.language,
26+
name: displayLanguage(item.language),
27+
count: item.count
28+
} as AggregateCardRow
29+
})
3130
})
3231
3332
const formatRow = computed(() => {
3433
return props.aggregate.formats.map((item) => {
35-
return {
36-
code: item.format,
37-
name: displayFormat(item.format),
38-
count: item.count,
39-
} as AggregateCardRow
40-
}
41-
)
34+
return {
35+
code: item.format,
36+
name: displayFormat(item.format),
37+
count: item.count
38+
} as AggregateCardRow
39+
})
4240
})
4341
4442
const yearRow = computed(() => {
4543
return props.aggregate.years.map((item) => {
46-
return {
47-
code: item.year.toString(),
48-
name: item.year.toString(),
49-
count: item.count,
50-
} as AggregateCardRow
51-
}
52-
)
44+
return {
45+
code: item.year.toString(),
46+
name: item.year.toString(),
47+
count: item.count
48+
} as AggregateCardRow
49+
})
5350
})
5451
5552
const applyFilter = (filter: string, code: string) => {
5653
switch (filter) {
57-
case "LANGUAGE": {
54+
case 'LANGUAGE': {
5855
emit('filterLanguage', code)
59-
break;
56+
break
6057
}
61-
case "FORMAT": {
58+
case 'FORMAT': {
6259
emit('filterFormat', code)
63-
break;
60+
break
6461
}
65-
case "YEAR": {
62+
case 'YEAR': {
6663
emit('filterYear', parseInt(code))
67-
break;
64+
break
6865
}
6966
}
7067
}
7168
7269
const clearFilter = (filter: string) => {
7370
emit('clear', filter)
7471
}
75-
7672
</script>
7773

7874
<template>
7975
<div v-if="props.aggregate">
80-
<AggregateCard title="Languages"
81-
:aggregate="languageRow"
82-
@filter="applyFilter('LANGUAGE', $event)"
83-
@clear="clearFilter('LANGUAGE')"
84-
:filter="displayLanguage(filteredLanguage)"/>
76+
<AggregateCard
77+
title="Languages"
78+
:aggregate="languageRow"
79+
@filter="applyFilter('LANGUAGE', $event)"
80+
@clear="clearFilter('LANGUAGE')"
81+
:filter="displayLanguage(filteredLanguage)"
82+
/>
8583

86-
<AggregateCard title="Formats"
87-
:aggregate="formatRow"
88-
@filter="applyFilter('FORMAT', $event)"
89-
@clear="clearFilter('FORMAT')"
90-
:filter="displayFormat(filteredFormat)"/>
84+
<AggregateCard
85+
title="Formats"
86+
:aggregate="formatRow"
87+
@filter="applyFilter('FORMAT', $event)"
88+
@clear="clearFilter('FORMAT')"
89+
:filter="displayFormat(filteredFormat)"
90+
/>
9191

92-
<AggregateCard title="Years"
93-
:aggregate="yearRow"
94-
@filter="applyFilter('YEAR', $event)"
95-
@clear="clearFilter('YEAR')"
96-
:filter="filteredYear?.toString()"/>
92+
<AggregateCard
93+
title="Years"
94+
:aggregate="yearRow"
95+
@filter="applyFilter('YEAR', $event)"
96+
@clear="clearFilter('YEAR')"
97+
:filter="filteredYear?.toString()"
98+
/>
9799
</div>
98100
</template>

‎web/src/components/SessionItem.vue

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<script setup lang="ts">
2-
import type {Session} from "@/types/api";
3-
import {displayFormat, displayLanguage} from "@/types/aggregates";
2+
import type { Session } from '@/types/api'
3+
import { displayFormat, displayLanguage } from '@/types/aggregates'
44
55
const props = defineProps<{
66
session: Session
77
}>()
8-
98
</script>
109
<template>
1110
<v-card class="ma-2 pa-2" width="500">
1211
<v-card-title class="text-h4 position-relative pt-6">
13-
<div class="text-body-2 pa-2 position-absolute top-0 right-0 bg-primary rounded-lg d-inline-block">{{ props.session.year }}</div>
12+
<div
13+
class="text-body-2 pa-2 position-absolute top-0 right-0 bg-primary rounded-lg d-inline-block"
14+
>
15+
{{ props.session.year }}
16+
</div>
1417
{{ props.session.title }}
1518
</v-card-title>
1619

@@ -47,7 +50,8 @@ const props = defineProps<{
4750
</template>
4851

4952
<style scoped>
50-
.v-card-text, .v-card-title {
53+
.v-card-text,
54+
.v-card-title {
5155
white-space: normal;
5256
}
53-
</style>
57+
</style>

‎web/src/main.ts

+9-10
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ import { aliases, fa } from 'vuetify/iconsets/fa'
1212

1313
import '@fortawesome/fontawesome-free/css/all.css'
1414

15-
1615
const vuetify = createVuetify({
17-
components,
18-
directives,
19-
icons: {
20-
defaultSet: 'fa',
21-
aliases,
22-
sets: {
23-
fa,
24-
},
25-
},
16+
components,
17+
directives,
18+
icons: {
19+
defaultSet: 'fa',
20+
aliases,
21+
sets: {
22+
fa
23+
}
24+
}
2625
})
2726

2827
const app = createApp(App)

‎web/src/router/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createRouter, createWebHistory } from 'vue-router'
22
import SearchView from '@/views/SearchView.vue'
3-
import AllVideosView from "@/views/AllVideosView.vue";
3+
import AllVideosView from '@/views/AllVideosView.vue'
44

55
const router = createRouter({
66
history: createWebHistory(import.meta.env.BASE_URL),
@@ -15,7 +15,7 @@ const router = createRouter({
1515
name: 'allVideos',
1616
props: true,
1717
component: AllVideosView
18-
},
18+
}
1919
]
2020
})
2121

0 commit comments

Comments
 (0)