Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Isti01 committed Sep 10, 2024
1 parent fa78f38 commit f99db9d
Show file tree
Hide file tree
Showing 10 changed files with 1,085 additions and 1,108 deletions.
26 changes: 13 additions & 13 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "3.3.0"
id("io.spring.dependency-management") version "1.1.5"
id("org.owasp.dependencycheck") version "9.2.0"
kotlin("jvm") version "2.0.0"
kotlin("plugin.spring") version "2.0.0"
id("org.springframework.boot") version "3.3.3"
id("io.spring.dependency-management") version "1.1.6"
id("org.owasp.dependencycheck") version "10.0.4"
kotlin("jvm") version "2.0.20"
kotlin("plugin.spring") version "2.0.20"
}

group = "hu.bme.sch"
version = "4.8.0"
version = "4.8.1"
java.sourceCompatibility = JavaVersion.VERSION_21

springBoot {
Expand Down Expand Up @@ -42,24 +42,24 @@ dependencies {
api("org.springframework.boot:spring-boot-starter-aop")
api("com.fasterxml.jackson.module:jackson-module-kotlin")
api("com.squareup.okhttp3:okhttp:4.12.0")
api("com.itextpdf:itext-core:8.0.4")
api("com.itextpdf:itext-core:8.0.5")
api("org.jetbrains.kotlin:kotlin-reflect")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
api("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0")
api("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0")
api("com.google.zxing:core:3.5.3")
api("com.google.zxing:javase:3.5.3")
api("io.jsonwebtoken:jjwt-api:0.12.5")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.5")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.5")
api("com.fasterxml.uuid:java-uuid-generator:5.0.0")
api("io.jsonwebtoken:jjwt-api:0.12.6")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.6")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
api("com.fasterxml.uuid:java-uuid-generator:5.1.0")
api("org.commonmark:commonmark:0.22.0")
api("org.commonmark:commonmark-ext-gfm-tables:0.22.0")
api("com.fasterxml.jackson.dataformat:jackson-dataformat-csv")
developmentOnly("org.springframework.boot:spring-boot-devtools")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
runtimeOnly("com.h2database:h2")
implementation("org.postgresql:postgresql")
implementation(platform("io.micrometer:micrometer-bom:1.13.0"))
implementation(platform("io.micrometer:micrometer-bom:1.13.4"))
implementation("io.micrometer:micrometer-core")
implementation("io.micrometer:micrometer-registry-prometheus")
implementation("io.micrometer:micrometer-observation")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.domain.EntityScan
import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.boot.runApplication

const val CMSCH_VERSION = "4.8.0"
const val CMSCH_VERSION = "4.8.1"

@SpringBootApplication
@EnableConfigurationProperties(value = [ComponentLoadConfig::class, StartupPropertyConfig::class])
Expand Down
3 changes: 0 additions & 3 deletions frontend/.eslintignore

This file was deleted.

25 changes: 0 additions & 25 deletions frontend/.eslintrc

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

### yarn ###
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored

.yarn/*
!.yarn/releases
!.yarn/patches
!.yarn/plugins
!.yarn/sdks
!.yarn/versions

.idea

# if you are NOT using Zero-installs, then:
Expand Down
26 changes: 26 additions & 0 deletions frontend/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import eslintPlugin from '@typescript-eslint/eslint-plugin'
import tsParser from '@typescript-eslint/parser'
import reactHooksPlugin from 'eslint-plugin-react-hooks'
import prettierConfig from 'eslint-config-prettier'

export default [
{
files: ['*.ts', '*.tsx'],
plugins: {
'@typescript-eslint': eslintPlugin,
'react-hooks': reactHooksPlugin
},
languageOptions: {
parser: tsParser,
sourceType: 'module'
},
rules: {
...prettierConfig.rules,
'react/jsx-props-no-spreading': 'off',
'react/require-default-props': 'off',
'max-len': ['error', { code: 140, ignoreUrls: true }],
'import/prefer-default-export': 'off',
'@typescript-eslint/explicit-function-return-type': 'off'
}
}
]
60 changes: 30 additions & 30 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,54 @@
"@chakra-ui/react": "^2.8.2",
"@chakra-ui/styled-system": "2.9.2",
"@chakra-ui/theme-tools": "2.1.2",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@firebase/app": "0.10.3",
"@firebase/messaging": "0.12.9",
"@nivo/bar": "^0.86.0",
"@zxing/browser": "^0.1.4",
"@zxing/library": "^0.20.0",
"axios": "1.7.4",
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@firebase/app": "0.10.10",
"@firebase/messaging": "0.12.10",
"@nivo/bar": "^0.87.0",
"@zxing/browser": "^0.1.5",
"@zxing/library": "^0.21.3",
"axios": "1.7.7",
"date-fns": "3.6.0",
"deepmerge": "^4.3.1",
"framer-motion": "11.1.7",
"framer-motion": "11.5.4",
"js-cookie": "3.0.5",
"lodash": "4.17.21",
"pigeon-maps": "^0.21.3",
"pigeon-maps": "^0.21.6",
"prismjs": "1.29.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-geolocated": "^4.0.3",
"react-helmet-async": "2.0.4",
"react-hook-form": "7.51.3",
"react-icons": "5.2.0",
"react-geolocated": "^4.2.0",
"react-helmet-async": "2.0.5",
"react-hook-form": "7.53.0",
"react-icons": "5.3.0",
"react-markdown": "9.0.1",
"react-qr-code": "^2.0.11",
"react-qr-code": "^2.0.15",
"react-query": "3.39.3",
"react-router-dom": "6.23.0",
"react-simple-code-editor": "0.13.1",
"react-router-dom": "6.26.2",
"react-simple-code-editor": "0.14.1",
"remark-gfm": "4.0.0",
"values.js": "2.1.1"
},
"devDependencies": {
"@types/js-cookie": "3.0.6",
"@types/node": "20.12.8",
"@types/prismjs": "1.26.3",
"@types/react": "18.3.1",
"@types/node": "22.5.4",
"@types/prismjs": "1.26.4",
"@types/react": "18.3.5",
"@types/react-dom": "18.3.0",
"@types/react-helmet": "6.1.11",
"@typescript-eslint/eslint-plugin": "7.8.0",
"@typescript-eslint/parser": "7.8.0",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^8.57.0",
"@typescript-eslint/eslint-plugin": "8.5.0",
"@typescript-eslint/parser": "8.5.0",
"@vitejs/plugin-react-swc": "^3.7.0",
"eslint": "^9.10.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-react-refresh": "^0.4.6",
"eslint-plugin-react-refresh": "^0.4.11",
"npm-run-all": "4.1.5",
"prettier": "3.2.5",
"typescript": "^5.2.2",
"vite": "^5.2.0"
"prettier": "3.3.3",
"typescript": "^5.6.2",
"vite": "^5.4.3"
},
"scripts": {
"dev": "vite",
Expand All @@ -67,7 +67,7 @@
"fix:eslint": "npm run lint:eslint -- --fix",
"fix:prettier": "npm run lint:prettier -- --write",
"lint": "run-p lint:eslint lint:prettier lint:typescript",
"lint:eslint": "eslint --ext .ts,.tsx,.js,.jsx --ignore-path .gitignore .",
"lint:eslint": "eslint .",
"lint:prettier": "prettier --check --ignore-path .gitignore .",
"lint:typescript": "tsc"
},
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/common-components/EventIndicator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export function EventIndicator({ isCurrent, isUpcoming, color, showLabel, ...pro
return (
<HStack backgroundColor={bg} py={1} pl={4} pr={1} borderRadius="full" {...props}>
<Text>{isUpcoming ? 'Hamarosan kezdődik' : 'Most zajlik'}</Text>
<PulsingDot color={color ?? isUpcoming ? 'yellow.400' : undefined} />
<PulsingDot color={(color ?? isUpcoming) ? 'yellow.400' : undefined} />
</HStack>
)
return <PulsingDot color={color ?? isUpcoming ? 'yellow.400' : undefined} {...props} />
return <PulsingDot color={(color ?? isUpcoming) ? 'yellow.400' : undefined} {...props} />
}
2 changes: 1 addition & 1 deletion frontend/src/util/language.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { OFFICIAL_LANGUAGE } from './configs/environment.config'

export function l<T extends keyof typeof friendlyLanguageData>(key: T, fields?: (typeof parameters)[T]) {
let message = OFFICIAL_LANGUAGE ? officialLanguageData[key] ?? friendlyLanguageData[key] : friendlyLanguageData[key]
let message = OFFICIAL_LANGUAGE ? (officialLanguageData[key] ?? friendlyLanguageData[key]) : friendlyLanguageData[key]
if (parameters[key]) {
Object.entries(parameters[key] as Record<string, string>).forEach(([templateKey, value]) => {
const field = fields?.[templateKey]
Expand Down
Loading

0 comments on commit f99db9d

Please sign in to comment.