Skip to content

Commit 67a68fe

Browse files
authored
Merge pull request #3 from ikaul/dev
Added projects information to projects tab.
2 parents 744c3c3 + 505dda9 commit 67a68fe

File tree

6 files changed

+311
-34
lines changed

6 files changed

+311
-34
lines changed

src/CustomComponents/technology.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import {
66
import {withStyles} from "@material-ui/core/es/styles";
77
import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
88
import withRoot from "../withRoot";
9-
import {blue, grey, red} from "@material-ui/core/colors";
9+
import {blue, grey, red, blueGrey} from "@material-ui/core/colors";
10+
import postgres from '../assets/images/psql.svg';
11+
import rails from '../assets/images/rails.png';
1012

1113
const styles = theme => ({
1214
chip: {
@@ -22,12 +24,19 @@ const styles = theme => ({
2224
},
2325
pythonAvatar: {
2426
color: blue[500],
25-
backgroundColor: grey[200]
27+
backgroundColor: blueGrey[200]
2628
},
2729
railsAvatar: {
2830
color: grey[50],
2931
backgroundColor: red[900]
3032
},
33+
postgresAvatar: {
34+
backgroundColor: blueGrey[50]
35+
},
36+
defaultAvatar: {
37+
color: blueGrey[50],
38+
backgroundColor: blueGrey[900]
39+
}
3140
});
3241

3342
class Technology extends Component {
@@ -45,16 +54,20 @@ class Technology extends Component {
4554
return (<Avatar className={classes.angularAvatar}>
4655
<FontAwesomeIcon icon={['fab', 'angular']}/>
4756
</Avatar>);
57+
case 'postgresql':
58+
return (<Avatar className={classes.postgresAvatar} src={postgres} />);
59+
case 'ruby on rails':
60+
return (<Avatar className={classes.railsAvatar} src={rails} />);
4861
default:
49-
return (<Avatar className={""}>{technologyName.toUpperCase()[0]}</Avatar>);
62+
return (<Avatar className={classes.defaultAvatar}>{technologyName.toUpperCase()[0]}</Avatar>);
5063
}
5164
};
5265

5366
render() {
5467
const {classes} = this.props;
5568
return (
56-
<Chip className={classes.chip} label={this.props.label} variant="outlined"
57-
avatar={this.technologyIcon(this.props.label, classes) }/>
69+
<Chip className={classes.chip} label={this.props.label} variant="outlined"
70+
avatar={this.technologyIcon(this.props.label, classes)}/>
5871
)
5972
}
6073
}

src/Tabs/experience.js

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,36 @@ class Experience extends Component {
158158
</Typography>
159159
<List disablePadding>
160160
<ListItem>
161-
<ListItemText primary=" Pulse Analytics Portal"
162-
secondary="Web Portal to import & analyze telemetry data along with NetSuite Customer data
161+
<Grid container spacing={24}>
162+
<Grid item xs={12} lg={4}>
163+
<ListItemText primary=" Pulse Analytics Portal"
164+
secondary="Web Portal to import & analyze telemetry data along with NetSuite Customer data
163165
to see how the customer uses our equipment and how our products are doing in the market."/>
164-
<ListItemText primary="Bill of Materials Generator"
165-
secondary="Tool to help sales team generate bill of materials for customer orders with ease
166+
</Grid>
167+
<Grid item xs={12} lg={4}>
168+
<ListItemText primary="Bill of Materials Generator"
169+
secondary="Tool to help sales team generate bill of materials for customer orders with ease
166170
and import them into SalesForce to convert to opportunity."/>
167-
<ListItemText primary="Secure Access as a Service"
168-
secondary="POC for orchestration of Pulse VPN over AWS as a service. "/>
169-
<ListItemText primary="Hackathon Portal"
170-
secondary="Web Portal to host internal hackathon events. Participants can create projects
171+
</Grid>
172+
<Grid item xs={12} lg={4}>
173+
<ListItemText primary="Secure Access as a Service"
174+
secondary="POC for orchestration of Pulse VPN over AWS as a service. "/>
175+
</Grid>
176+
<Grid item xs={12} lg={4}>
177+
<ListItemText primary="Hackathon Portal"
178+
secondary="Web Portal to host internal hackathon events. Participants can create projects
171179
and follow other projects and judges can review & rate projects. "/>
172-
<ListItemText primary="Welcome Sign-in Portal"
173-
secondary="Web Portal where guests can sign-in and emails are sent to the host to receive their guests.
180+
</Grid>
181+
<Grid item xs={12} lg={4}>
182+
<ListItemText primary="Welcome Sign-in Portal"
183+
secondary="Web Portal where guests can sign-in and emails are sent to the host to receive their guests.
174184
Also, prints a name tag for the guests with guest & host details."/>
175-
<ListItemText primary="Suite Capacity Estimator"
176-
secondary="Used by Sales Engineers to estimate the equipment the customer needs."/>
185+
</Grid>
186+
<Grid item xs={12} lg={4}>
187+
<ListItemText primary="Suite Capacity Estimator"
188+
secondary="Used by Sales Engineers to estimate the equipment the customer needs."/>
189+
</Grid>
190+
</Grid>
177191
</ListItem>
178192
</List>
179193
</CardContent>
@@ -221,14 +235,20 @@ class Experience extends Component {
221235
gutterBottom>Relevant Experience</Typography>
222236
<List disablePadding>
223237
<ListItem>
224-
<ListItemText primary="Pulse Automation Team"
225-
secondary="Developing framework to enable automation of test suites in Perl, AutoIT, vSphere, Jenkins.
238+
<Grid container spacing={24}>
239+
<Grid item xs={12} lg={6}>
240+
<ListItemText primary="Pulse Automation Team"
241+
secondary="Developing framework to enable automation of test suites in Perl, AutoIT, vSphere, Jenkins.
226242
Writing perl scripts to automate various test suites in Pulse."/>
227243

228-
<ListItemText primary="Web Development / Internal Tools"
229-
secondary="Developed a new portal for collect, analyze and display job results and various statistics
244+
</Grid>
245+
<Grid item xs={12} lg={6}>
246+
<ListItemText primary="Web Development / Internal Tools"
247+
secondary="Developed a new portal for collect, analyze and display job results and various statistics
230248
for daily and historical data using Ruby on Rails, Highcharts.
231249
Enhancements to PBU Dashboard Components."/>
250+
</Grid>
251+
</Grid>
232252
</ListItem>
233253
</List>
234254
</CardContent>

0 commit comments

Comments
 (0)