Skip to content

[WIP] redesign dasboard page #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LrxGaelle wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[WIP] redesign dasboard page #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
130 changes: 93 additions & 37 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@bimdata/bcf-components": "6.7.7",
"@bimdata/components": "1.10.1",
"@bimdata/design-system": "2.4.2",
"@bimdata/design-system": "3.0.0-beta.46",
"@bimdata/typescript-fetch-api-client": "10.44.2",
"@bimdata/viewer": "2.18.0-beta.3",
"@paddle/paddle-js": "^1.6.4",
Expand Down
44 changes: 28 additions & 16 deletions src/AppLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,29 @@
<AppNotification />
<AppSidePanel />

<AppHeader />
<div
ref="viewContainer"
class="app-layout__view-container"
:class="{ loading }"
>
<router-view></router-view>
</div>
<transition name="fade">
<div class="app-layout__overlay" v-show="loading">
<BIMDataSpinner class="app-layout__loader" />
<AppSidebar />
<div class="app-layout__main">
<div v-if="hasHeaderAction" class="app-layout__header-action">
<AppSlot name="app-header-action" />
</div>
<div
ref="viewContainer"
class="app-layout__view-container"
:class="{ loading }"
>
<router-view></router-view>
</div>
</transition>
<transition name="fade">
<div class="app-layout__overlay" v-show="loading">
<BIMDataSpinner class="app-layout__loader" />
</div>
</transition>
</div>
</div>
</template>

<script>
import { onMounted, provide, ref, watch } from "vue";
import { computed, onMounted, provide, ref, watch } from "vue";
import { useRouter } from "vue-router";
import { contexts, useLoadingContext } from "./composables/loading.js";
import {
Expand All @@ -43,17 +48,20 @@ import routeNames from "./router/route-names.js";
import { useUser } from "./state/user.js";

// Components
import AppHeader from "./components/specific/app/app-header/AppHeader.vue";
import AppSidebar from "./components/specific/app/app-sidebar/AppSidebar.vue";
import AppModal from "./components/specific/app/app-modal/AppModal.vue";
import AppNotification from "./components/specific/app/app-notification/AppNotification.vue";
import AppSidePanel from "./components/specific/app/app-side-panel/AppSidePanel.vue";
import AppSlot from "./components/specific/app/app-slot/AppSlot.js";
import { useAppSlot } from "./components/specific/app/app-slot/app-slot.js";

export default {
components: {
AppHeader,
AppSidebar,
AppModal,
AppNotification,
AppSidePanel
AppSidePanel,
AppSlot
},
setup() {
const router = useRouter();
Expand All @@ -64,6 +72,9 @@ export default {
const viewContainer = ref(null);
provide("viewContainer", viewContainer);

const headerActionSlot = useAppSlot("app-header-action");
const hasHeaderAction = computed(() => Boolean(headerActionSlot.value));

const tourToDisplay = ref(null);

onMounted(async () => {
Expand All @@ -86,6 +97,7 @@ export default {
return {
// References
isGuidedTourEnabled: IS_GUIDED_TOUR_ENABLED,
hasHeaderAction,
loading,
tours,
tourToDisplay,
Expand Down
143 changes: 78 additions & 65 deletions src/components/specific/app/app-header-menu/AppHeaderMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,103 @@
.app-header-menu {
.bimdata-dropdown:deep() {
.bimdata-dropdown__content {
padding: 0;
}

.bimdata-dropdown__elements {
width: 250px;
margin-left: -27px;
}
}
position: relative;
display: flex;
justify-content: center;

&__btn {
display: grid;
grid-template-columns: 36px 135px;
grid-template-rows: 14px 14px;
align-items: center;
gap: 2px 4px;
padding: calc(var(--spacing-unit) / 2);
text-align: left;
width: 190px;

&__avatar {
grid-row: 1 / span 2;
}
&__trigger {
display: flex;
padding: 2px;
border: none;
border-radius: 50%;
background-color: transparent;
cursor: pointer;
transition: box-shadow 0.2s ease;

&__fullname {
font-weight: bold;
&:hover,
&.active {
box-shadow: 0 0 0 2px var(--color-silver-light);
}
}

&__container {
position: relative;
&__popover {
position: absolute;
z-index: 200;
bottom: 0;
left: calc(100% + var(--spacing-unit) * 2);

display: flex;
flex-direction: column;
width: 231px;
padding: var(--spacing-unit) calc(var(--spacing-unit) * 3 / 2);
border-radius: 20px;
overflow: hidden;
background-color: var(--color-white);
box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.15);
font-size: 12px;
}

.user-info {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--spacing-unit);
height: 115px;

.user-avatar {
margin-top: calc(var(--spacing-unit) / 2);
}
&__user {
display: flex;
align-items: center;
gap: var(--spacing-unit);
padding: var(--spacing-unit) calc(var(--spacing-unit) / 2);

.user-content {
width: 100%;
text-align: center;
.user-name {
font-weight: bold;
}
}
&__content {
min-width: 0;
flex: 1;
}

.separator {
height: 1px;
margin: calc(var(--spacing-unit) / 2) var(--spacing-unit);
background-color: var(--color-silver-light);
&__name {
font-weight: bold;
color: var(--color-primary);
}

.external-link {
text-decoration: none;
color: inherit;
&__email {
color: var(--color-granite-light);
}
}

&__divider {
height: 1px;
margin: calc(var(--spacing-unit) / 2) 0;
background-color: var(--color-tertiary-lightest, #f7f7f7);
}

&__item {
display: flex;
align-items: center;
gap: var(--spacing-unit);
width: 100%;
height: 32px;
padding: 0 calc(var(--spacing-unit) / 2);
border: none;
border-radius: 6px;
background-color: transparent;
color: var(--color-primary);
font-size: 12px;
text-align: left;
text-decoration: none;
cursor: pointer;
transition: background-color 0.2s ease;

.bimdata-btn {
justify-content: flex-start;
&:hover {
background-color: var(--color-tertiary-lightest, #f7f7f7);
}

.btn-language {
&--language {
justify-content: space-between;
}
}

.lang-badge {
padding: calc(var(--spacing-unit) / 6) var(--spacing-unit);
font-weight: bold;
border-radius: 2px;
background-color: var(--color-silver);
text-transform: uppercase;
}
&__lang-badge {
padding: calc(var(--spacing-unit) / 6) var(--spacing-unit);
font-weight: 500;
text-transform: uppercase;
border-radius: 2px;
background-color: var(--color-silver);
}

.btn-logout {
margin: calc(var(--spacing-unit) / 2) var(--spacing-unit);
justify-content: center;
}
&__logout {
margin-top: var(--spacing-unit);
justify-content: center;
}
}
Loading