Skip to content

Commit

Permalink
Clean code + update translate
Browse files Browse the repository at this point in the history
  • Loading branch information
thuyvy3110 committed Dec 14, 2019
1 parent ef59b15 commit 9139656
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion public/translations/vn.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"CertResearch": "Cử nhân khoa học",
"CertResearch": "Cử nhân Khoa Học Máy Tính",
"CertContentResearch": "Tốt nghiệp chương trình nâng cao ngành Khoa Học Máy Tính, Đại học Khoa Học Tự Nhiên HCM.",
"CertDevelop": "Chứng chỉ giao tiếp: TOEFL ibt 85 pts",
"CertContentDevelop": "TOEFL iBT® để đo khả năng thành thạo tiếng anh theo trình độ đại học. Đồng thời đánh giá sự phối hợp nhuần nhuyễn khi bạn sử dụng 4 kỹ năng nghe, nói, đọc, viết để hoàn thành chương trình học thuật.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ exports[`Experiences should render without throwing an error 1`] = `
"$$typeof": Symbol(react.forward_ref),
"attrs": Array [],
"componentStyle": ComponentStyle {
"componentId": "Container__Style-sc-1cprnoj-0",
"componentId": "Container__Style-ls6jfm-0",
"isStatic": false,
"lastClassName": "gmMYEx",
"lastClassName": "kPautF",
"rules": Array [
"padding-top:100px;@media screen and (max-width:800px){padding-top:50px;}",
],
},
"displayName": "Container__Style",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "Container__Style-sc-1cprnoj-0",
"styledComponentId": "Container__Style-ls6jfm-0",
"target": "section",
"toString": [Function],
"warnTooManyClasses": [Function],
Expand All @@ -32,7 +32,7 @@ exports[`Experiences should render without throwing an error 1`] = `
forwardedRef={null}
>
<section
className="Container__Style-sc-1cprnoj-0 gmMYEx"
className="Container__Style-ls6jfm-0 kPautF"
>
<div
className="container"
Expand All @@ -45,17 +45,17 @@ exports[`Experiences should render without throwing an error 1`] = `
"$$typeof": Symbol(react.forward_ref),
"attrs": Array [],
"componentStyle": ComponentStyle {
"componentId": "Header__Container-r82p1p-0",
"componentId": "Header__Container-co5usi-0",
"isStatic": false,
"lastClassName": "hEROPS",
"lastClassName": "eCHESu",
"rules": Array [
"padding-bottom:50px;text-align:center;@media screen and (max-width:800px){padding-bottom:30px;}",
],
},
"displayName": "Header__Container",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "Header__Container-r82p1p-0",
"styledComponentId": "Header__Container-co5usi-0",
"target": "header",
"toString": [Function],
"warnTooManyClasses": [Function],
Expand All @@ -65,7 +65,7 @@ exports[`Experiences should render without throwing an error 1`] = `
forwardedRef={null}
>
<header
className="Header__Container-r82p1p-0 hEROPS"
className="Header__Container-co5usi-0 eCHESu"
>
<h2>
<Translate
Expand Down
12 changes: 6 additions & 6 deletions views/components/certification/Cert_1.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ import { Translate } from 'react-localize-redux'
const Cert_1 = ({ itemSelected, setSelectedItem, title, content }) => {
return (
<Fragment>
<Cert_1Item onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[0])}>
<CertItem onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[0])}>
<CertIcon
id={CERT_ACTIVE_ITEM[0]}
itemSelected={itemSelected}
name="c"
/>
</Cert_1Item>
</CertItem>

<Cert_1Info itemSelected={itemSelected}>
<CertInfo itemSelected={itemSelected}>
<Title>
<span>{CERT_ACTIVE_ITEM[0]}</span> &mdash; <Translate id={title} />
</Title>
<p>
<Translate id={content} />
</p>
</Cert_1Info>
</CertInfo>
</Fragment>
)
}
Expand All @@ -40,13 +40,13 @@ Cert_1.propTypes = {
content: PropTypes.string
}

const Cert_1Item = styled(Item)`
const CertItem = styled(Item)`
left: 0%;
margin-left: 0%;
z-index: 40;
`

const Cert_1Info = styled(Info)`
const CertInfo = styled(Info)`
visibility: ${props =>
props.itemSelected == CERT_ACTIVE_ITEM[0] ? 'visible' : 'hidden'};
Expand Down
12 changes: 6 additions & 6 deletions views/components/certification/Cert_2.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ import { Translate } from 'react-localize-redux'
const Cert_2 = ({ itemSelected, setSelectedItem, title, content }) => {
return (
<Fragment>
<Cert_2Item onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[1])}>
<CertItem onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[1])}>
<CertIcon
id={CERT_ACTIVE_ITEM[1]}
itemSelected={itemSelected}
name="c"
/>
</Cert_2Item>
</CertItem>

<Cert_2Info itemSelected={itemSelected}>
<CertInfo itemSelected={itemSelected}>
<Title>
<span>{CERT_ACTIVE_ITEM[1]}</span> &mdash; <Translate id={title} />
</Title>
<p>
<Translate id={content} />
</p>
</Cert_2Info>
</CertInfo>
</Fragment>
)
}
Expand All @@ -40,12 +40,12 @@ Cert_2.propTypes = {
content: PropTypes.string
}

const Cert_2Item = styled(Item)`
const CertItem = styled(Item)`
left: 37.5%;
z-index: 30;
`

const Cert_2Info = styled(Info)`
const CertInfo = styled(Info)`
visibility: ${props =>
props.itemSelected == CERT_ACTIVE_ITEM[1] ? 'visible' : 'hidden'};
Expand Down
12 changes: 6 additions & 6 deletions views/components/certification/Prize_1.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ import { Translate } from 'react-localize-redux'
const Prize_1 = ({ itemSelected, setSelectedItem, title, content }) => {
return (
<Fragment>
<Prize_1Item onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[2])}>
<PrizeItem onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[2])}>
<CertIcon
id={CERT_ACTIVE_ITEM[2]}
itemSelected={itemSelected}
name="p"
/>
</Prize_1Item>
</PrizeItem>

<Prize_1Info itemSelected={itemSelected}>
<PrizeInfo itemSelected={itemSelected}>
<Title>
<span>{CERT_ACTIVE_ITEM[2]}</span> &mdash; <Translate id={title} />
</Title>
<p>
<Translate id={content} />
</p>
</Prize_1Info>
</PrizeInfo>
</Fragment>
)
}
Expand All @@ -40,12 +40,12 @@ Prize_1.propTypes = {
content: PropTypes.string
}

const Prize_1Item = styled(Item)`
const PrizeItem = styled(Item)`
left: 62.5%;
z-index: 20;
`

const Prize_1Info = styled(Info)`
const PrizeInfo = styled(Info)`
visibility: ${props =>
props.itemSelected == CERT_ACTIVE_ITEM[2] ? 'visible' : 'hidden'};
Expand Down
12 changes: 6 additions & 6 deletions views/components/certification/Prize_2.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ import { Translate } from 'react-localize-redux'
const Prize_2 = ({ itemSelected, setSelectedItem, title, content }) => {
return (
<Fragment>
<Prize_2Item onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[3])}>
<PrizeItem onClick={() => setSelectedItem(CERT_ACTIVE_ITEM[3])}>
<CertIcon
id={CERT_ACTIVE_ITEM[3]}
itemSelected={itemSelected}
name="p"
/>
</Prize_2Item>
</PrizeItem>

<Prize_2Info itemSelected={itemSelected}>
<PrizeInfo itemSelected={itemSelected}>
<Title>
<span>{CERT_ACTIVE_ITEM[3]}</span> &mdash; <Translate id={title} />
</Title>
<p>
<Translate id={content} />
</p>
</Prize_2Info>
</PrizeInfo>
</Fragment>
)
}
Expand All @@ -40,12 +40,12 @@ Prize_2.propTypes = {
content: PropTypes.string
}

const Prize_2Item = styled(Item)`
const PrizeItem = styled(Item)`
left: 87.5%;
z-index: 10;
`

const Prize_2Info = styled(Info)`
const PrizeInfo = styled(Info)`
visibility: ${props =>
props.itemSelected == CERT_ACTIVE_ITEM[3] ? 'visible' : 'hidden'};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

exports[`Loading should render without throwing an error 1`] = `
<div
className="jsx-642462187 progress-theme"
className="jsx-2249112217 progress-theme"
>
<div
className="jsx-642462187 inner"
className="jsx-2249112217 inner"
>
<div
className="jsx-642462187 loader"
className="jsx-2249112217 loader"
>
<Loader
color="#FFA726"
Expand All @@ -32,7 +32,7 @@ exports[`Loading should render without throwing an error 1`] = `
"24px",
]
}
id="3237718512"
id="391110136"
>
.progress-theme.__jsx-style-dynamic-selector{-webkit-transition:all 0.2s ease-out;-moz-transition:all 0.2s ease-out;-o-transition:all 0.2s ease-out;-webkit-transition:all 0.2s ease-out;transition:all 0.2s ease-out;z-index:9999999;position:fixed;left:0;right:0;top:0;bottom:0;}.inner.__jsx-style-dynamic-selector{height:100%;width:100%;-webkit-transition:all 0.3s ease-out;-moz-transition:all 0.3s ease-out;-o-transition:all 0.3s ease-out;-webkit-transition:all 0.3s ease-out;transition:all 0.3s ease-out;}.loader.__jsx-style-dynamic-selector{position:absolute;top:40%;left:50%;display:block;width:200px;height:120px;margin-left:-100px;margin-top:-60px;text-align:center;font-size:24px;line-height:90px;}
</JSXStyle>
Expand Down

0 comments on commit 9139656

Please sign in to comment.