prepare for rebase

bldrs-ai · Sep 12, 2023 · af1a913 · af1a913
1 parent a3025a7
commit af1a913
Show file tree

Hide file tree

Showing 29 changed files with 278 additions and 311 deletions.
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
@@ -34,9 +34,31 @@ jobs:
           if-no-files-found: error
           path: docs/
 
-  run-cypress:
+  run-cypress-on-linux:
     runs-on: ubuntu-20.04
     needs: install-cypress
+    steps:
+      - name: checkout
+        id: checkout
+        uses: actions/checkout@v3
+
+      - name: Restore build artifacts
+        id: restore-artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: build
+          path: docs/
+
+      - name: E2E Tests on Google Chrome
+        id: e2e-on-google-chrome
+        uses: cypress-io/github-action@v5
+        with:
+          browser: chrome
+          start: node config/serve.js
+
+  run-cypress-on-windows:
+    runs-on: windows-latest
+    needs: install-cypress
     steps:
       - name: Checkout
         id: checkout

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bldrs",
-  "version": "1.0.0-r689",
+  "version": "1.0.0-r687",
   "main": "src/index.jsx",
   "license": "MIT",
   "homepage": "https://github.com/bldrs-ai/Share",

diff --git a/src/Components/About/AboutControl.jsx b/src/Components/About/AboutControl.jsx
@@ -1,11 +1,12 @@
 import React, {useState} from 'react'
 import Box from '@mui/material/Box'
+import Stack from '@mui/material/Stack'
+import Link from '@mui/material/Link'
 import Typography from '@mui/material/Typography'
 import {getCookieBoolean, setCookieBoolean} from '../../privacy/Privacy'
 import useStore from '../../store/useStore'
 import Dialog from '../Dialog'
 import {ControlButton} from '../Buttons'
-import AboutDescription from './AboutDescription'
 import PrivacyControl from './PrivacyControl'
 import AboutIcon from '../../assets/icons/Information.svg'
 import LogoB from '../../assets/LogoB.svg'
@@ -62,13 +63,12 @@ export default function AboutControl() {
 export function AboutDialog({isDialogDisplayed, setIsDialogDisplayed}) {
   return (
     <Dialog
-      icon={
+      headerText={
         <Box sx={{display: 'inline-flex', flexDirection: 'column', textAlign: 'center'}}>
           <LogoB/>
-          <Typography variant='h6'>bldrs.ai</Typography>
+          <Typography variant={'overline'}>bldrs.ai</Typography>
         </Box>
       }
-      headerText={''}
       isDialogDisplayed={isDialogDisplayed}
       setIsDialogDisplayed={setIsDialogDisplayed}
       content={<AboutContent setIsDialogDisplayed={setIsDialogDisplayed}/>}
@@ -86,15 +86,39 @@ export function AboutDialog({isDialogDisplayed, setIsDialogDisplayed}) {
  */
 function AboutContent({setIsDialogDisplayed}) {
   return (
-    <Box sx={{'& a': {textDecoration: 'none'}}}>
+    <Box sx={{paddingBottom: '10px'}}>
       <Helmet>
         <title>About — BLDRS</title>
       </Helmet>
-      <Typography variant='h2' gutterBottom={true}>build every thing together</Typography>
-      <a href='https://github.com/bldrs-ai/Share' target='_new'>
-        github.com/bldrs-ai/Share
-      </a>
-      <AboutDescription setIsDialogDisplayed={setIsDialogDisplayed}/>
-      <PrivacyControl/>
+      <Stack
+        spacing={3}
+        direction="column"
+        justifyContent="center"
+        alignItems="center"
+      >
+        <Stack spacing={0}>
+          <Typography variant={'body1'}>build every thing together</Typography>
+          <Link
+            underline="always"
+            href='https://github.com/bldrs-ai/Share'
+          >
+            github.com/bldrs-ai/Share
+          </Link>
+        </Stack>
+        <Box sx={{padding: '0px 10px'}} elevation={0}>
+          <Typography variant={'body1'}>
+            <Box variant='span'>
+              Welcome to Share.
+            </Box>
+            Highlight specific elements within your 3D model,
+            position the camera angle,
+            share the exact view using generated link.
+            <Box variant='span' sx={{fontWeight: 'bold'}}>
+              With the Share link everyone has access to the same context in digital space.
+            </Box>
+          </Typography>
+        </Box>
+        <PrivacyControl/>
+      </Stack>
     </Box>)
 }
diff --git a/src/Components/About/AboutDescription.jsx b/src/Components/About/AboutDescription.jsx
@@ -12,13 +12,6 @@ import useTheme from '@mui/styles/useTheme'
 export default function AboutDescription({setIsDialogDisplayed}) {
   const theme = useTheme()
 
-
-  /**
-   * Close About dialog when a link is clicked
-   */
-  function onClickLink() {
-    setIsDialogDisplayed(false)
-  }
   return (
     <Box
       sx={{
@@ -35,42 +28,12 @@ export default function AboutDescription({setIsDialogDisplayed}) {
         textAlign: 'left',
       }}
     >
-      <Box
-        sx={{
-          padding: '10px 10px',
-        }}
-      >
-        <Typography variant={'h5'}>
-            Cross-functional online collaboration unlocks team flow,
-            productivity and creativity.
-            Open workspaces, open standards and open source code is the most powerful way to work.
-            Cooperation is the unfair advantage.
-        </Typography>
-        <Box
-          sx={{
-            marginRight: '-6px',
-            display: 'flex',
-            flexDirection: 'row',
-            justifyContent: 'flex-end',
-            position: 'relative',
-            top: '1.4em',
-          }}
-        >
-          <a
-            href='https://bldrs.ai/share/v/p/index.ifc#c:-113.444,0.464,81.43,-23.595,24.522,10.88::i:1493510953'
-            onClick={onClickLink}
-          >
-            <Typography sx={{textDecoration: 'underline', marginLeft: '10px'}}>Guide</Typography>
-          </a>
-          <a
-            // eslint-disable-next-line max-len
-            href='https://bldrs.ai/share/v/gh/OlegMoshkovich/Logo/main/IFC_STUDY.ifc#c:40.821,-10.247,39.647,5.918,-13.326,-13.866::i:1605443723'
-            onClick={onClickLink}
-          >
-            <Typography sx={{textDecoration: 'underline', marginLeft: '10px'}}>Team</Typography>
-          </a>
-        </Box>
-      </Box>
+      <Typography variant={'body2'}>
+          Cross-functional online collaboration unlocks team flow,
+          productivity and creativity.
+          Open workspaces, open standards and open source code is the most powerful way to work.
+          Cooperation is the unfair advantage.
+      </Typography>
     </Box>
   )
 }

diff --git a/src/Components/About/AboutGuide.jsx b/src/Components/About/AboutGuide.jsx
@@ -25,7 +25,6 @@ export default function AboutGuide() {
         borderRadius: '10px',
         margin: '2em 0',
         padding: '.3em 1em .5em .5em',
-        color: theme.palette.primary.contrastText,
         backgroundColor: theme.palette.scene.background,
       }}
     >
@@ -38,7 +37,6 @@ export default function AboutGuide() {
             height: '13px',
             verticalAlign: 'middle',
             lineHeight: '15px',
-            fill: theme.palette.primary.contrastText,
           },
           '& div': {
             textAlign: 'right',

diff --git a/src/Components/About/PrivacyControl.jsx b/src/Components/About/PrivacyControl.jsx
@@ -1,6 +1,7 @@
 import React, {useEffect, useState} from 'react'
-import Box from '@mui/material/Box'
+import Stack from '@mui/material/Stack'
 import Typography from '@mui/material/Typography'
+import Link from '@mui/material/Link'
 import * as Privacy from '../../privacy/Privacy'
 import Toggle from '../Toggle'
 
@@ -29,25 +30,25 @@ export default function PrivacyControl() {
 
 
   return (
-    <Box
-      sx={{
-        width: '100%',
-        margin: '1em 0',
-        textAlign: 'justify',
-        display: 'flex',
-        flexDirection: 'row',
-        justifyContent: 'space-between',
-        alignItems: 'center',
-      }}
+    <Stack
+      spacing={2}
+      direction="row"
+      justifyContent="space-around"
+      alignItems="center"
     >
-      <Typography>
-        Analytics cookies<br/>
-        <a href='https://github.com/bldrs-ai/Share/wiki/Design#privacy' target='_new'>
+      <Stack
+        spacing={0}
+        direction="column"
+        justifyContent="flex-start"
+        alignItems="flex-start"
+      >
+        <Typography>Analytics cookies</Typography>
+        <Link href='https://github.com/bldrs-ai/Share/wiki/Design#privacy' >
           read more
-        </a>
-      </Typography>
+        </Link>
+      </Stack>
       <Toggle checked={acceptCookies} onChange={changePrivacy}/>
-    </Box>
+    </Stack>
   )
 }
 

diff --git a/src/Components/AppStore/AppStoreListing.jsx b/src/Components/AppStore/AppStoreListing.jsx
@@ -56,7 +56,7 @@ export function AppStoreEntry({
             }}
           />
           <CardContent>
-            <Typography variant="h5" component="div">
+            <Typography variant="body1" component="div">
               {item.name}
             </Typography>
             <Typography variant="body2" color="text.secondary">

diff --git a/src/Components/ApplicationError.jsx b/src/Components/ApplicationError.jsx
@@ -12,11 +12,11 @@ const ApplicationError = () => {
       bgcolor: grey[100],
     }}
     >
-      <Typography variant={'h1'} sx={{color: 'primary.light', fontWeight: 600, pb: 2}}>
+      <Typography variant={'body1'} sx={{color: 'primary.light', fontWeight: 600, pb: 2}}>
         Oh no!
       </Typography>
 
-      <Typography variant={'h2'} sx={{color: 'success.dark', fontWeight: 1000, pb: 2}}>
+      <Typography variant={'body1'} sx={{color: 'success.dark', fontWeight: 1000, pb: 2}}>
         We&apos;re not quite sure what went wrong.
       </Typography>
 

diff --git a/src/Components/BranchesControl.jsx b/src/Components/BranchesControl.jsx
@@ -81,7 +81,7 @@ export default function Branches() {
         >
           <TextField
             sx={{
-              'width': '300px',
+              'width': '274px',
               '& .MuiOutlinedInput-input': {
                 color: theme.palette.primary.contrastText,
               },

diff --git a/src/Components/Dialog.jsx b/src/Components/Dialog.jsx
@@ -1,9 +1,9 @@
 import React from 'react'
+import Button from '@mui/material/Button'
 import DialogActions from '@mui/material/DialogActions'
 import DialogContent from '@mui/material/DialogContent'
 import DialogTitle from '@mui/material/DialogTitle'
 import MuiDialog from '@mui/material/Dialog'
-import {RectangularButton, CloseButton} from '../Components/Buttons'
 import {assertDefined} from '../utils/assert'
 
 
@@ -31,23 +31,22 @@ export default function Dialog({
   actionIcon,
 }) {
   assertDefined(
-      icon, headerText, isDialogDisplayed, setIsDialogDisplayed, content,
+      headerText, isDialogDisplayed, setIsDialogDisplayed, content,
       actionTitle, actionCb)
   const close = () => setIsDialogDisplayed(false)
   return (
     <MuiDialog
       open={isDialogDisplayed}
       onClose={close}
-      PaperProps={{variant: 'control'}}
     >
-      <CloseButton onClick={close}/>
       <DialogTitle>
-        {icon}<br/>
         {headerText}
       </DialogTitle>
       <DialogContent>{content}</DialogContent>
       <DialogActions>
-        <RectangularButton title={actionTitle} icon={actionIcon} onClick={actionCb}/>
+        <Button variant="contained" onClick={actionCb} >
+          {actionTitle}
+        </Button>
       </DialogActions>
     </MuiDialog>
   )

diff --git a/src/Components/ExpansionPanel.jsx b/src/Components/ExpansionPanel.jsx
@@ -62,7 +62,7 @@ export default function ExpansionPanel({summary, detail, expandState}) {
           '@media (max-width: 900px)': {
             maxWidth: '320px',
           },
-        }} variant='h3'
+        }}
         >
           {summary}
         </Typography>

diff --git a/src/Components/GuideControl.jsx b/src/Components/GuideControl.jsx
@@ -91,7 +91,7 @@ function GuidePanel({openToggle, offsetTop}) {
         }}
         ><Close onClick={openToggle}/>
         </Box>
-        <Typography variant='h1'>Guide</Typography>
+        <Typography variant='body1'>Guide</Typography>
         <p>To select an element:</p>
         <ul>
           <li>Double tap an element</li>

diff --git a/src/Components/ItemProperties/ItemProperties.jsx b/src/Components/ItemProperties/ItemProperties.jsx
@@ -60,7 +60,7 @@ export default function ItemProperties() {
           marginTop: '10px',
         }}
         >
-          <Typography variant='h2' sx={{
+          <Typography variant='body1' sx={{
             position: 'sticky',
             top: '0px',
             display: 'flex',

diff --git a/src/Components/ItemProperties/ItemPropertiesDrawer.jsx b/src/Components/ItemProperties/ItemPropertiesDrawer.jsx
@@ -55,7 +55,7 @@ export default function ItemPropertiesDrawer({
         },
       })}
       >
-        <Typography variant='h1'>{title}</Typography>
+        <Typography variant='body1'>{title}</Typography>
         <TooltipIconButton
           title='Close properties'
           onClick={onClose}

diff --git a/src/Components/NoContent.jsx b/src/Components/NoContent.jsx
@@ -14,7 +14,7 @@ export default function NoContent({message = 'no content'}) {
   return (
     <Paper variant='control' sx={{textAlign: 'center'}}>
       <AttentionIcon className='icon-share'/>
-      <Typography variant={'h4'} sx={{marginTop: '1em'}}>{message}</Typography>
+      <Typography sx={{marginTop: '1em'}}>{message}</Typography>
     </Paper>
   )
 }