Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d880759
fix: import defineProps
hoeppner-dataport May 22, 2025
f673e7f
add aditional updates
hoeppner-dataport May 23, 2025
cd78517
Merge branch 'main' of https://github.com/hpi-schul-cloud/nuxt-client…
hoeppner-dataport May 23, 2025
77c12aa
fix .mjs
hoeppner-dataport May 23, 2025
1285a17
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 23, 2025
570afc6
Merge branch 'main' of https://github.com/hpi-schul-cloud/nuxt-client…
hoeppner-dataport May 23, 2025
d27247d
chore: downgrade some packages
hoeppner-dataport May 23, 2025
47394a1
Merge branch 'BC-9407-minor-updates' of https://github.com/hpi-schul-…
hoeppner-dataport May 23, 2025
19fa7eb
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 27, 2025
68a0cb2
chore: no need to import defineProps
hoeppner-dataport May 27, 2025
ea238d6
Merge branch 'main' of https://github.com/hpi-schul-cloud/nuxt-client…
hoeppner-dataport May 27, 2025
8c5e981
chore: remove another .mjs extension
hoeppner-dataport May 27, 2025
fa131ec
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 27, 2025
f4a4c8a
Merge branch 'main' of https://github.com/hpi-schul-cloud/nuxt-client…
hoeppner-dataport May 27, 2025
831acf6
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 28, 2025
53346b3
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 28, 2025
c97b582
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 28, 2025
4364c4e
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 28, 2025
77b8399
Merge branch 'main' into BC-9407-minor-updates
hoeppner-dataport May 28, 2025
0d8740c
Merge branch 'main' into BC-9407-minor-updates
muratmerdoglu-dp May 30, 2025
274f701
remove unnecessary component imports from vuetify
muratmerdoglu-dp May 30, 2025
4ce0441
chore: fix importings
muratmerdoglu-dp May 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
775 changes: 658 additions & 117 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,34 @@
"maska": "^2.1.10",
"mobile-drag-drop": "^3.0.0-rc.0",
"object-hash": "^3.0.0",
"pinia": "^3.0.0",
"socket.io-client": "^4.7.5",
"sortablejs": "^1.15.2",
"pinia": "^3.0.2",
"socket.io-client": "^4.8.1",
"sortablejs": "^1.15.6",
"sortablejs-vue3": "^1.2.11",
"vue": "^3.5.14",
"vue-dompurify-html": "^4.1.4",
"vue-i18n": "^11.1.3",
"vue-router": "^4.5.0",
"vue-router": "^4.5.1",
"vuedraggable": "^4.1.0",
"vuetify": "^3.8.5",
"vuetify": "^3.8.6",
"vuex": "^4.0.2"
},
"devDependencies": {
"@babel/core": "^7.26.9",
"@babel/preset-env": "^7.26.9",
"@eslint/js": "^9.21.0",
"@eslint/js": "^9.27.0",
"@golevelup/ts-jest": "^0.4.0",
"@intlify/bundle-utils": "^8.0.0",
"@jest/globals": "^29.7.0",
"@mdi/js": "^7.2.96",
"@openapitools/openapi-generator-cli": "^2.19.1",
"@pinia/testing": "^0.1.3",
"@types/jest": "^29.5.12",
"@pinia/testing": "^1.0.1",
"@types/jest": "^29.5.14",
"@types/katex": "^0.16.7",
"@types/lodash": "^4.17.0",
"@types/lodash": "^4.17.17",
"@types/object-hash": "^3.0.6",
"@types/sortablejs": "^1.15.7",
"@types/webpack-env": "^1.18.5",
"@types/webpack-env": "^1.18.8",
"@vue/eslint-config-typescript": "^14.5.0",
"@vue/test-utils": "^2.4.5",
"@vue/vue3-jest": "^29.2.6",
Expand All @@ -72,19 +72,19 @@
"copy-webpack-plugin": "^12.0.2",
"cross-env": "^7.0.3",
"css-loader": "^6.10.0",
"eslint": "^9.21.0",
"eslint": "^9.27.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-prettier": "^5.4.0",
"eslint-plugin-vue": "^9.33.0",
"eslint-webpack-plugin": "^5.0.0",
"fishery": "^2.2.2",
"eslint-webpack-plugin": "^5.0.1",
"fishery": "^2.3.1",
"globals": "^15.9.0",
"html-webpack-plugin": "^5.6.3",
"http-proxy-middleware": "^3.0.5",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-transform-stub": "^2.0.0",
"prettier": "^3.2.5",
"prettier": "^3.3.3",
"resize-observer-polyfill": "^1.5.1",
"sass": "^1.89.0",
"sass-loader": "^16.0.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ import { TeacherSubmission, Status } from "../types/submission";
import { DataTableHeader } from "@/types/vuetify";
import { useI18n } from "vue-i18n";
import { MaybeRef } from "@vueuse/core";
import { VExpansionPanelTitle } from "vuetify/lib/components/index";
import { VExpansionPanelTitle } from "vuetify/lib/components";
import { mdiCheck, mdiClose, mdiMinus } from "@icons/material";

type StatusFilter = "all" | Status;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/feature/board/shared/BoardAnyTitleInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import {
watch,
} from "vue";
import { useI18n } from "vue-i18n";
import { VTextarea } from "vuetify/lib/components/index";
import { VTextarea } from "vuetify/lib/components";

export default defineComponent({
name: "BoardAnyTitleInput",
Expand Down
2 changes: 1 addition & 1 deletion src/modules/feature/folder/file-table/FilePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
mdiFileMusicOutline,
mdiFileVideoOutline,
} from "@icons/material";
import { computed, defineProps, PropType } from "vue";
import { computed, PropType } from "vue";
import { useDisplay } from "vuetify";

defineProps({
Expand Down
2 changes: 1 addition & 1 deletion src/modules/feature/folder/file-table/FileTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ import { convertFileSize, isDownloadAllowed } from "@/utils/fileHelper";
import { DataTable } from "@ui-data-table";
import { EmptyState } from "@ui-empty-state";
import { KebabMenu } from "@ui-kebab-menu";
import { computed, defineProps, PropType } from "vue";
import { computed, PropType } from "vue";
import { useI18n } from "vue-i18n";
import EmptyFolderSvg from "./EmptyFolderSvg.vue";
import FileInteractionHandler from "./FileInteractionHandler.vue";
Expand Down
3 changes: 1 addition & 2 deletions src/modules/feature/folder/file-table/FileUploadProgress.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@

<script setup lang="ts">
import { mdiCheckCircle } from "@icons/material";
import { defineProps, PropType, ref, watch } from "vue";
import { PropType, ref, watch } from "vue";
import { useI18n } from "vue-i18n";

const { t } = useI18n();

// Define props for the component
const props = defineProps({
uploadProgress: {
type: Object as PropType<{ uploaded: number; total: number }>,
Expand Down
2 changes: 1 addition & 1 deletion src/modules/feature/room/RoomMembers/AddMembers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ import { computed, onMounted, ref } from "vue";
import { RoleName } from "@/serverApi/v3";
import { useRoomAuthorization, useRoomMembersStore } from "@data-room";
import { useFocusTrap } from "@vueuse/integrations/useFocusTrap";
import { VAutocomplete, VCard, VSelect } from "vuetify/lib/components/index";
import { VAutocomplete, VCard, VSelect } from "vuetify/lib/components";
import { InfoAlert, WarningAlert } from "@ui-alert";
import { storeToRefs } from "pinia";
import { ENV_CONFIG_MODULE_KEY, injectStrict } from "@/utils/inject";
Expand Down
1 change: 0 additions & 1 deletion src/modules/feature/room/RoomMembers/ChangeRole.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ import {
RoleName,
} from "@/serverApi/v3";
import { useFocusTrap } from "@vueuse/integrations/useFocusTrap";
import { VCard, VRadio } from "vuetify/lib/components/index";
import {
RoomMember,
useRoomDetailsStore,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
import { useI18n } from "vue-i18n";
import { computed, ref, watch } from "vue";
import { useFocusTrap } from "@vueuse/integrations/useFocusTrap";
import { VCard } from "vuetify/lib/components/index";
import { VCard } from "vuetify/lib/components";
import { InfoAlert } from "@ui-alert";
import { DatePicker } from "@ui-date-time-picker";
import ShareModalResult from "@/components/share/ShareModalResult.vue";
Expand Down
2 changes: 1 addition & 1 deletion src/modules/feature/room/RoomMembers/MembersTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ import {
useRoomAuthorization,
useRoomMembersStore,
} from "@data-room";
import { useDisplay } from "vuetify/lib/framework";
import { useDisplay } from "vuetify";
import { storeToRefs } from "pinia";
import { ChangeRole } from "@feature-room";
import { authModule } from "@/store/store-accessor";
Expand Down
2 changes: 1 addition & 1 deletion src/modules/ui/alert/BaseAlert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<script lang="ts">
import { defineComponent, PropType } from "vue";
import { IconProps } from "vuetify/lib/framework";
import { IconProps } from "vuetify";

export default defineComponent({
name: "BaseAlert",
Expand Down
3 changes: 1 addition & 2 deletions src/modules/ui/confirmation-dialog/ConfirmationDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</template>

<template #actions>
<VSpacer />
<v-spacer />
<div class="action-buttons mx-4">
<VBtn
data-testid="dialog-cancel"
Expand Down Expand Up @@ -41,7 +41,6 @@ import { computed } from "vue";
import { useInternalConfirmationDialog } from "./Confirmation.composable";
import { useI18n } from "vue-i18n";
import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
import { VSpacer } from "vuetify/lib/components/index";

const { t } = useI18n();
const { confirm, cancel, dialogOptions, isDialogOpen } =
Expand Down
2 changes: 1 addition & 1 deletion src/modules/ui/data-table/DataTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
import { mdiMagnify, mdiMenuDown, mdiMenuUp } from "@icons/material";
import { computed, PropType, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
import { useDisplay } from "vuetify/lib/framework";
import { useDisplay } from "vuetify";
import BatchActionMenu from "./BatchActionMenu.vue";

const props = defineProps({
Expand Down
2 changes: 1 addition & 1 deletion src/modules/ui/kebab-menu/KebabMenuList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>
<script setup lang="ts">
import { onMounted, ref } from "vue";
import type { VList } from "vuetify/lib/components/index";
import type { VList } from "vuetify/lib/components";

const menuList = ref<VList>();

Expand Down
4 changes: 1 addition & 3 deletions src/modules/ui/layout/topbar/TopbarItem.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<VMenu>
<template #activator="{ props }">
<VBtn
<v-btn
v-bind="props"
v-bind.attr="$attrs"
:icon="icon"
Expand All @@ -17,8 +17,6 @@
</template>

<script setup lang="ts">
import { VBtn } from "vuetify/lib/components/index";

defineOptions({
inheritAttrs: false,
});
Expand Down
Loading