diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9670fdbf..929adbda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,11 +34,11 @@ jobs: - name: setup python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.14' - name: setup node uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '24' check-latest: true - name: setup cache for bench uses: actions/cache@v4 diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 84651bf1..40fba7cf 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.14' - name: Check for valid Python & Merge Conflicts run: | @@ -50,7 +50,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 24 check-latest: true - name: Add to Hosts diff --git a/frontend/src/components/MobileLayout.vue b/frontend/src/components/MobileLayout.vue index b419854e..8aa5a5dc 100644 --- a/frontend/src/components/MobileLayout.vue +++ b/frontend/src/components/MobileLayout.vue @@ -80,6 +80,7 @@ onMounted(() => { {}, { onSuccess(data) { + destructureSidebarLinks() filterLinksToShow(data) addOtherLinks() }, @@ -103,6 +104,16 @@ watch(showMenu, (val) => { } }) +const destructureSidebarLinks = () => { + let links = [] + sidebarLinks.value.forEach((link) => { + link.items?.forEach((item) => { + links.push(item) + }) + }) + sidebarLinks.value = links +} + const filterLinksToShow = (data) => { Object.keys(data).forEach((key) => { if (!parseInt(data[key])) { diff --git a/frontend/src/components/Modals/EditProfile.vue b/frontend/src/components/Modals/EditProfile.vue index edcd4c00..9ba292fa 100644 --- a/frontend/src/components/Modals/EditProfile.vue +++ b/frontend/src/components/Modals/EditProfile.vue @@ -1,72 +1,70 @@