Skip to content

Commit

Permalink
Merge branch 'staging' of https://github.com/3drepo/3drepo.io into IS…
Browse files Browse the repository at this point in the history 
…SUE_4642
  • Loading branch information
sanmont3drepo committed Jan 19, 2024
2 parents 905ef1f + d5669aa commit edfbf8e
Show file tree
Hide file tree
Showing 31 changed files with 709 additions and 115 deletions.
28 changes: 28 additions & 0 deletions frontend/assets/icons/viewer/align.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g id="align-o">
<path className="primary" id="Vector 155 (Stroke)" fillRule="evenodd" clipRule="evenodd" d="M0.170824 7.9752C0.34557 7.67253 0.732592 7.56883 1.03526 7.74358L2.07127 8.34172L1.43846 9.43778L0.402449 8.83964C0.0997799 8.6649 -0.00392238 8.27787 0.170824 7.9752ZM4.60404 11.2654L2.53202 10.0692L3.16484 8.97309L5.23685 10.1694L4.60404 11.2654ZM7.76963 13.0931L5.69761 11.8968L6.33042 10.8007L8.40244 11.997L7.76963 13.0931ZM10.9352 14.9207L8.86319 13.7245L9.496 12.6284L11.568 13.8247L10.9352 14.9207ZM14.1008 16.7484L12.0288 15.5521L12.6616 14.456L14.7336 15.6523L14.1008 16.7484ZM16.2304 17.9779L15.1944 17.3798L15.8272 16.2837L16.8632 16.8818C17.1658 17.0566 17.2696 17.4436 17.0948 17.7463C16.9201 18.0489 16.533 18.1526 16.2304 17.9779Z" fill="currentColor"/>
<path className="highlight" id="Rectangle 3623" d="M6.5588 9.46249C5.95347 9.113 5.74606 8.33895 6.09555 7.73361L9.59292 1.67599C9.94242 1.07065 10.7165 0.863249 11.3218 1.21274L17.3794 4.71011C17.9848 5.0596 18.1922 5.83365 17.8427 6.43899L14.3453 12.4966C13.9958 13.1019 13.2218 13.3094 12.6164 12.9599L6.5588 9.46249Z" fill="currentColor"/>
</g>
</svg>
);
28 changes: 28 additions & 0 deletions frontend/assets/icons/viewer/clip_selection.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g id="clip-selection-o">
<path className="highlight" id="Rectangle 3640" d="M5.71094 6.29297C5.71094 5.94348 5.99426 5.66016 6.34375 5.66016H11.7578C12.1073 5.66016 12.3906 5.94348 12.3906 6.29297V11.707C12.3906 12.0565 12.1073 12.3398 11.7578 12.3398H6.34375C5.99426 12.3398 5.71094 12.0565 5.71094 11.707V6.29297Z" fill="currentColor"/>
<path className="primary" id="Union" fillRule="evenodd" clipRule="evenodd" d="M0.800781 4.3828C0.800781 4.73229 1.0841 5.01561 1.43359 5.01561H4.43359C4.78309 5.01561 5.06641 4.73229 5.06641 4.3828V1.38281C5.06641 1.03332 4.78309 0.749997 4.43359 0.749997C4.0841 0.749997 3.80078 1.03332 3.80078 1.38281V2.85506L1.13106 0.185346C0.883931 -0.0617819 0.483256 -0.0617819 0.236128 0.185346C-0.0110009 0.432474 -0.0110009 0.833147 0.236128 1.08027L2.90585 3.74999H1.43359C1.0841 3.74999 0.800781 4.0333 0.800781 4.3828ZM16.6737 5.01561C17.0232 5.01561 17.3065 4.73229 17.3065 4.3828C17.3065 4.0333 17.0232 3.74999 16.6737 3.74999H15.2015L17.8712 1.08027C18.1183 0.833147 18.1183 0.432474 17.8712 0.185346C17.6241 -0.0617819 17.2234 -0.0617819 16.9763 0.185346L14.3065 2.85506V1.38281C14.3065 1.03332 14.0232 0.749997 13.6737 0.749997C13.3242 0.749997 13.0409 1.03332 13.0409 1.38281V4.3828C13.0409 4.73229 13.3242 5.01561 13.6737 5.01561H16.6737ZM16.6737 12.9903C17.0232 12.9903 17.3065 13.2736 17.3065 13.6231C17.3065 13.9726 17.0232 14.2559 16.6737 14.2559H15.2015L17.8712 16.9256C18.1183 17.1727 18.1183 17.5734 17.8712 17.8205C17.6241 18.0677 17.2234 18.0677 16.9763 17.8205L14.3065 15.1508V16.6231C14.3065 16.9726 14.0232 17.2559 13.6737 17.2559C13.3242 17.2559 13.0409 16.9726 13.0409 16.6231V13.6231C13.0409 13.2736 13.3242 12.9903 13.6737 12.9903H16.6737ZM1.43359 12.9903C1.0841 12.9903 0.800781 13.2736 0.800781 13.6231C0.800781 13.9726 1.0841 14.2559 1.43359 14.2559H2.90585L0.236128 16.9256C-0.0110009 17.1727 -0.0110009 17.5734 0.236128 17.8205C0.483256 18.0677 0.883931 18.0677 1.13106 17.8205L3.80078 15.1508V16.6231C3.80078 16.9726 4.0841 17.2559 4.43359 17.2559C4.78309 17.2559 5.06641 16.9726 5.06641 16.6231V13.6231C5.06641 13.2736 4.78309 12.9903 4.43359 12.9903H1.43359Z" fill="currentColor"/>
</g>
</svg>
);
27 changes: 27 additions & 0 deletions frontend/assets/icons/viewer/delete.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
type IProps = {
className?: any;
};

export default ({ className }: IProps) => (
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g className="primary" id="delete-o">
<path id="Union" fillRule="evenodd" clipRule="evenodd" d="M4.55078 2.16211C4.55078 1.11363 5.40074 0.263672 6.44922 0.263672H11.6348C12.6832 0.263672 13.5332 1.11363 13.5332 2.16211V2.74219H16.3281C16.6776 2.74219 16.9609 3.02551 16.9609 3.375C16.9609 3.72449 16.6776 4.00781 16.3281 4.00781H15.7659L15.2862 15.5736C15.2299 16.9296 14.1143 18 12.7571 18H5.37961C4.02245 18 2.90678 16.9296 2.85054 15.5736L2.37085 4.00781H1.80859C1.4591 4.00781 1.17578 3.72449 1.17578 3.375C1.17578 3.02551 1.4591 2.74219 1.80859 2.74219H4.55078V2.16211ZM5.81641 2.74219H12.2676V2.16211C12.2676 1.81262 11.9843 1.5293 11.6348 1.5293H6.44922C6.09973 1.5293 5.81641 1.81262 5.81641 2.16211V2.74219ZM3.63756 4.00781L4.11508 15.5212C4.1432 16.1992 4.70103 16.7344 5.37961 16.7344H12.7571C13.4357 16.7344 13.9935 16.1992 14.0216 15.5212L14.4992 4.00781H3.63756Z" fill="currentColor"/>
</g>
</svg>
);
36 changes: 36 additions & 0 deletions frontend/assets/icons/viewer/flip_plane.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g id="flip-plane-o">
<path className="highlight" fillRule="evenodd" clipRule="evenodd" d="M1.31641 3.07617C1.31641 2.02769 2.16637 1.17773 3.21484 1.17773H8.41797V16.7344H3.21484C2.16637 16.7344 1.31641 15.8844 1.31641 14.8359V3.07617Z" fill="currentColor"/>
<g className="primary" id="Union">
<path d="M9.68359 0.632812C9.68359 0.28332 9.40027 0 9.05078 0C8.70129 0 8.41797 0.28332 8.41797 0.632812V17.3672C8.41797 17.7167 8.70129 18 9.05078 18C9.40027 18 9.68359 17.7167 9.68359 17.3672V0.632812Z" fill="currentColor"/>
<path d="M10.5977 2.53125H12.0273V1.26562H10.5977V2.53125Z" fill="currentColor"/>
<path d="M13.457 2.53125H14.8867C15.2362 2.53125 15.5195 2.81457 15.5195 3.16406V4.46094H16.7852V3.16406C16.7852 2.11558 15.9352 1.26562 14.8867 1.26562H13.457V2.53125Z" fill="currentColor"/>
<path d="M15.5195 5.75781V8.35156H16.7852V5.75781H15.5195Z" fill="currentColor"/>
<path d="M15.5195 9.64844V12.2422H16.7852V9.64844H15.5195Z" fill="currentColor"/>
<path d="M15.5195 13.5391V14.8359C15.5195 15.1854 15.2362 15.4688 14.8867 15.4688H13.457V16.7344H14.8867C15.9352 16.7344 16.7852 15.8844 16.7852 14.8359V13.5391H15.5195Z" fill="currentColor"/>
<path d="M12.0273 15.4688H10.5977V16.7344H12.0273V15.4688Z" fill="currentColor"/>
</g>
</g>
</svg>
);
29 changes: 29 additions & 0 deletions frontend/assets/icons/viewer/gizmo_rotate.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g id="move-cube-o">
<path className="primary" fillRule="evenodd" clipRule="evenodd" d="M9.07185 2.8855C9.23817 2.8116 9.42801 2.8116 9.59432 2.8855L10.5583 3.31385C13.9613 4.82589 16.1544 8.20029 16.1544 11.924V13.7667C16.1544 14.0209 16.0047 14.2514 15.7723 14.3546L13.1589 15.5159C10.7232 16.5981 7.94301 16.5981 5.5073 15.5159L2.89384 14.3546C2.66149 14.2514 2.51172 14.021 2.51172 13.7667V11.924C2.51172 8.20029 4.70488 4.82589 8.10782 3.31385L9.07185 2.8855ZM9.33308 4.15437L8.62173 4.47044C5.6759 5.77937 3.77734 8.7005 3.77734 11.924V13.3623L6.02121 14.3593C8.12974 15.2962 10.5364 15.2962 12.645 14.3593L14.8888 13.3623V11.924C14.8888 8.70049 12.9903 5.77937 10.0444 4.47044L9.33308 4.15437Z" fill="currentColor"/>
<path className="highlight" fillRule="evenodd" clipRule="evenodd" d="M9.03053 0.509766C8.1568 0.509766 7.4485 1.21807 7.4485 2.0918C7.4485 2.74729 7.84715 3.30967 8.41523 3.54971V10.605L3.1189 13.6473C2.62645 13.3051 1.95987 13.2593 1.40991 13.5845C0.657808 14.0291 0.408601 14.9993 0.853291 15.7514C1.29798 16.5035 2.26817 16.7527 3.02028 16.3081C3.58696 15.973 3.86815 15.3396 3.78212 14.7259L8.94428 11.7607L14.3031 14.855C14.2275 15.4613 14.5087 16.0828 15.0681 16.4135C15.8202 16.8582 16.7904 16.609 17.2351 15.8569C17.6798 15.1048 17.4306 14.1346 16.6785 13.6899C16.1211 13.3604 15.4439 13.4119 14.9496 13.7669L9.68085 10.7245V3.53441C10.2302 3.28637 10.6126 2.73373 10.6126 2.0918C10.6126 1.21807 9.90426 0.509766 9.03053 0.509766ZM9.05947 10.9688L9.07896 11.0027L9.09855 10.9688H9.05947Z" fill="currentColor"/>
</g>
</svg>
);
29 changes: 29 additions & 0 deletions frontend/assets/icons/viewer/gizmo_scale.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g id="move-cube-o">
<path className="primary" fillRule="evenodd" clipRule="evenodd" d="M9.16388 4.61188L3.79431 13.5589H14.5334L9.16388 4.61188ZM8.61224 3.07157C8.86213 2.65518 9.46562 2.65518 9.71552 3.07157L16.1843 13.8501C16.4417 14.279 16.1327 14.8245 15.6326 14.8245H2.69513C2.19495 14.8245 1.88617 14.2788 2.14349 13.8501L8.61224 3.07157Z" fill="currentColor"/>
<path className="highlight" d="M7.62839 0.509766C7.53131 0.509766 7.45261 0.588466 7.45261 0.685547V3.49805C7.45261 3.59513 7.53131 3.67383 7.62839 3.67383H8.43695V10.605L3.25146 13.5837L2.86529 12.9306C2.81588 12.847 2.70808 12.8193 2.62451 12.8687L0.203532 14.3002C0.119965 14.3496 0.0922751 14.4574 0.141685 14.541L1.57312 16.9619C1.62253 17.0455 1.73033 17.0732 1.8139 17.0238L4.23488 15.5923C4.31844 15.5429 4.34613 15.4351 4.29672 15.3516L3.89566 14.6733L9.07118 11.7003L14.2522 14.692L13.7999 15.457C13.7505 15.5406 13.7782 15.6484 13.8617 15.6978L16.2827 17.1292C16.3663 17.1787 16.4741 17.151 16.5235 17.0674L17.9549 14.6464C18.0043 14.5629 17.9766 14.4551 17.8931 14.4056L15.4721 12.9742C15.3885 12.9248 15.2807 12.9525 15.2313 13.0361L14.8964 13.6025L9.70258 10.6034V3.67383H10.4409C10.538 3.67383 10.6167 3.59513 10.6167 3.49805V0.685547C10.6167 0.588466 10.538 0.509766 10.4409 0.509766H7.62839Z" fill="currentColor"/>
</g>
</svg>
);
29 changes: 29 additions & 0 deletions frontend/assets/icons/viewer/gizmo_translate.svg.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Copyright (C) 2023 3D Repo Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<g id="move-cube-o">
<path className="primary" fillRule="evenodd" clipRule="evenodd" d="M8.78669 3.58179C8.95301 3.50789 9.14285 3.50789 9.30916 3.58179L15.4872 6.32688C15.7195 6.43012 15.8693 6.66054 15.8693 6.91481V14.463C15.8693 14.7172 15.7195 14.9477 15.4872 15.0509L9.30916 17.796C9.14285 17.8699 8.95301 17.8699 8.78669 17.796L2.60868 15.0509C2.37633 14.9477 2.22656 14.7173 2.22656 14.463V6.91481C2.22656 6.66054 2.37632 6.43013 2.60868 6.32688L8.78669 3.58179ZM9.04793 4.85065L3.49219 7.31925V14.0585L9.04793 16.5271L14.6037 14.0585V7.31925L9.04793 4.85065Z" fill="currentColor"/>
<path className="highlight" d="M8.87735 1.18653C9.01509 1.04655 9.2408 1.04655 9.37853 1.18653L11.2376 3.0759C11.4563 3.29818 11.2989 3.67404 10.987 3.67404L9.68165 3.67404V10.6036L15.8016 14.1375L16.4604 12.9964C16.6163 12.7264 17.0206 12.7779 17.1037 13.0785L17.8104 15.6332C17.8628 15.8225 17.7499 16.0179 17.5598 16.0672L14.994 16.7326C14.6922 16.8108 14.4454 16.4865 14.6013 16.2165L15.1688 15.2336L9.05023 11.7005L2.83111 15.2729L3.43676 16.3219C3.59268 16.592 3.34591 16.9163 3.04405 16.838L0.478255 16.1727C0.288158 16.1234 0.175304 15.9279 0.227663 15.7387L0.934361 13.1839C1.0175 12.8834 1.42174 12.8318 1.57766 13.1019L2.1983 14.1769L8.41603 10.6052V3.67404L7.26884 3.67404C6.957 3.67404 6.79954 3.29818 7.01825 3.0759L8.87735 1.18653Z" fill="currentColor"/>
</g>
</svg>
);
2 changes: 1 addition & 1 deletion frontend/assets/icons/viewer/viewerIconContainer.styles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const selectedStyles = css`

const disabledStyles = css`
.primary, .highlight {
color: ${({ theme }) => theme.palette.base.lightest};
color: ${({ theme }) => theme.palette.base.main};
}
`;

Expand Down
Loading

0 comments on commit edfbf8e

Please sign in to comment.