Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework About dialog, also includes info@ email #1261

Merged
merged 4 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bldrs",
"version": "1.0.1132",
"version": "1.0.1126",
"main": "src/index.jsx",
"license": "AGPL-3.0",
"homepage": "https://github.com/bldrs-ai/Share",
Expand Down
51 changes: 27 additions & 24 deletions src/Components/About/AboutDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import {Helmet} from 'react-helmet-async'
import Link from '@mui/material/Link'
import Stack from '@mui/material/Stack'
import Typography from '@mui/material/Typography'
import {TooltipIconButton} from '../Buttons'
import Dialog from '../Dialog'
import {LogoBWithDomain} from '../Logo/Logo'
// TODO(pablo): re-enable after prod freeze bug fixed
// import PrivacyControl from './PrivacyControl'
import GitHubIcon from '@mui/icons-material/GitHub'
import EmailIcon from '@mui/icons-material/Email'
import FolderIcon from '@mui/icons-material/FolderOpen'
import ShareIcon from '@mui/icons-material/Share'
import DiscordIcon from '../../assets/icons/Discord.svg'


Expand Down Expand Up @@ -59,33 +61,34 @@ function AboutContent() {
justifyContent='center'
alignItems='center'
>
<Stack spacing={0} direction='row'>
<TooltipIconButton
title='Discord'
onClick={() => window.open(`https://discord.gg/9SxguBkFfQ`, '_blank')}
icon={<DiscordIcon className='icon-share' style={{width: '50px'}}/>}
placement='bottom'
variant='noBackground'
/>
<TooltipIconButton
title='GitHub'
onClick={() => window.open(`https://github.com/bldrs-ai/Share`, '_blank')}
icon={<GitHubIcon className='icon-share'/>}
placement='bottom'
variant='noBackground'
/>
</Stack>
<Stack align='left'>
<Stack align='left' spacing={2}>
<Typography variant='body1'>
Welcome to Bldrs - Share!
</Typography>
<Typography variant='body1'>
Upload your IFC model, position the camera, select elements,
crop the model using section planes and add notes; then share
the exact view using the generated link. Everyone has access
to the same context in model space.
Use the Open <FolderIcon className='icon-share'/> dialog to open IFC or STEP models from:
<ul>
<li>Files hosted on GitHub</li>
<li>Local files - <em>no data is uploaded to our servers</em></li>
</ul>
<strong>Position</strong> the camera, <strong>Select</strong> elements, <strong>Crop</strong> using
section planes and add <strong>Notes</strong>; then <strong>Share</strong> the exact view using the
page URL or Share <ShareIcon className='icon-share' style={{height: '0.7em'}}/> dialog.
</Typography>
<Typography variant='body1'>
&nbsp;<br/>
And try the magic wand!
Comments and suggestions welcome!
</Typography>
<Stack direction='row' justifyContent='center' alignItems='center' spacing={2}>
<a href="https://discord.gg/9SxguBkFfQ">
<DiscordIcon className='icon-share' style={{height: '0.7em', marginRight: '0.5em'}}/>Discord
</a>
<a href="https://github.com/bldrs-ai/Share">
<GitHubIcon className='icon-share' style={{height: '0.7em', marginRight: '0.25em'}}/>GitHub
</a>
<a href="mailto:[email protected]">
<EmailIcon className='icon-share' style={{height: '0.7em', marginRight: '0.25em'}}/>[email protected]
</a>
</Stack>
</Stack>
</Stack>
</>)
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Share/ShareControl.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, {ReactElement, createRef, useEffect, useState} from 'react'
import {Helmet} from 'react-helmet-async'
import QRCode from 'react-qr-code'
import Box from '@mui/material/Box'
import ContentCopyIcon from '@mui/icons-material/ContentCopy'
import IconButton from '@mui/material/IconButton'
import InputAdornment from '@mui/material/InputAdornment'
import Stack from '@mui/material/Stack'
Expand All @@ -15,8 +14,9 @@ import {addPlanesToHashState, removePlanesFromHashState} from '../CutPlane/CutPl
import Dialog from '../Dialog'
import Toggle from '../Toggle'
import {HASH_PREFIX_SHARE} from './hashState'
import ContentCopyIcon from '@mui/icons-material/ContentCopy'
import ShareIcon from '@mui/icons-material/Share'
import CopyIcon from '../../assets/icons/Copy.svg'
import ShareIcon from '../../assets/icons/Share.svg'


/**
Expand Down
4 changes: 3 additions & 1 deletion src/assets/icons/Discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading