-
+ {{ $t("DashboardProjectList.title") }}
+
-
diff --git a/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.scss b/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.scss
index e85fca083..b2dd20deb 100644
--- a/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.scss
+++ b/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.scss
@@ -2,17 +2,34 @@
padding: var(--spacing-unit);
&__title {
- margin-bottom: var(--spacing-unit);
+ display: inline-flex;
+ align-items: center;
+ gap: var(--spacing-unit);
+ margin-bottom: calc(var(--spacing-unit) * 2);
+ color: var(--color-primary);
font-size: 1.2rem;
font-weight: bold;
+ text-decoration: none;
- :not(.isCarousel) {
- padding-left: var(--spacing-unit);
+ :deep(.bimdata-icon) {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 26px;
+ height: 26px;
+ border-radius: 50%;
+ background-color: var(--color-tertiary-lightest, #f7f7f7);
+ }
+
+ &:hover {
+ text-decoration: underline;
}
}
-
+
&__content {
display: flex;
+ flex-wrap: wrap;
gap: 20px;
}
}
+
diff --git a/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.vue b/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.vue
index 2453bc78e..fc3982cb0 100644
--- a/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.vue
+++ b/src/components/specific/dashboard/dashboard-space-list/DashboardSpaceList.vue
@@ -1,12 +1,18 @@
- {{ $t("DashboardProjectList.title") }}
-
+
-
+ {{ $t("DashboardSpaceList.title") }}
+
+
import { ref, watchEffect } from "vue";
+import routeNames from "../../../../router/route-names.js";
// Components
+import AppLink from "../../app/app-link/AppLink.vue";
import SpaceCard from "../../spaces/space-card/SpaceCard.vue";
+import SpaceCreationCard from "../../spaces/space-creation-card/SpaceCreationCard.vue";
export default {
components: {
- SpaceCard
+ AppLink,
+ SpaceCard,
+ SpaceCreationCard,
},
props: {
spaces: {
type: Array,
- required: true
+ required: true,
},
isCarousel: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
+ creating: {
+ type: Boolean,
+ default: false,
+ },
},
+ emits: ["close-creation"],
setup(props) {
const displayedSpaces = ref([]);
@@ -49,9 +65,10 @@ export default {
});
return {
- displayedSpaces
+ displayedSpaces,
+ routeNames,
};
- }
+ },
};
diff --git a/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTile.scss b/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTile.scss
deleted file mode 100644
index ae15b3251..000000000
--- a/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTile.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.dashboard-welcome-tile {
- display: grid;
- grid-template-rows: 2fr 1fr;
- grid-template-columns: 80px auto;
- grid-template-areas:
- "logo title"
- "logo message";
- gap: var(--spacing-unit);
- margin: 0 calc(var(--spacing-unit) / 2);
- color: var(--color-primary);
-
- &__logo {
- grid-area: logo;
- justify-self: center;
- align-self: center;
- }
-
- &__title {
- grid-area: title;
- align-self: end;
- font-size: 34px;
- font-weight: bold;
- }
-
- &__message {
- grid-area: message;
- }
-}
diff --git a/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTile.vue b/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTile.vue
deleted file mode 100644
index c6c4c557a..000000000
--- a/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTile.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
- {{ $t("DashboardSpaceList.title") }}
-
+
-
-
-
-
-
-
-
diff --git a/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTileImage.vue b/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTileImage.vue
deleted file mode 100644
index 0ac787fc4..000000000
--- a/src/components/specific/dashboard/dashboard-welcome-tile/DashboardWelcomeTileImage.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
diff --git a/src/components/specific/models/models-table/columns.js b/src/components/specific/models/models-table/columns.js
index f5e8d8286..940e6f7e4 100644
--- a/src/components/specific/models/models-table/columns.js
+++ b/src/components/specific/models/models-table/columns.js
@@ -33,7 +33,7 @@ export default [
{
id: "lastupdate",
text: "t.modifiedOn",
- width: "140px",
+ width: "160px",
align: "center",
},
{
@@ -45,6 +45,6 @@ export default [
{
id: "actions",
label: " ",
- width: "220px",
+ width: "200px",
},
];
diff --git a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss
index 537e79f2a..962de3cd0 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss
+++ b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss
@@ -3,43 +3,7 @@
display: flex;
justify-content: flex-end;
align-items: center;
- gap: calc(var(--spacing-unit) / 2);
-
- .actions-btn {
- gap: var(--spacing-unit);
- }
-
- .separator {
- width: 1px;
- height: 30px;
- background-color: var(--color-primary);
- flex-shrink: 0;
- }
-
- .viewer-fragments {
- position: relative;
- &:deep(.bimdata-btn) {
- display: flex;
- flex-direction: column;
- background-color: #fef6df;
- & > span {
- line-height: 1;
- }
- }
- .beta-label {
- font-size: 8px;
- }
- ::before {
- content: "";
- width: 8px;
- height: 8px;
- background: var(--color-secondary);
- clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
- position: absolute;
- left: 4%;
- top: 20%;
- }
- }
+ gap: calc(var(--spacing-unit) * 3 / 2);
&__btn {
color: var(--color-granite-light);
diff --git a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
index 1fd3c8108..cbc5a64c2 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
+++ b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
@@ -1,113 +1,94 @@
- MODEL_STATUS.COMPLETED === props.model.status);
- const modelDocument = computed(() =>
- handler.get({ nature: FILE_TYPE.DOCUMENT, id: props.model.document_id }),
- );
+ const modelDocument = computed(() => handler.get({ nature: FILE_TYPE.DOCUMENT, id: props.model.document_id }));
const menuItems = ref([]);
const openMenu = () => {
diff --git a/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue b/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue
index cf3b0b645..ac5e9b963 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue
+++ b/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue
@@ -8,18 +8,22 @@
params: {
spaceID: project.cloud.id,
projectID: project.id,
- modelIDs: model.id,
+ modelIDs: model.id
},
query: {
- window,
- },
+ window
+ }
}"
>
-
-
- {{ text || window.toUpperCase() }}
-
-
+
+ {{ text || window.toUpperCase() }}
@@ -33,27 +37,23 @@ import AppLink from "../../../app/app-link/AppLink.vue";
defineProps({
project: {
type: Object,
- required: true,
+ required: true
},
model: {
type: Object,
- required: true,
+ required: true
},
window: {
type: String,
- default: DEFAULT_WINDOW,
+ default: DEFAULT_WINDOW
},
disabled: {
type: Boolean,
- default: false,
+ default: false
},
text: {
- type: String,
- },
- color: {
- type: String,
- default: "granite",
- },
+ type: String
+ }
});
diff --git a/src/components/specific/projects/project-card/ProjectCard.css b/src/components/specific/projects/project-card/ProjectCard.css
index 8857dc29d..1e90c866e 100644
--- a/src/components/specific/projects/project-card/ProjectCard.css
+++ b/src/components/specific/projects/project-card/ProjectCard.css
@@ -6,11 +6,13 @@
height: var(--card-height);
.bimdata-card {
+ padding: 6px;
position: relative;
width: 100%;
height: 100%;
overflow: visible;
transition-duration: 0.35s;
+ box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.07);
.project-card__action-bar {
position: absolute;
@@ -25,6 +27,8 @@
z-index: 1;
width: 4px;
height: var(--card-height);
+ border-top-left-radius: 13px;
+ border-bottom-left-radius: 13px;
}
.project-card__left-stripe--new {
background-color: var(--color-primary);
@@ -46,18 +50,12 @@
left: calc(var(--card-width) - 66px);
}
- .project-status-badge {
- position: absolute;
- z-index: 1;
- top: calc(var(--card-content-height) - var(--spacing-unit) - 24px);
- left: calc(var(--spacing-unit) + 4px);
- }
-
&:deep() {
.bimdata-card__content {
height: var(--card-content-height);
padding: 0;
overflow: hidden;
+ border-radius: 13px;
}
.bimdata-card__footer {
@@ -86,6 +84,7 @@
min-width: var(--card-width);
width: var(--card-width);
height: var(--card-height);
+ border-radius: 13px;
box-shadow: var(--box-shadow);
background-color: var(--color-silver-light);
diff --git a/src/components/specific/projects/project-card/ProjectCard.vars.css b/src/components/specific/projects/project-card/ProjectCard.vars.css
index a2e9f0d8a..1966563c7 100644
--- a/src/components/specific/projects/project-card/ProjectCard.vars.css
+++ b/src/components/specific/projects/project-card/ProjectCard.vars.css
@@ -3,7 +3,7 @@
.project-card-placeholder,
.project-creation-card {
--card-width: 320px;
- --card-height: 261px;
+ --card-height: 275px;
--card-content-height: 205px;
--card-background: var(--color-silver-light);
}
diff --git a/src/components/specific/projects/project-card/ProjectCard.vue b/src/components/specific/projects/project-card/ProjectCard.vue
index 8528ac7c8..861971c70 100644
--- a/src/components/specific/projects/project-card/ProjectCard.vue
+++ b/src/components/specific/projects/project-card/ProjectCard.vue
@@ -12,19 +12,17 @@
data-guide="dashboard-project"
:data-guide-param="project.id"
:data-guide-click="
- isSpaceAdmin(project.cloud) && displayedModels.length > 0
- ? 'dashboard-project'
- : ''
+ isSpaceAdmin(project.cloud) && displayedModels.length > 0 ? 'dashboard-project' : ''
"
:to="{
name: routeNames.projectBoard,
params: {
spaceID: project.cloud.id,
- projectID: project.id
- }
+ projectID: project.id,
+ },
}"
>
-
+
-->
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
-
+
+
-
- Bêta
-
-
-
-
+
+
+
-
-
-
- {{ $t("ProjectOverview.activity.filters.types") }}
+
+
+
-
-
+
-
+ {{ $t("ProjectOverview.activity.filters.types") }}
+
+
+
+
-
-
-
-
+
diff --git a/src/components/specific/spaces/space-card/space-card-action-menu/SpaceCardActionMenu.vue b/src/components/specific/spaces/space-card/space-card-action-menu/SpaceCardActionMenu.vue
index 042a623c8..49824c7e2 100644
--- a/src/components/specific/spaces/space-card/space-card-action-menu/SpaceCardActionMenu.vue
+++ b/src/components/specific/spaces/space-card/space-card-action-menu/SpaceCardActionMenu.vue
@@ -1,15 +1,14 @@
-
- {{ $t("ProjectOverview.activity.filters.users") }}
-
-
-
+
+
-
-
+
-
+ {{ $t("ProjectOverview.activity.filters.users") }}
+
+
+
+
-
+
- {{ $t("ProjectOverview.activity.filters.period") }}
-
-
-
diff --git a/src/components/specific/projects/project-status-badge/ProjectStatusBadge.scss b/src/components/specific/projects/project-status-badge/ProjectStatusBadge.scss
index b1030705c..1e0ac15e4 100644
--- a/src/components/specific/projects/project-status-badge/ProjectStatusBadge.scss
+++ b/src/components/specific/projects/project-status-badge/ProjectStatusBadge.scss
@@ -1,12 +1,12 @@
.project-status-badge {
- min-width: 58px;
- height: 24px;
+ min-width: 46px;
+ height: 20px;
display: flex;
justify-content: center;
align-items: center;
padding: 0 calc(var(--spacing-unit) / 2);
- text-transform: uppercase;
color: var(--color-white);
+ border-radius: 50px;
&--new {
background-color: var(--color-primary);
diff --git a/src/components/specific/spaces/space-card/SpaceCard.css b/src/components/specific/spaces/space-card/SpaceCard.css
index c94412122..e74f689ed 100644
--- a/src/components/specific/spaces/space-card/SpaceCard.css
+++ b/src/components/specific/spaces/space-card/SpaceCard.css
@@ -5,6 +5,8 @@
height: var(--card-height);
transition-duration: 0.35s;
overflow: visible;
+ box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.07);
+ padding: 6px;
&:deep() {
.bimdata-card__submenu {
@@ -20,6 +22,7 @@
overflow: hidden;
height: var(--card-content-height);
padding: 0;
+ border-radius: 13px;
.free-badge {
position: absolute;
@@ -79,6 +82,11 @@
font-weight: bold;
}
}
+ .stripe {
+ position: absolute;
+ right: 6px;
+ bottom: 6px;
+ }
}
}
diff --git a/src/components/specific/spaces/space-card/SpaceCard.vue b/src/components/specific/spaces/space-card/SpaceCard.vue
index 2b7cd4db9..c5c0fb601 100644
--- a/src/components/specific/spaces/space-card/SpaceCard.vue
+++ b/src/components/specific/spaces/space-card/SpaceCard.vue
@@ -4,7 +4,7 @@
:data-test-param="space.id"
:to="{ name: routeNames.spaceBoard, params: { spaceID: space.id } }"
>
-
+
+ {{ $t("ProjectOverview.activity.filters.period") }}
+
+
+
@@ -28,12 +28,23 @@
{{ projectsCount[space.id] }}
+
-
@@ -103,12 +96,11 @@ import SpaceCardUpdateForm from "../space-card-update-form/SpaceCardUpdateForm.v
const props = defineProps({
space: {
type: Object,
- required: true
- }
+ required: true,
+ },
});
-const { isSpaceAdmin, isFavoriteSpace, addFavoriteSpace, removeFavoriteSpace } =
- useUser();
+const { isSpaceAdmin, isFavoriteSpace, addFavoriteSpace, removeFavoriteSpace } = useUser();
const { removeSpaceImage } = useSpaces();
const loading = ref(false);
@@ -122,16 +114,8 @@ const toggleFavorite = async () => {
}
};
-const {
- isOpen: showUpdateForm,
- open: openUpdateForm,
- close: closeUpdateForm
-} = useToggle();
-const {
- isOpen: showDeleteGuard,
- open: openDeleteGuard,
- close: closeDeleteGuard
-} = useToggle();
+const { isOpen: showUpdateForm, open: openUpdateForm, close: closeUpdateForm } = useToggle();
+const { isOpen: showDeleteGuard, open: openDeleteGuard, close: closeDeleteGuard } = useToggle();
const reset = () => {
closeUpdateForm();
diff --git a/src/components/specific/spaces/space-card/space-card-image/SpaceCardImage.vue b/src/components/specific/spaces/space-card/space-card-image/SpaceCardImage.vue
index d6bce2a70..79d308bc6 100644
--- a/src/components/specific/spaces/space-card/space-card-image/SpaceCardImage.vue
+++ b/src/components/specific/spaces/space-card/space-card-image/SpaceCardImage.vue
@@ -1,10 +1,5 @@
-
![]()