Skip to content

Commit

Permalink
Merge pull request #107 from filips123/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
filips123 authored Sep 14, 2024
2 parents 5a517b4 + c95dce8 commit 8a5405c
Show file tree
Hide file tree
Showing 7 changed files with 1,306 additions and 744 deletions.
1 change: 1 addition & 0 deletions API/gimvicurnik/commands/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def update_timetable_command() -> None:


# fmt: off

@click.command("update-eclassroom", help="Update the e-classroom data.")
@click.option("--parse-substitutions/--no-parse-substitutions", "-s/-no-s", help="Parse substitutions.", default=False)
@click.option("--parse-lunch-schedules/--no-parse-lunch-schedules", "-l/-no-l", help="Parse lunch schedules.", default=True)
Expand Down
520 changes: 266 additions & 254 deletions API/poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions API/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ PyYAML = "^6.0.2"
flask = "^3.0.3"
click = "^8.1.7"
attrs = "~24.2.0"
cattrs = "~23.2.3"
cattrs = "~24.1.1"
requests = "^2.32.3"
SQLAlchemy = "^2.0.32"
SQLAlchemy = "^2.0.34"
pdfplumber = "^0.11.4"
openpyxl = "^3.1.5"
mammoth = "^1.8.0"
icalendar = "^5.0.13"
beautifulsoup4 = { version = "^4.12.3", extras = ["lxml"] }

# Optional support for Sentry integration
sentry-sdk = { version = "^2.13.0", extras = ["flask", "sqlalchemy", "pure_eval"], optional = true }
sentry-sdk = { version = "^2.14.0", extras = ["flask", "sqlalchemy", "pure_eval"], optional = true }

# Optional support for different databases
PyMySQL = { version = "^1.1.1", optional = true }
Expand All @@ -61,7 +61,7 @@ psycopg2 = { version = "^2.9.9", optional = true }

[tool.poetry.group.dev.dependencies]
mypy = "^1.11.2"
ruff = "^0.6.2"
ruff = "^0.6.5"
types-pyyaml = "^6.0.12"
types-openpyxl = "^3.1.5"
types-requests = "^2.32.0"
Expand Down
32 changes: 16 additions & 16 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,40 +23,40 @@
"typecheck": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
"format": "prettier src plugins ${0:- --check}"
},
"packageManager": "yarn@4.4.1",
"packageManager": "yarn@4.5.0",
"dependencies": {
"@mdi/js": "^7.4.47",
"@sentry/browser": "^8.27.0",
"@sentry/types": "^8.27.0",
"@sentry/vue": "^8.27.0",
"@sentry/browser": "^8.30.0",
"@sentry/types": "^8.30.0",
"@sentry/vue": "^8.30.0",
"@vueuse/core": "^11.0.3",
"pinia": "^2.2.2",
"pinia-plugin-persistedstate": "^3.2.1",
"pinia-plugin-persistedstate": "^4.0.1",
"pulltorefreshjs": "^0.1.22",
"vue": "^3.4.38",
"vue-router": "^4.4.3",
"vue": "^3.5.5",
"vue-router": "^4.4.5",
"vuetify": "^3.7.1"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.10.4",
"@sentry/vite-plugin": "^2.22.3",
"@sentry/vite-plugin": "^2.22.4",
"@tsconfig/node20": "^20.1.4",
"@types/node": "^20.16.2",
"@types/node": "^20.16.5",
"@types/pulltorefreshjs": "^0.1.7",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue": "^5.1.3",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"eslint": "^8.57.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-vue": "^9.27.0",
"eslint-plugin-vue": "^9.28.0",
"prettier": "^3.3.3",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"typescript": "~5.5.4",
"vite": "^5.4.5",
"vite-plugin-html": "^3.2.2",
"vite-plugin-pwa": "^0.20.1",
"vite-plugin-pwa": "^0.20.5",
"vite-plugin-vuetify": "^2.0.4",
"vue-tsc": "^2.0.29"
"vue-tsc": "^2.1.6"
}
}
37 changes: 18 additions & 19 deletions website/src/registerSentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,23 @@ export default function registerSentry(app: App, router: Router) {
}

// Track only base components for performance
// Disabled temporarily until issues are resolved
// const trackedComponents = [
// '<VApp>',
// '<VAppBar>',
// '<VMain>',
// '<RouterView>',
// '<NavigationDesktop>',
// '<NavigationMobile>',
// '<NavigationDay>',
// '<ViewTimetable>',
// '<ViewMenu>',
// '<ViewCirculars>',
// '<ViewSources>',
// '<ViewSubscribe>',
// '<ViewSettings>',
// '<ViewWelcome>',
// '<NotFound>',
// ]
const trackedComponents = [
'VApp',
'VAppBar',
'VMain',
'RouterView',
'NavigationDesktop',
'NavigationMobile',
'NavigationDay',
'ViewTimetable',
'ViewMenu',
'ViewCirculars',
'ViewSources',
'ViewSubscribe',
'ViewSettings',
'ViewWelcome',
'NotFound',
]

// Init the Sentry SDK
sentryInit({
Expand All @@ -90,7 +89,7 @@ export default function registerSentry(app: App, router: Router) {
release: releasePrefix + import.meta.env.VITE_VERSION + releaseSuffix,

autoSessionTracking: dataCollectionPerformance,
trackComponents: false,
trackComponents: dataCollectionPerformance ? trackedComponents : false,

integrations,
})
Expand Down
8 changes: 4 additions & 4 deletions website/src/views/ViewTimetable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ const touchOptions = {
<v-window v-if="mobile" v-model="day" :touch="touchOptions" class="h-100">
<v-window-item v-for="(_, dayIndex) in localizedWeekdays" :key="dayIndex" :value="dayIndex">
<TimetableDisplay
v-model:detailsDialog="detailsDialog"
v-model:detailsProps="detailsProps"
v-model:details-dialog="detailsDialog"
v-model:details-props="detailsProps"
:target-day="dayIndex"
/>
</v-window-item>
</v-window>

<TimetableDisplay
v-else
v-model:detailsDialog="detailsDialog"
v-model:detailsProps="detailsProps"
v-model:details-dialog="detailsDialog"
v-model:details-props="detailsProps"
/>

<TimetableDetails v-model="detailsDialog" v-bind="detailsProps" />
Expand Down
Loading

0 comments on commit 8a5405c

Please sign in to comment.