Skip to content

Commit

Permalink
Links added to about us, bugs and feedback moved (fossasia#527)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pipe-Runner @mariobehling
Pipe-Runner authored and mariobehling committed Aug 30, 2019
1 parent 40ffb87 commit 739e0d7
Show file tree
Hide file tree
Showing 5 changed files with 141 additions and 34 deletions.
6 changes: 6 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ Please join us on the following channels:
Save data and config in CSV and retrieve them back later.
</td>
</tr>
<tr>
<td>
<img src="./docs/images/drawer.jpg" width="460px"/>
The app drawer gives you access to many more options like the FAQ, Device Information Screen etc.
</td>
</tr>
</table>

## Project Videos
Expand Down
Binary file added docs/images/drawer.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 62 additions & 29 deletions src/components/Appshell/Appshell.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { withStyles, withTheme } from '@material-ui/core/styles';
import {
Settings as SettingIcon,
Refresh as ResetIcon,
BugReport as BugIcon,
Feedback as FeedbackIcon,
Error as AboutUsIcon,
WifiTethering as LoggedDataIcon,
Expand All @@ -30,6 +29,7 @@ import {
MoreVert as LayoutIcon,
RadioButtonChecked as StartRecordIcon,
Stop as StopRecordIcon,
ShoppingCart as CartIcon,
} from '@material-ui/icons';
import { extractFileName } from '../../utils/fileNameProcessor';
import { Save as SaveIcon } from '@material-ui/icons';
Expand Down Expand Up @@ -287,10 +287,33 @@ const Appshell = ({
<AppshellContainer>
<Drawer open={drawerOpen} onClose={() => toggleDrawer(!drawerOpen)}>
<div className={classes.list} role="presentation">
<img
src={AppIcon}
style={{ height: '8em', width: 'auto', margin: '32px' }}
/>
<div
style={{
borderRadius: '50%',
border: '3px solid #000',
width: '8.2em',
height: '8.2em',
margin: '16px 0px 8px 32px',
}}
>
<img
src={AppIcon}
style={{
height: '6.5em',
width: 'auto',
margin: '8px 8px 8px 10px',
}}
/>
</div>
<div
style={{
color: '#000',
fontSize: '18px',
margin: '16px 0px 16px 32px',
}}
>
{device.isConnected ? 'Connected' : 'Not Connected'}
</div>
</div>
<div
className={classes.list}
Expand All @@ -307,12 +330,6 @@ const Appshell = ({
<ListItemText primary={'Instruments'} />
</ListItem>
</Link>
<ListItem button>
<ListItemIcon>
<DeviceIcon />
</ListItemIcon>
<ListItemText primary={'Device'} />
</ListItem>
<Link to="/loggeddata">
<ListItem button>
<ListItemIcon>
Expand All @@ -321,14 +338,44 @@ const Appshell = ({
<ListItemText primary={'Logged Data'} />
</ListItem>
</Link>
<Divider />
<ListItem button>
<ListItemIcon>
<DeviceIcon />
</ListItemIcon>
<ListItemText primary={'Connected Device'} />
</ListItem>
<ListItem button>
<ListItemIcon>
<SettingIcon />
</ListItemIcon>
<ListItemText primary={'Settings'} />
</ListItem>
</List>
<ListItem button>
<Divider />
<Link to="/aboutus">
<ListItem button>
<ListItemIcon>
<AboutUsIcon />
</ListItemIcon>
<ListItemText primary={'About Us'} />
</ListItem>
</Link>
<ListItem
button
onClick={() => {
window.open(
'https://pslab.io/',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<SettingIcon />
<CartIcon />
</ListItemIcon>
<ListItemText primary={'Settings'} />
<ListItemText primary={'Buy PSLab'} />
</ListItem>
<Divider />
<List>
<Link to="/faq">
<ListItem button>
Expand All @@ -338,20 +385,6 @@ const Appshell = ({
<ListItemText primary={'FAQs'} />
</ListItem>
</Link>
<Link to="/aboutus">
<ListItem button>
<ListItemIcon>
<AboutUsIcon />
</ListItemIcon>
<ListItemText primary={'About Us'} />
</ListItem>
</Link>
<ListItem button>
<ListItemIcon>
<BugIcon />
</ListItemIcon>
<ListItemText primary={'Feedback & Bugs'} />
</ListItem>
</List>
</div>
</Drawer>
Expand Down
Binary file added src/resources/63991231-80a33c80-cb04-11e9-8949-ebc59b573bfe.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 73 additions & 5 deletions src/screen/AboutUs/AboutUs.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import { Container, Wrapper } from './AboutUs.styles';
import AppIcon from '../../resources/app_icon.png';
import { BugReport as BugIcon } from '@material-ui/icons';
import {
Typography,
Divider,
Expand Down Expand Up @@ -57,6 +58,13 @@ const AboutUs = () => {
style={{
margin: '8px 0px 0px 0px',
}}
onClick={() => {
window.open(
'mailto:[email protected]',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<MailIcon style={{ height: '1.6em', width: '1.6em' }} />
Expand All @@ -68,7 +76,16 @@ const AboutUs = () => {
width: '100%',
}}
/>
<ListItem button>
<ListItem
button
onClick={() => {
window.open(
'https://pslab.io/',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<LinkIcon style={{ height: '1.6em', width: '1.6em' }} />
</ListItemIcon>
Expand All @@ -79,7 +96,16 @@ const AboutUs = () => {
width: '100%',
}}
/>
<ListItem button>
<ListItem
button
onClick={() => {
window.open(
'https://github.com/fossasia/pslab-desktop',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<img src={GithubIcon} style={{ height: '3em', width: '3em' }} />
</ListItemIcon>
Expand All @@ -90,7 +116,16 @@ const AboutUs = () => {
width: '100%',
}}
/>
<ListItem button>
<ListItem
button
onClick={() => {
window.open(
'https://www.facebook.com/pslabio',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<img src={FacebookIcon} style={{ height: '3em', width: '3em' }} />
</ListItemIcon>
Expand All @@ -101,7 +136,16 @@ const AboutUs = () => {
width: '100%',
}}
/>
<ListItem button>
<ListItem
button
onClick={() => {
window.open(
'https://twitter.com/pslabio',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<img src={TwitterIcon} style={{ height: '3em', width: '3em' }} />
</ListItemIcon>
Expand All @@ -112,12 +156,36 @@ const AboutUs = () => {
width: '100%',
}}
/>
<ListItem button>
<ListItem
button
onClick={() => {
window.open(
'https://www.youtube.com/channel/UCQprMsG-raCIMlBudm20iLQ',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<img src={YoutubeIcon} style={{ height: '3em', width: '3em' }} />
</ListItemIcon>
<ListItemText primary="Watch us on Youtube" />
</ListItem>
<ListItem
button
onClick={() => {
window.open(
'https://docs.google.com/forms/d/e/1FAIpQLSfn2MAk_4TzJ07iu93KNU8g2Ac3UHm2aKww1qJVsduSbsI4Wg/viewform ',
'_blank',
'height=650,width=1000,frame=true,show=true',
);
}}
>
<ListItemIcon>
<BugIcon style={{ fontSize: '36px' }} />
</ListItemIcon>
<ListItemText primary="Feedback & Bugs" />
</ListItem>
</Wrapper>
</Container>
);
Expand Down

0 comments on commit 739e0d7

Please sign in to comment.