Skip to content

Commit 2bfb200

Browse files
committed
work experience
1 parent 08f05b0 commit 2bfb200

File tree

10 files changed

+102
-65
lines changed

10 files changed

+102
-65
lines changed

src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Isa from './components/Isa'
55
import About from './components/About'
66
import NavigationBar from './components/NavigationBar'
77
import Skills from './components/Skills';
8-
import Projects from './components/Projects';
8+
import Work from './components/Work';
99
// import Background from "./seattle2.jpg";
1010

1111

@@ -16,7 +16,7 @@ function App() {
1616
<Isa></Isa>
1717
<About></About>
1818
<Skills></Skills>
19-
<Projects></Projects>
19+
<Work></Work>
2020
</div>
2121
);
2222
}

src/components/About.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
background-repeat: no-repeat;
55
background-position: left;
66

7-
min-height: 70vh;
7+
min-height: 60vh;
88
display: flex;
99
flex-direction: column;
1010
/* align-items: center; */
@@ -30,17 +30,17 @@
3030
margin-right: 15%;
3131
margin-left: 35%;
3232
margin-bottom: 0%;
33-
margin-top: 5%;
33+
margin-top: 0%;
3434

3535
padding-right: 2.5%;
3636
padding-left: 2.5%;
3737
padding-top: 1%;
38-
padding-bottom: 5%;
38+
padding-bottom: 2.5%;
3939

4040
}
4141

4242
.about-text {
43-
text-align: left;
43+
text-align: justify;
4444
font-family: "SF Mono", "Fira Code", "Fira Mono", "Roboto Mono", "Lucida Console", Monaco, monospace;
4545
font-size: medium;
4646
font-weight: lighter;
@@ -51,7 +51,7 @@
5151
color:rgb(255, 66, 123);
5252
}
5353

54-
.header {
54+
.about-header {
5555
text-align: right;
5656
font-family: "SF Mono", "Fira Code", "Fira Mono", "Roboto Mono", "Lucida Console", Monaco, monospace;
5757
font-size: 1.5em;

src/components/About.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function About() {
1515
<ScrollableAnchor id="about">
1616
<header className="about">
1717
<div data-aos="fade-up" data-aos-duration="1000">
18-
<h1 className="about-container header">
18+
<h1 className="about-container about-header">
1919
1. about
2020
<p className="about-text">
2121
Hello! My name is Isa Dash and I'm from San Jose, CA.

src/components/Isa.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ function Isa() {
4747
<a className="navigation-text" href="#skills">
4848
2. skills
4949
</a>
50-
<a className="navigation-text" href="#projects">
51-
3. featured work
50+
<a className="navigation-text" href="#work">
51+
3. work experience
5252
</a>
5353
<a className="navigation-text" href="https://github.com/IsaDash" target="_blank">
54-
4. other
54+
4. projects
5555
</a>
5656
</div>
5757

src/components/Projects.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/components/Skills.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
background-repeat: no-repeat;
55
background-position: left;
66

7-
min-height: 80vh;
7+
min-height: 70vh;
88
display: flex;
99
flex-direction: column;
1010
/* align-items: center; */
@@ -17,7 +17,7 @@
1717
clear: right;
1818
display: grid;
1919
height: auto;
20-
20+
2121
border-left: 2.5px solid rgb(255, 66, 123);
2222
border-bottom: 2.5px solid rgb(255, 66, 123);
2323

src/components/Skills.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Skills() {
1414
return (
1515
<ScrollableAnchor id="skills">
1616
<header className="skills">
17-
<div data-aos="fade-up" data-aos-duration="1000">
17+
<div data-aos="fade-up" data-aos-duration="1000" data-aos-offset="200">
1818
<h1 className="skills-container header">
1919
2. skills
2020
<div>

src/components/Projects.css renamed to src/components/Work.css

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
.projects {
1+
.work {
22
background-color: rgb(18, 0, 53);
33
/* background-image: url(/seattle1.jpeg); */
44
background-repeat: no-repeat;
55
background-position: left;
66

7-
min-height: 80vh;
7+
min-height: 100vh;
88
display: flex;
99
flex-direction: column;
1010
/* align-items: center; */
11-
/* justify-content: center; */
11+
/* justify-content: stretch; */
1212

1313
}
1414

15-
.projects-container {
15+
.work-container {
16+
height: auto;
17+
1618
border-right: 2.5px solid rgb(255, 66, 123);
1719
border-top: 2.5px solid rgb(255, 66, 123);
1820

@@ -24,11 +26,19 @@
2426
padding-right: 2.5%;
2527
padding-left: 2.5%;
2628
padding-top: 1%;
27-
padding-bottom: 5%;
29+
padding-bottom: 2.5%;
2830

2931
}
32+
33+
.work-text {
34+
clear: both;
35+
display: grid;
36+
height: auto;
37+
38+
border: 1px solid rgb(255, 66, 123);
39+
margin: 5%;
40+
padding: 1%;
3041

31-
.projects-text {
3242
text-align: left;
3343
font-family: "SF Mono", "Fira Code", "Fira Mono", "Roboto Mono", "Lucida Console", Monaco, monospace;
3444
font-size: medium;
@@ -38,9 +48,20 @@
3848

3949
.highlight {
4050
color:rgb(255, 66, 123);
51+
text-decoration: none;
52+
}
53+
54+
.left-align {
55+
float: left;
56+
text-align: left;
57+
}
58+
59+
.right-align {
60+
float: right;
61+
text-align: right;
4162
}
4263

43-
.projects-header {
64+
.work-header {
4465
text-align: right;
4566
font-family: "SF Mono", "Fira Code", "Fira Mono", "Roboto Mono", "Lucida Console", Monaco, monospace;
4667
font-size: 1.5em;

src/components/Work.js

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import React from 'react';
2+
import './Work.css';
3+
import Image from './Image'
4+
import ScrollableAnchor from 'react-scrollable-anchor'
5+
import { configureAnchors } from 'react-scrollable-anchor'
6+
7+
import AOS from 'aos';
8+
import 'aos/dist/aos.css';
9+
AOS.init();
10+
11+
configureAnchors({ offset: -60, scrollDuration: 800 })
12+
13+
function Work() {
14+
return (
15+
<ScrollableAnchor id="work">
16+
<header className="work">
17+
<div data-aos="fade-up" data-aos-duration="1000">
18+
<h1 className="work-container work-header">
19+
3. work experience
20+
21+
<div className="work-text">
22+
<div>
23+
<div className="left-align">
24+
<a className="highlight" href="https://www.jpmorgan.com/country/US/en/jpmorgan" target="_blank">JP Morgan Chase: </a> Software Engineer Intern
25+
</div>
26+
27+
<span className="right-align">June 2020 - Current</span>
28+
</div>
29+
30+
</div>
31+
32+
<div className="work-text">
33+
<div>
34+
<div className="left-align">
35+
<a className="highlight" href="https://weavr.ai/" target="_blank">Weavr: </a> Software Engineer Intern
36+
</div>
37+
<span className="right-align">June 2019 - Aug 2019</span>
38+
</div>
39+
40+
41+
</div>
42+
43+
<div className="work-text">
44+
<div>
45+
<div className="left-align">
46+
<a className="highlight" href="https://scryanalytics.ai/" target="_blank">Scry Analytics: </a> Research Intern
47+
</div>
48+
<span className="right-align">June 2018 - Aug 2018</span>
49+
</div>
50+
51+
</div>
52+
</h1>
53+
54+
</div>
55+
</header>
56+
</ScrollableAnchor>
57+
);
58+
}
59+
60+
export default Work;

src/components/cat.jpg

-74.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)