Skip to content

Commit fc79c09

Browse files
authored
Merge branch 'source' into patch-8
2 parents 1505141 + f1f78a8 commit fc79c09

File tree

294 files changed

+23054
-10279
lines changed

Some content is hidden

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

294 files changed

+23054
-10279
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
cd public
2929
pwd
3030
ls -la
31-
- name: wtf
31+
- name: Gatsby Publish
3232
uses: enriikke/gatsby-gh-pages-action@v2
3333
with:
3434
access-token: ${{ secrets.SEKRED2 }}
35-
35+

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,6 @@ yarn-error.log
7070
.yarn-integrity
7171

7272

73-
.nvmrc
73+
.nvmrc
74+
.vscode/settings.json
75+
package-lock.json

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
3. Create the PR from that branch to the source branch
1515

1616
# Contributing with translations
17-
When translation of a whole new part is completed, remember to update the file src/utils/translationProgress.json
17+
When translation of a whole new part is completed, remember to update the file src/utils/translationProgress.json
18+
This file tracks the progress of translations, ranging from 0 (part0) to 13 (part13). It is used in the to avoid navigation errors when the user tries to access untranslated parts of the course. At the same time, it is used to automatically redirect the user to the English material (until the part is translated). So, if you have been working on a translation, remember to update this file after completing the translation of a whole part.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Full stack open
22

3-
Despite the repo name this IS the current course repository
3+
Despite the repo name this is the current course repository.
44

55
<https://fullstackopen.com/>
66

gatsby-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const createSearchConfig = (indexName, language) => {
1616
letter
1717
part
1818
}
19-
id
19+
id
2020
rawMarkdownBody
2121
}
2222
}
@@ -43,6 +43,7 @@ const createSearchConfig = (indexName, language) => {
4343
const plugins = [
4444
createSearchConfig('finnish', 'fi'),
4545
createSearchConfig('english', 'en'),
46+
createSearchConfig('spanish', 'es'),
4647
createSearchConfig('chinese', 'zh'),
4748
createSearchConfig('portuguese', 'ptbr'),
4849
{

license.txt

Lines changed: 359 additions & 0 deletions
Large diffs are not rendered by default.

src/components/Accordion/Accordion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Accordion.propTypes = {
9898
containerClassName: PropTypes.string,
9999
initiallyOpened: PropTypes.bool,
100100
titleStyle: PropTypes.object,
101-
selectedItem: PropTypes.string
101+
selectedItem: PropTypes.string,
102102
};
103103

104104
Accordion.defaultProps = {

src/components/Arrow/Arrow.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ const Arrow = ({
9898
{...props}
9999
>
100100
<Element flex className="arrow__rectangle" style={arrowStyle}>
101-
<p className="arrow--stacked-title"><span>{arrow.text}</span></p>
101+
<p className="arrow--stacked-title">
102+
<span>{arrow.text}</span>
103+
</p>
102104
</Element>
103105
<div className="arrow__point" style={arrowStyle} />
104106
</Link>

src/components/CompaniesBanner/CompaniesBanner.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const partners = [
1818
url: 'https://www.helsinki.fi/',
1919
},
2020
{
21-
image: { name: 'houston.svg', alt: 'Houston inc.' },
21+
image: { name: 'houston2.svg', alt: 'Houston inc.' },
2222
url: 'https://www.houston-inc.com/careers',
2323
},
2424
{
@@ -127,9 +127,7 @@ export const CompaniesBanner = ({ isFrontPage, lang }) => {
127127
applyPadding
128128
companyPath={company.url}
129129
image={{
130-
src: require(`../../images/company_logos/${
131-
company.image.name
132-
}`),
130+
src: require(`../../images/company_logos/${company.image.name}`),
133131
alt: company.image.alt,
134132
}}
135133
className={`col-3 col-5--mobile col-5--tablet`}

src/components/IndexPage/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { SubHeader } from '../SubHeader/SubHeader';
1414
import { TripleBorder } from '../TripleBorder/TripleBorder';
1515
import cc from '../../images/cc.svg';
1616
import content from '../../content/pages/main.json';
17-
import houstonLogo from '../../images/Houston_big.svg';
17+
import houstonLogo from '../../images/Houston_big2.svg';
1818
import landingImage from '../../images/landing.svg';
1919
import licenceIcon from '../../images/cc-logo.png';
2020
import mainSEOdescription from '../../content/seo/mainSEOdescription';

0 commit comments

Comments
 (0)