Skip to content

Commit 0579db2

Browse files
authored
Merge pull request #4101 from Dinokojt7/part1b
Clarify wording in Java vs JavaScript class/object comparison
2 parents 1e09c95 + a155ee8 commit 0579db2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+183
-184
lines changed

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
npm run build
2323
- name: git status
2424
run: |
25-
git status
25+
git status
2626
- name: working dir
2727
run: |
2828
cd public
@@ -32,4 +32,3 @@ jobs:
3232
uses: enriikke/gatsby-gh-pages-action@v2
3333
with:
3434
access-token: ${{ secrets.SEKRED2 }}
35-

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"semi": true,
33
"singleQuote": true,
44
"trailingComma": "es5"
5-
}
5+
}

gatsby-browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require('prismjs/themes/prism-dark.css');
77

88
export const onRouteUpdate = () => {
99
anchorate({
10-
scroller: function(element) {
10+
scroller: function (element) {
1111
if (!element) return false;
1212
element.scrollIntoView({ behavior: 'smooth' });
1313
return true;

gatsby-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const createSearchConfig = (indexName, language) => {
2828
normalizer: ({ data }) => {
2929
return IS_DEV
3030
? []
31-
: data.allMarkdownRemark.nodes.map(node => ({
31+
: data.allMarkdownRemark.nodes.map((node) => ({
3232
id: node.id,
3333
part: node.frontmatter.part,
3434
letter: node.frontmatter.letter,

gatsby-node.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports.createPages = ({ actions, graphql }) => {
2626
}
2727
}
2828
}
29-
`).then(result => {
29+
`).then((result) => {
3030
if (result.errors) {
3131
return Promise.reject(result.errors);
3232
}
@@ -35,7 +35,7 @@ exports.createPages = ({ actions, graphql }) => {
3535
const { frontmatter } = node;
3636
const { part, lang } = frontmatter;
3737

38-
const legitPart = (part || part === '0' || part === 0)
38+
const legitPart = part || part === '0' || part === 0;
3939

4040
if (legitPart && !frontmatter.letter) {
4141
createPage({
@@ -49,7 +49,12 @@ exports.createPages = ({ actions, graphql }) => {
4949
lang: lang,
5050
},
5151
});
52-
} else if (legitPart && navigation[lang] && !isEmpty(navigation[lang][part]) && frontmatter.letter) {
52+
} else if (
53+
legitPart &&
54+
navigation[lang] &&
55+
!isEmpty(navigation[lang][part]) &&
56+
frontmatter.letter
57+
) {
5358
createPage({
5459
path:
5560
lang === 'fi'

google9ad00ab66f508b0a.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-site-verification: google9ad00ab66f508b0a.html
1+
google-site-verification: google9ad00ab66f508b0a.html

src/components/Accordion/Accordion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Accordion extends Component {
7272
)}
7373
{list && (
7474
<ul>
75-
{list.map(l => (
75+
{list.map((l) => (
7676
<li
7777
key={l.text}
7878
className={selectedItem === l.id ? 'selected' : undefined}

src/components/Arrow/Arrow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const Arrow = ({
7979
className="arrow__container arrow__container--with-link"
8080
style={{ display: 'flex', flexDirection: 'column' }}
8181
>
82-
{content.map(arrow => {
82+
{content.map((arrow) => {
8383
const arrowStyle = {
8484
backgroundColor: arrow.backgroundColor
8585
? arrow.backgroundColor

src/components/BodyText/BodyText.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const BodyText = ({
4545
<p className={`body-text__content ${classes.join(' ')}`}>{text}</p>
4646
) : (
4747
text &&
48-
text.map(p => (
48+
text.map((p) => (
4949
<div key={p} className={`body-text__content ${classes.join(' ')}`}>
5050
{Parser(p)}
5151
</div>

src/components/CompaniesBanner/CompaniesBanner.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ export const CompaniesBanner = ({ isFrontPage, lang }) => {
124124
applyPadding
125125
companyPath={company.url}
126126
image={{
127-
src: require(`../../images/company_logos/${company.image.name}`),
127+
src: require(
128+
`../../images/company_logos/${company.image.name}`
129+
),
128130
alt: company.image.alt,
129131
}}
130132
className={`col-3 col-5--mobile col-5--tablet`}
@@ -143,13 +145,13 @@ export const CompaniesBanner = ({ isFrontPage, lang }) => {
143145
flex
144146
className="col-9 flex-fix-aligning space-between--mobile"
145147
>
146-
{inChallenge.map(company => (
148+
{inChallenge.map((company) => (
147149
<Image
148150
key={company}
149151
contain
150-
src={require(`../../images/company_logos/${snakeCase(
151-
company
152-
)}.svg`)}
152+
src={require(
153+
`../../images/company_logos/${snakeCase(company)}.svg`
154+
)}
153155
alt={company}
154156
className={`company__logo push-right-1 col-3--mobile col-3--tablet`}
155157
backdrop

0 commit comments

Comments
 (0)