Skip to content

Commit 394a0e6

Browse files
committed
experiences finish
1 parent f11796f commit 394a0e6

File tree

5 files changed

+75
-1
lines changed

5 files changed

+75
-1
lines changed

png/experiencebackground.psd

37.8 MB
Binary file not shown.

src/app.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { h, wait } from './utils/engine';
44
import { logo, intro, intro_text } from './view/intro';
55
import { about, about_name, about_title, down_indicator, about_detail} from './view/about';
66
import { skills } from './view/skill';
7+
import { portfolio } from './view/portfolio'
78
import { experiences } from './view/experience';
89
import { MoveOnScroll } from './hoc/moveOnScroll';
910

@@ -50,4 +51,5 @@ wait(2000)
5051
container.appendChild(about_detail(container))
5152
container.appendChild(skills(container))
5253
container.appendChild(experiences(container))
54+
container.appendChild(portfolio(container))
5355
})

src/app.sass

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ p {
226226
padding: 8em 0;
227227
color: #111;
228228
position: relative;
229+
padding-bottom: 0;
229230

230231
&_intro {
231232
max-width: 980px;
@@ -267,6 +268,47 @@ p {
267268
}
268269
}
269270
}
271+
272+
&_bg {
273+
position: relative;
274+
transition: all .5s;
275+
276+
* {
277+
transition: all .75s;
278+
}
279+
280+
.table {
281+
width: 100%;
282+
margin-top:2em;
283+
}
284+
285+
.lamp {
286+
position: absolute;
287+
left: 15%;
288+
top: -11em;
289+
width: 15em;
290+
}
291+
292+
.book {
293+
position: absolute;
294+
left: 42%;
295+
top: 0em;
296+
width: 15em;
297+
}
298+
299+
.tabledeco {
300+
position: absolute;
301+
right: 15%;
302+
top: 0em;
303+
width: 15em;
304+
}
305+
}
306+
}
307+
308+
.portfolio {
309+
min-height: 60em;
310+
311+
box-shadow: 0px 0px 5em rgba(17, 17, 17, .33);
270312
}
271313

272314
.icon-list {

src/view/experience.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const data = [
2929
},
3030
to: {
3131
year: '2017',
32-
month: 'apr'
32+
month: 'Apr'
3333
},
3434
title: 'Communication Technician',
3535
company: 'United States Marine Corps',
@@ -59,6 +59,18 @@ export const experiences = container => {
5959
)
6060
})
6161

62+
const bgImg = h('img', 'table')
63+
bgImg.src = 'assets/img/table.png'
64+
65+
const lamp = h('img', 'lamp')
66+
lamp.src = 'assets/img/lamp.png'
67+
68+
const book = h('img', 'book')
69+
book.src = 'assets/img/book.png'
70+
71+
const tabledeco = h('img', 'tabledeco')
72+
tabledeco.src = 'assets/img/tabledeco.png'
73+
6274
const el = h('div', 'experiences',
6375
moveOnScrollOpacity(header('Where I came from', 'Work Experiences', ''), {
6476
container
@@ -70,6 +82,12 @@ export const experiences = container => {
7082
),
7183
h('div', 'experiences_content text-left w-60p',
7284
timeline
85+
),
86+
h('div', 'experiences_bg',
87+
MoveOnScroll(bgImg,{container}),
88+
moveOnScrollOpacity(lamp,{container}),
89+
moveOnScrollOpacity(book,{container}),
90+
moveOnScrollOpacity(tabledeco, {container})
7391
)
7492
)
7593

src/view/portfolio.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { h } from '../utils/engine'
2+
import { header } from '../components/header/index.js'
3+
import { moveOnScrollOpacity } from '../hoc/moveOnScroll'
4+
5+
export const portfolio = container => {
6+
7+
return h('div', 'portfolio bg-dark',
8+
moveOnScrollOpacity(header('My latest crafts', 'Portfolio', ''), {
9+
container
10+
})
11+
);
12+
}

0 commit comments

Comments
 (0)