Skip to content

Commit

Permalink
Fix:
Browse files Browse the repository at this point in the history
- disable accept in expired access requests
- clean transitions from menu and header
- main transition optimizations
- loading styles fro tables more smooth
- primary color handling fix in sass
- spacing in section title
  • Loading branch information
MarcelGeo committed Dec 22, 2023
1 parent 45720bf commit f1e860a
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 262 deletions.
31 changes: 9 additions & 22 deletions web-app/packages/app/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
v-slot="{ Component, route }"
:key="$route.fullPath"
>
<transition name="fade">
<div :key="route.name">
<component :is="Component" />
</div>
</transition>
<div :key="route.name">
<component :is="Component" />
</div>
</router-view>

<main
Expand All @@ -31,13 +29,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
]"
>
<router-view name="header" v-slot="{ Component, route }">
<transition name="fade">
<div :key="route.name">
<component :is="Component" />
</div>
</transition>
<div :key="route.name">
<component :is="Component" />
</div>
</router-view>
<PDivider :pt="{ root: { class: 'm-0'}}"></PDivider>
<PDivider :pt="{ root: { class: 'm-0' } }"></PDivider>
<v-card
v-if="pingData && pingData.maintenance"
variant="outlined"
Expand Down Expand Up @@ -169,17 +165,8 @@ export default defineComponent({
</script>

<style lang="scss">
.fade-leave-active {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
}

.fade-enter-active,
.fade-leave-active {
transition: opacity 0.25s;
.fade-enter-active {
transition: opacity ease-in 0.25s;
}

.fade-enter-from,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $colors: (
--surface-f:#ffffff;
--text-color: #{map-get($colors , "night")};
--text-color-secondary:#aaacad;
--primary-color:$primaryColor;
--primary-color:#{$primaryColor};
--primary-color-text:#ffffff;
--font-family:inherit;
--surface-0: #ffffff;
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/lib/src/common/components/AppSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
v-if="!!$slots.title"
class="flex justify-content-between align-items-center p-4"
>
<h2 class="text-sm text-color"><slot name="title"></slot></h2>
<h2 class="text-sm text-color m-0"><slot name="title"></slot></h2>
<slot name="extra"></slot>
</header>
<slot></slot>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
option-value="value"
v-model="permissions[item.id]"
@change="(e) => permissionsChange(e, item)"
:disabled="expired(item.expire)"
class="w-6 lg:w-4 p-1"
/>
<div class="flex justify-content-end w-6 lg:w-4 p-1">
Expand All @@ -75,6 +76,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
rounded
aria-label="Accept"
severity="success"
:disabled="expired(item.expire)"
@click="acceptRequest(item)"
/>
</div>
Expand All @@ -100,7 +102,7 @@ import { useNotificationStore } from '@/modules/notification/store'
import { useProjectStore } from '@/modules/project/store'
import {
GetAccessRequestsPayload,
ProjectAccessRequest
AccessRequest
} from '@/modules/project/types'

export default defineComponent({
Expand Down Expand Up @@ -168,7 +170,7 @@ export default defineComponent({
this.options.itemsPerPage = e.rows
this.fetchItems()
},
permissionsChange(e: DropdownChangeEvent, item: ProjectAccessRequest) {
permissionsChange(e: DropdownChangeEvent, item: AccessRequest) {
const { value } = e
const { id } = item
this.selectedPermissions[id] = value
Expand Down
Loading

0 comments on commit f1e860a

Please sign in to comment.