Skip to content

Commit 0122206

Browse files
committed
Fix tech labels on projects duplicate bug, add Kanye Quest
1 parent 629f61e commit 0122206

File tree

7 files changed

+30
-11
lines changed

7 files changed

+30
-11
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ yarn-error.log
99
.DS_Store
1010

1111
# Design mockups of new website, old ideas
12-
/unneeded
12+
/mocks
1313

1414
# Prevent iCloud Drive from syncing folder
1515
.nosync
16-

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ before_install:
1414

1515
script:
1616
- npm run test
17-
- npm run prettier
17+
- npm run prettier:check
1818

1919
after_success:
2020
- chmod +x ./scripts/publish_on_netlify.sh

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"test:nocov": "jest",
1919
"test:nocoveralls": "jest --coverage",
2020
"test:watch": "jest --watch",
21-
"prettier": "prettier --single-quote --list-different \"src/**/*.jsx\" \"test/*.test.js\" \"test/*.test.jsx\""
21+
"prettier": "npx prettier --single-quote es5 --write './src/**/*.jsx' './test/*.test.js' './test/*.test.jsx'",
22+
"prettier:check": "prettier --single-quote --list-different 'src/**/*.jsx' 'test/*.test.js' 'test/*.test.jsx'"
2223
},
2324
"dependencies": {
2425
"babel-plugin-styled-components": "^1.5.1",

src/components/ProjectShowcase.jsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,13 @@ class ProjectShowcase extends React.Component {
201201
focused={this.state.focused}
202202
color={tech.color}
203203
data-tip={tech.name}
204-
data-for={`techStackTip${i}`}
204+
data-for={`techStackTip${this.props.id}${i}`}
205205
>
206206
<span className={tech.icon} style={{ fontSize: '1.5em' }} />
207-
<ReactTooltip id={`techStackTip${i}`} effect="solid" />
207+
<ReactTooltip
208+
id={`techStackTip${this.props.id}${i}`}
209+
effect="solid"
210+
/>
208211
</ProjectStackItem>
209212
);
210213
})}
@@ -215,7 +218,7 @@ class ProjectShowcase extends React.Component {
215218
<ProjectLink
216219
key={i}
217220
data-tip={link.name}
218-
data-for={`actionLinkTip${i}`}
221+
data-for={`actionLinkTip${this.props.id}${i}`}
219222
>
220223
<a href={link.url} target="_blank">
221224
<SVGDrawIcon
@@ -225,7 +228,10 @@ class ProjectShowcase extends React.Component {
225228
<Icon name={link.icon} size="1.5em" color="#595959" />
226229
</SVGDrawIcon>
227230
</a>
228-
<ReactTooltip id={`actionLinkTip${i}`} effect="solid" />
231+
<ReactTooltip
232+
id={`actionLinkTip${this.props.id}${i}`}
233+
effect="solid"
234+
/>
229235
</ProjectLink>
230236
);
231237
})}

src/data/projectData.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const projectsList = [
1313
{name: 'CSS Grid', icon: 'devicons devicons-css3', color: '#4173D5' },
1414
],
1515
actionLinks: [
16-
{name: "Web Demo", icon: "monitor", url: "https://alexieyizhe.me"},
16+
{name: "View on Web", icon: "monitor", url: "https://alexieyizhe.me"},
1717
{name: "View on Github", icon: "github", url: "https://github.com/alexieyizhe/alexieyizhe.github.io"},
1818
]
1919
},
@@ -67,8 +67,21 @@ export const projectsList = [
6767
{name: 'Heroku', icon: 'devicons devicons-heroku', color: '#9943A7' },
6868
],
6969
actionLinks: [
70-
{name: "FB Messenger Demo", icon: "messageSquare", url: "https://m.me/553923414986147"},
70+
{name: "View on Facebook Messenger", icon: "messageSquare", url: "https://m.me/553923414986147"},
7171
{name: "View on Github", icon: "github", url: "https://github.com/alexieyizhe/wat-bus"},
7272
]
7373
},
74+
{
75+
name: 'Kanye Quest',
76+
desc: 'Kanye West goes on a Kanye Quest to be the Kanye Best and clean up this Kanye Mess.',
77+
color: '#E4BB0D',
78+
imgSource: '/img/projects/kanyequest.png',
79+
techStack: [
80+
{name: 'Java', icon: 'devicons devicons-java', color: '#E09C03' },
81+
{name: 'Graphics2d Library', icon: 'devicons devicons-codepen', color: '#323232' },
82+
],
83+
actionLinks: [
84+
{name: "View on Github", icon: "github", url: "https://github.com/alexieyizhe/HS_PROJECTS/tree/master/kanye-quest"},
85+
]
86+
}
7487
]

src/pages/projects.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ProjectsPage extends React.Component {
3939
style={this.props.transition && this.props.transition.style}
4040
>
4141
{projectsList.map((project, i) => (
42-
<ProjectShowcase key={i} project={project} />
42+
<ProjectShowcase key={i} id={i} project={project} />
4343
))}
4444
</ProjectGrid>
4545
</TemplateWrapper>

static/img/projects/kanyequest.png

762 KB
Loading

0 commit comments

Comments
 (0)