Merge branch 'main' into fix-ios-scroll

Signed-off-by: nickcastel50 <nickcastel50@gmail.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bldrs",
-  "version": "1.0.1199",
+  "version": "1.0.1201",
   "main": "src/index.jsx",
   "license": "AGPL-3.0",
   "homepage": "https://github.com/bldrs-ai/Share",
@@ -69,7 +69,6 @@
     "@emotion/react": "11.10.0",
     "@emotion/styled": "11.10.0",
     "@fontsource/roboto": "^5.1.0",
-    "@iconscout/react-unicons": "2.0.0",
     "@mui/icons-material": "5.16.8",
     "@mui/lab": "5.0.0-alpha.95",
     "@mui/material": "5.16.8",

src/Components/Buttons.jsx

@@ -1,6 +1,5 @@
 import React, {ReactElement, useEffect, useState} from 'react'
 import {useLocation} from 'react-router'
-import Button from '@mui/material/Button'
 import IconButton from '@mui/material/IconButton'
 import SvgIcon from '@mui/material/SvgIcon'
 import ToggleButton from '@mui/material/ToggleButton'
@@ -196,31 +195,6 @@ export function CloseButton({onCloseClick, ...props}) {
 }
 
 
-/**
- * A RectangularButton is used in dialogs
- *
- * @property {string} title Text to show in button
- * @property {Function} onClick callback
- * @property {object} [icon] Start icon to left of text
- * @property {boolean} [border] Default: false
- * @property {boolean} [background] Default: true
- * @return {object} React component
- */
-export function RectangularButton({
-  title,
-  onClick,
-  icon = null,
-  disabled = false,
-}) {
-  assertDefined(title, onClick)
-  return (
-    icon ?
-      <Button onClick={onClick} startIcon={icon} variant='contained'>{title}</Button> :
-      <Button onClick={onClick} variant='contained' disabled={disabled}>{title}</Button>
-  )
-}
-
-
 /**
  * @property {Function} onClick Handler for close event.
  * @return {ReactElement}

src/Components/Imagine/ImagineDialog.jsx

@@ -1,14 +1,14 @@
 import axios from 'axios'
 import React, {ReactElement, useEffect, useState} from 'react'
 import {Helmet} from 'react-helmet-async'
+import Button from '@mui/material/Button'
+import IconButton from '@mui/material/IconButton'
+import InputAdornment from '@mui/material/InputAdornment'
+import Box from '@mui/material/Box'
 import Stack from '@mui/material/Stack'
 import TextField from '@mui/material/TextField'
-import Box from '@mui/material/Box'
-import InputAdornment from '@mui/material/InputAdornment'
-import IconButton from '@mui/material/IconButton'
 import useStore from '../../store/useStore'
 import debug from '../../utils/debug'
-import {RectangularButton} from '../Buttons'
 import Dialog from '../Dialog'
 import Loader from '../Loader'
 import ClearIcon from '@mui/icons-material/Clear'
@@ -126,16 +126,12 @@ export default function ImagineDialog({
             }}
           />
           <Stack direction='row' spacing={1} justifyContent='center'>
-            <RectangularButton
-              title='Create'
-              onClick={onCreateClick}
-              disabled={prompt.length === 0}
-            />
-            <RectangularButton
-              title='Download'
-              onClick={() => downloadImaginePng(imagine)}
-              disabled={imagine === null}
-            />
+            <Button onClick={onCreateClick} variant='contained' disabled={prompt.length === 0}>
+              Create
+            </Button>
+            <Button onClick={() => downloadImaginePng(imagine)} variant='text' disabled={imagine === null}>
+              Download
+            </Button>
           </Stack>
         </Stack>
       </Stack>

src/pages/share/About.jsx

@@ -9,6 +9,19 @@ export default function About() {
   const prodPrefix = 'https://bldrs.ai/share/v/gh/bldrs-ai'
   return (
     <TitledLayout title='Bldrs Share: High-performance Web-based CAD sharing'>
+      <iframe
+        title='Bldrs Share: High-performance Web-based CAD sharing'
+        width='420'
+        height='315'
+        style={{
+          float: 'right',
+          border: 'none',
+          margin: '2em',
+        }}
+        src='https://www.youtube.com/embed/5_MDaM25IeE'
+        frameBorder='0'
+        allowFullScreen={true}
+      />
       <Typography variant='p'>
         Bldrs Share is a high-performance web application for CAD model sharing and
         collaboration, built on open-source standards for speed, accuracy, and flexibility.
@@ -23,17 +36,17 @@ export default function About() {
       </Typography>
       <Typography variant='p'>
         We bring your complex CAD models to life (supporting
-        <Link href={`${prodPrefix}/test-models/main/ifc/Schependomlaan.ifc#c:36.563,6.143,-16.59,5.457,5.29,0.326`}>IFC</Link>/
-        <Link href={`${prodPrefix}/test-models/main/step/zoo.dev/a-gear.step`}>STEP</Link>,
-        <Link href={`${prodPrefix}/test-models/main/stl/slotted_disk.stl#c:1.273,0.548,1.167,0.089,-0.072,-0.087`}>STL</Link>,
-        <Link href={`${prodPrefix}/headless-three/main/models/obj/tree.obj`}>OBJ</Link> and
+        &nbsp;<Link href={`${prodPrefix}/test-models/main/ifc/Schependomlaan.ifc#c:36.563,6.143,-16.59,5.457,5.29,0.326`}>IFC</Link>/
+        &nbsp;<Link href={`${prodPrefix}/test-models/main/step/zoo.dev/a-gear.step`}>STEP</Link>,
+        &nbsp;<Link href={`${prodPrefix}/test-models/main/stl/slotted_disk.stl#c:1.273,0.548,1.167,0.089,-0.072,-0.087`}>STL</Link>,
+        &nbsp;<Link href={`${prodPrefix}/headless-three/main/models/obj/tree.obj`}>OBJ</Link> and
         more) with the highest quality and best-in-class performance.
       </Typography>
       <Typography variant='p'>
         <strong>Fast is our favorite feature!</strong>
       </Typography>
       <Typography variant='p'>
-        <Link href="/share/about/conway">Explore the Conway Engine →</Link>
+        <Link href='/share/about/conway'>Explore the Conway Engine →</Link>
       </Typography>
       <Typography variant='h2'>
         <strong>Browser-First, Desktop-Free</strong>

yarn.lock

@@ -2661,13 +2661,6 @@
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@iconscout/react-unicons@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@iconscout/react-unicons/-/react-unicons-2.0.0.tgz#e5ca9cbf9315587ee3386b7df8d8f0c34a2bc161"
-  integrity sha512-C2zMwesxHTPtksmkQdqQCvDgbveWx9EveB1NdUD2XhuH4tupaEaNdMOG6Wltyx+6oJHW1XCTMxuA9fJKzNjNKw==
-  dependencies:
-    react ">=15.0.0 <17.0.0"
-
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -10348,15 +10341,6 @@ react@18.2.0:
   dependencies:
     loose-envify "^1.1.0"
 
-"react@>=15.0.0 <17.0.0":
-  version "16.14.0"
-  resolved "https://registry.npmjs.org/react/-/react-16.14.0.tgz"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
 readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"