Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasRichel committed Sep 25, 2024
2 parents 19bffbe + e6f44b9 commit f76e1b2
Show file tree
Hide file tree
Showing 16 changed files with 3,255 additions and 3,940 deletions.
6,852 changes: 2,933 additions & 3,919 deletions package-lock.json

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bimdata/design-system",
"version": "2.1.0",
"version": "2.2.0-beta.2",
"main": "./src/BIMDataComponents/index.js",
"module": "./src/BIMDataComponents/index.js",
"files": [
Expand All @@ -18,24 +18,24 @@
},
"devDependencies": {
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^10.0.4",
"@semantic-release/commit-analyzer": "^13.0.0",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^9.0.6",
"@semantic-release/npm": "^11.0.0",
"@semantic-release/release-notes-generator": "^11.0.7",
"@vitejs/plugin-vue": "^4.3.4",
"conventional-changelog-eslint": "^5.0.0",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.17.0",
"prettier": "^3.0.3",
"@semantic-release/github": "^11.0.0",
"@semantic-release/npm": "^12.0.1",
"@semantic-release/release-notes-generator": "^14.0.1",
"@vitejs/plugin-vue": "^5.1.4",
"conventional-changelog-eslint": "^6.0.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.28.0",
"prettier": "^3.3.3",
"prismjs": "^1.29.0",
"sass": "^1.67.0",
"semantic-release": "^22.0.0",
"vite": "^4.5.3",
"vue": "^3.3.4",
"vue-router": "^4.2.4",
"sass": "^1.79.3",
"semantic-release": "^24.1.1",
"vite": "^5.4.8",
"vue": "^3.5.8",
"vue-router": "^4.4.5",
"vue3-clipboard": "^1.0.0"
}
}
6 changes: 3 additions & 3 deletions release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ const config = {
"@semantic-release/commit-analyzer",
{
releaseRules: [
{ tag: "MINOR", release: "minor" },
{ tag: "PATCH", release: "patch" },
{ tag: "MINOR", release: "minor" },
{ tag: "MAJOR", release: "major" },
],
parserOpts: {
headerPattern: /^(MINOR|PATCH|MAJOR): (.*)$/,
headerPattern: /^(PATCH|MINOR|MAJOR): (.*)$/,
headerCorrespondence: ["tag", "subject"],
},
},
Expand All @@ -38,7 +38,7 @@ const config = {
{
name: "develop",
channel: "next",
prerelease: "rc",
prerelease: "beta",
},
{
name: "release/[0-9]+(.[0-9]+)?.(x|X)",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<template>
<Icon
:fill="fill"
:fillColor="fillColor"
:color="color"
:class="classes"
:style="style"
>
<Rename />
</Icon>
</template>

<script>
import Rename from "../BIMDataLibraryIcons/Rename.vue";
import makeIcon from "./iconFactory.js";
export default makeIcon("Rename", Rename);
</script>

<style scoped lang="scss" src="../_BIMDataIcon.scss"></style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<template>
<Icon
:fill="fill"
:fillColor="fillColor"
:color="color"
:class="classes"
:style="style"
>
<UnknownFile />
</Icon>
</template>

<script>
import UnknownFile from "../BIMDataLibraryIcons/UnknownFile.vue";
import makeIcon from "./iconFactory.js";
export default makeIcon("UnknownFile", UnknownFile);
</script>

<style scoped lang="scss" src="../_BIMDataIcon.scss"></style>
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export { default as BIMDataIconRedo } from "./BIMDataIconRedo.vue";
export { default as BIMDataIconReduced } from "./BIMDataIconReduced.vue";
export { default as BIMDataIconRefresh } from "./BIMDataIconRefresh.vue";
export { default as BIMDataIconRemoveModel } from "./BIMDataIconRemoveModel.vue";
export { default as BIMDataIconRename } from "./BIMDataIconRename.vue";
export { default as BIMDataIconReprocessIfc } from "./BIMDataIconReprocessIfc.vue";
export { default as BIMDataIconReset } from "./BIMDataIconReset.vue";
export { default as BIMDataIconRestore } from "./BIMDataIconRestore.vue";
Expand Down Expand Up @@ -136,6 +137,7 @@ export { default as BIMDataIconTree } from "./BIMDataIconTree.vue";
export { default as BIMDataIconUnarchive } from "./BIMDataIconUnarchive.vue";
export { default as BIMDataIconUndo } from "./BIMDataIconUndo.vue";
export { default as BIMDataIconUnion } from "./BIMDataIconUnion.vue";
export { default as BIMDataIconUnknownFile } from "./BIMDataIconUnknownFile.vue";
export { default as BIMDataIconUp } from "./BIMDataIconUp.vue";
export { default as BIMDataIconUpload } from "./BIMDataIconUpload.vue";
export { default as BIMDataIconUser } from "./BIMDataIconUser.vue";
Expand Down
12 changes: 12 additions & 0 deletions src/BIMDataComponents/BIMDataIcon/BIMDataLibraryIcons/Rename.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<template>
<g>
<path
d="M10.8535 23V20.4444H13.4091V2.55556H10.8535V0H18.5202V2.55556H15.9646V20.4444H18.5202V23H10.8535Z"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M15.9652 6H13.4091V8.5H15.9652V6ZM18.5284 14.5H19.9688C20.2449 14.5 20.4688 14.2761 20.4688 14V9C20.4688 8.72386 20.2449 8.5 19.9688 8.5H18.5284V6H19.9688C21.6256 6 22.9688 7.34314 22.9688 9V14C22.9688 15.6569 21.6256 17 19.9688 17H18.5284V14.5ZM15.9652 14.5H13.4091V17H15.9652V14.5ZM3.03125 6H10.8447V8.5H3.03125C2.75511 8.5 2.53125 8.72386 2.53125 9V14C2.53125 14.2761 2.75511 14.5 3.03125 14.5H10.8447V17H3.03125C1.3744 17 0.03125 15.6569 0.03125 14V9C0.03125 7.34314 1.3744 6 3.03125 6Z"
/>
</g>
</template>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<template>
<g>
<path
d="M4.65935 22C4.05435 22 3.53643 21.7846 3.1056 21.3538C2.67477 20.9229 2.45935 20.405 2.45935 19.8V2.2C2.45935 1.595 2.67477 1.07708 3.1056 0.64625C3.53643 0.215417 4.05435 0 4.65935 0H13.4594L20.0594 6.6V19.8C20.0594 20.405 19.8439 20.9229 19.4131 21.3538C18.9823 21.7846 18.4644 22 17.8594 22H4.65935ZM4.65935 19.8H17.8594V7.535L12.5244 2.2H4.65935V19.8Z"
/>
<path
d="M11.8068 14.4115H9.62349C9.62349 13.9335 9.65841 13.5173 9.72823 13.1628C9.80343 12.8029 9.92696 12.4806 10.0988 12.196C10.2707 11.9059 10.5017 11.6293 10.7917 11.3661C11.0441 11.1459 11.2644 10.9391 11.4524 10.7458C11.6403 10.547 11.7854 10.3429 11.8874 10.1335C11.9895 9.92399 12.0405 9.69572 12.0405 9.44865C12.0405 9.15324 11.9948 8.91154 11.9035 8.72355C11.8176 8.53019 11.6887 8.38517 11.5168 8.28849C11.3503 8.18644 11.1408 8.13542 10.8884 8.13542C10.6789 8.13542 10.4829 8.18376 10.3003 8.28044C10.1176 8.37175 9.96993 8.51676 9.85714 8.7155C9.74434 8.91423 9.68258 9.17472 9.67183 9.49699H7.14205C7.15816 8.72892 7.33272 8.1005 7.66573 7.61173C7.99874 7.11759 8.44454 6.75505 9.00313 6.52409C9.5671 6.28776 10.1955 6.1696 10.8884 6.1696C11.6565 6.1696 12.3144 6.29045 12.8623 6.53215C13.4155 6.77384 13.8371 7.13102 14.1272 7.60368C14.4226 8.07633 14.5703 8.65373 14.5703 9.33586C14.5703 9.80314 14.4816 10.214 14.3044 10.5685C14.1272 10.9176 13.8908 11.2453 13.5954 11.5514C13.3 11.8522 12.9724 12.1664 12.6125 12.4941C12.3064 12.768 12.0969 13.0527 11.9841 13.3481C11.8713 13.6381 11.8122 13.9926 11.8068 14.4115ZM9.33346 16.8769C9.33346 16.517 9.46236 16.2135 9.72017 15.9665C9.98336 15.7194 10.3244 15.5959 10.7434 15.5959C11.1623 15.5959 11.5007 15.7194 11.7585 15.9665C12.0163 16.2135 12.1452 16.517 12.1452 16.8769C12.1452 17.2421 12.0163 17.5483 11.7585 17.7953C11.5007 18.037 11.1623 18.1579 10.7434 18.1579C10.3244 18.1579 9.98336 18.037 9.72017 17.7953C9.46236 17.5483 9.33346 17.2421 9.33346 16.8769Z"
/>
</g>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ import redo from "./Redo.vue";
import reduced from "./Reduced.vue";
import refresh from "./Refresh.vue";
import removeModel from "./RemoveModel.vue";
import rename from "./Rename.vue";
import reprocessIfc from "./ReprocessIfc.vue";
import reset from "./Reset.vue";
import restore from "./Restore.vue";
Expand Down Expand Up @@ -136,6 +137,7 @@ import tree from "./Tree.vue";
import unarchive from "./Unarchive.vue";
import undo from "./Undo.vue";
import union from "./Union.vue";
import unknownFile from "./UnknownFile.vue";
import up from "./Up.vue";
import upload from "./Upload.vue";
import user from "./User.vue";
Expand Down Expand Up @@ -274,6 +276,7 @@ export default {
reduced,
refresh,
removeModel,
rename,
reprocessIfc,
reset,
restore,
Expand Down Expand Up @@ -310,6 +313,7 @@ export default {
unarchive,
undo,
union,
unknownFile,
up,
upload,
user,
Expand Down
76 changes: 76 additions & 0 deletions src/BIMDataComponents/BIMDataInfobox/BIMDataInfobox.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<script setup>
defineProps({
text: {
type: String,
default: ""
},
icon: {
type: String,
default: "information"
},
color: {
type: String,
validator:
v => [
"granite-light",
"high",
"neutral",
"primary",
"secondary",
"success",
"warning",
].includes(v),
default: "neutral"
},
});
</script>

<template>
<div class="bimdata-infobox">
<div class="bimdata-infobox__stripe"
:style="{ backgroundColor: `var(--color-${color})` }"
>
<!-- left stripe -->
</div>
<div class="bimdata-infobox__icon">
<BIMDataIcon :name="icon" :customSize="18" :color="color" fill />
</div>
<div class="bimdata-infobox__text">
<slot>{{ text }}</slot>
</div>
</div>
</template>

<style scoped>
.bimdata-infobox {
position: relative;
padding: var(--spacing-unit);
border-radius: 3px;
background-color: var(--color-silver-light);
color: var(--color-granite-light);
overflow: hidden;
display: flex;
align-items: start;
gap: var(--spacing-unit);
.bimdata-infobox__stripe {
position: absolute;
top: 0;
left: 0;
width: 4px;
height: 100%;
}
.bimdata-infobox__icon {
width: 18px;
height: 18px;
line-height: 18px;
margin-top: calc((1em * 1.25 - 18px) / 2);
}
.bimdata-infobox__text {
line-height: 1.25;
}
}
</style>
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.column-filters {
width: 100%;
width: max-content;
min-width: 100%;
max-width: 150%;
word-break: break-all;
display: grid;
position: absolute;
left: 0;
Expand All @@ -10,5 +13,7 @@
z-index: 1;
.bimdata-checkbox {
font-weight: 400;
align-items: flex-start;
text-align: left;
}
}
1 change: 1 addition & 0 deletions src/BIMDataComponents/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export { default as BIMDataFileIcon } from "./BIMDataFileIcon/BIMDataFileIcon.vu
export { default as BIMDataIcon } from "./BIMDataIcon/BIMDataIcon.vue";
export * from "./BIMDataIcon/BIMDataIconStandalone/index.js";
export { default as BIMDataIllustration } from "./BIMDataIllustration/BIMDataIllustration.vue";
export { default as BIMDataInfobox } from "./BIMDataInfobox/BIMDataInfobox.vue";
export { default as BIMDataInput } from "./BIMDataInput/BIMDataInput.vue";
export { default as BIMDataInputOutlined } from "./BIMDataInputOutlined/BIMDataInputOutlined.vue";
export { default as BIMDataList } from "./BIMDataList/BIMDataList.vue";
Expand Down
5 changes: 5 additions & 0 deletions src/web/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ const routes = [
component: () =>
import("./views/Components/Illustrations/Illustrations.vue"),
},
{
path: "infobox",
name: "infobox",
component: () => import("./views/Components/Infobox/Infobox.vue"),
},
{
path: "input",
name: "input",
Expand Down
7 changes: 7 additions & 0 deletions src/web/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ export default {
text: "Illustrations are used to provide additional visual context.",
btn: "View illustrations",
},
{
title: "Infobox",
img: text,
path: "infobox",
text: "Infobox are used to highlight some piece of text in the UI.",
btn: "View infobox",
},
{
title: "Input",
img: input,
Expand Down
Loading

0 comments on commit f76e1b2

Please sign in to comment.