Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: replace imgur to s3 for various files without conflict #36057

Merged
merged 1 commit into from
May 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions api-server/server/utils/commit.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@
"donateUrl": "https://www.girldevelopit.com/donate",
"description": "Girl Develop It provides in-person classes for women to learn to code.",
"imgAlt": "Girl Develop It participants coding at tables.",
"imgUrl": "https://i.imgur.com/U1CyEuA.jpg"
"imgUrl": "https://cdn-media-1.freecodecamp.org/imgr/U1CyEuA.jpg"
},
{
"name": "black girls code",
"displayName": "Black Girls CODE",
"donateUrl": "http://www.blackgirlscode.com/",
"description": "Black Girls CODE is devoted to showing the world that black girls can code, and do so much more.",
"imgAlt": "Girls developing code with instructor",
"imgUrl": "https://i.imgur.com/HBVrdaj.jpg"
"imgUrl": "https://cdn-media-1.freecodecamp.org/imgr/HBVrdaj.jpg"
},
{
"name": "coderdojo",
"displayName": "CoderDojo",
"donateUrl": "https://www.globalgiving.org/projects/coderdojo-start-a-dojo-support/",
"description": "CoderDojo is the global network of free computer programming clubs for young people.",
"imgAlt": "Two adults help several kids program on their laptops.",
"imgUrl": "https://i.imgur.com/701RLfV.jpg"
"imgUrl": "https://cdn-media-1.freecodecamp.org/imgr/701RLfV.jpg"
},
{
"name": "women who code",
"displayName": "Women Who Code",
"donateUrl": "https://www.womenwhocode.com/donate",
"description": "Women Who Code (WWCode) is a global leader in propelling women in the tech industry.",
"imgAlt": "Four women sitting in a classroom together learning to code.",
"imgUrl": "https://i.imgur.com/tKUi6Rf.jpg"
"imgUrl": "https://cdn-media-1.freecodecamp.org/imgr/tKUi6Rf.jpg"
},
{
"name": "girls who code",
"displayName": "Girls Who Code",
"donateUrl": "http://girlswhocode.com/",
"description": "Girls Who Code programs work to inspire, educate, and equip girls with the computing skills to pursue 21st century opportunities.",
"imgAlt": "Three women smiling while they code on a computer together.",
"imgUrl": "https://i.imgur.com/op8BVph.jpg"
"imgUrl": "https://cdn-media-1.freecodecamp.org/imgr/op8BVph.jpg"
},
{
"name": "hack club",
"displayName": "Hack Club",
"donateUrl": "https://hackclub.com/donate",
"description": "Hack Club helps high schoolers start after-school coding clubs.",
"imgAlt": "A bunch of high school students posing for a photo in their Hack Club.",
"imgUrl": "https://i.imgur.com/G2YvPHf.jpg"
"imgUrl": "https://cdn-media-1.freecodecamp.org/imgr/G2YvPHf.jpg"
}
]
2 changes: 1 addition & 1 deletion api-server/server/views/commit/pledge.jade
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ block content
| of completing your #{goal}
.row
.col-xs-12.col-sm-6.col-sm-offset-3
img.img-responsive(src='//i.imgur.com/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
img.img-responsive(src='https://cdn-media-1.freecodecamp.org/imgr/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
p Girl Develop It is a nonprofit that provides in-person classes for women to learn to code.
6 changes: 3 additions & 3 deletions client/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const IndexPage = () => (
alt="Meta's testimonial image"
className='testimonial-image img-center'
responsive={true}
src='https://i.imgur.com/nsvNixW.jpg'
src='https://cdn-media-1.freecodecamp.org/imgr/nsvNixW.jpg'
/>
<p className='testimonial-copy'>
Through freeCodeCamp, I built a robust and highly functional web app
Expand All @@ -116,7 +116,7 @@ const IndexPage = () => (
alt="Brian's testimonial image"
className='testimonial-image img-center'
responsive={true}
src='https://i.imgur.com/QPpjPac.jpg'
src='https://cdn-media-1.freecodecamp.org/imgr/QPpjPac.jpg'
/>
<p className='testimonial-copy'>
freeCodeCamp is a great way for disabled veterans like me to
Expand All @@ -129,7 +129,7 @@ const IndexPage = () => (
alt="Maxim Orlov's testimonial image"
className='testimonial-image img-center'
responsive={true}
src='https://i.imgur.com/wjlDigg.jpg'
src='https://cdn-media-1.freecodecamp.org/imgr/wjlDigg.jpg'
/>
<p className='testimonial-copy'>
I joined freeCodeCamp with zero knowledge of web development. 6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ localeTitle: خلق نسيج عن طريق إضافة نمط دقيق كخلفي
<section id="description"> إحدى الطرق لإضافة الملمس والاهتمام إلى الخلفية وجعلها تبرز أكثر هي إضافة نمط دقيق. المفتاح هو التوازن ، لأنك لا تريد أن تبرز الخلفية أكثر من اللازم ، وأن تأخذها بعيدًا عن المقدمة. تدعم خاصية <code>background</code> وظيفة <code>url()</code> للربط بصورة للنسيج أو النمط المختار. يتم التفاف عنوان الارتباط بين علامات اقتباس داخل الأقواس. </section>

## Instructions
<section id="instructions"> باستخدام رابط من <code>https://i.imgur.com/MJAkxbh.png</code> ، تعيين <code>background</code> من صفحة كاملة مع <code>body</code> محدد. </section>
<section id="instructions"> باستخدام رابط من <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code> ، تعيين <code>background</code> من صفحة كاملة مع <code>body</code> محدد. </section>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<section id="instructions"> باستخدام رابط من <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code> ، تعيين <code>background</code> من صفحة كاملة مع <code>body</code> محدد. </section>
<section id="instructions"> باستخدام رابط من <code>https://i.imgur.com/MJAkxbh.png</code> ، تعيين <code>background</code> من صفحة كاملة مع <code>body</code> محدد. </section>


## Tests
<section id='tests'>

```yml
tests:
- text: يجب أن يكون لعنصر <code>body</code> الخاص بك خاصية <code>background</code> معيّنة إلى <code>url()</code> بالرابط المحدد.
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi));'


```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ localeTitle: 问题15:格子路径
---

## Description
<section id="description">从2×2网格的左上角开始,只能向右和向下移动,右下角有6条路线。 <img class="img-responsive center-block" alt="6 2乘2网格的图表显示了右下角的所有路线" src="https://i.imgur.com/1Atixoj.gif"><p>通过给定的<code>gridSize</code>有多少这样的路由? </p></section>
<section id="description">从2×2网格的左上角开始,只能向右和向下移动,右下角有6条路线。 <img class="img-responsive center-block" alt="6 2乘2网格的图表显示了右下角的所有路线" src="https://cdn-media-1.freecodecamp.org/imgr/1Atixoj.gif"><p>通过给定的<code>gridSize</code>有多少这样的路由? </p></section>

## Instructions
<section id="instructions">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ One way to add texture and interest to a background and have it stand out more i

## Instructions
<section id='instructions'>
Using the url of <code>https://i.imgur.com/MJAkxbh.png</code>, set the <code>background</code> of the whole page with the <code>body</code> selector.
Using the url of <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code>, set the <code>background</code> of the whole page with the <code>body</code> selector.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Using the url of <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code>, set the <code>background</code> of the whole page with the <code>body</code> selector.
Using the url of <code>https://i.imgur.com/MJAkxbh.png</code>, set the <code>background</code> of the whole page with the <code>body</code> selector.

</section>

## Tests
Expand All @@ -21,7 +21,7 @@ Using the url of <code>https://i.imgur.com/MJAkxbh.png</code>, set the <code>bac
```yml
tests:
- text: Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.
testString: assert(code.match(/background:\s*?url\(\s*("|'|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi), 'Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.');
testString: assert(code.match(/background:\s*?url\(\s*("|'|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), 'Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
testString: assert(code.match(/background:\s*?url\(\s*("|'|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), 'Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.');
testString: assert(code.match(/background:\s*?url\(\s*("|'|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi));


```

Expand Down Expand Up @@ -52,7 +52,7 @@ tests:
```html
<style>
body {
background: url("https://i.imgur.com/MJAkxbh.png");
background: url("https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png");
Copy link
Contributor

@thecodingaviator thecodingaviator May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to change this, I believe we can just enter any URL there, the current one does not even make sense as a BG. We'll need to update all languages' files

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine as is. The URL does have to be an image for the camper to see a change. Also, this image does create the subtle change that the instructions talk about.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thecodingaviator, thanks for the catch. If it is alright with you, I would rather differ content modifications specially in the curriculum to another PR since it would require a further discussion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're doing it to the Egnlish file, we'll need to do it to the other languages too. If you want to do it in this PR, fine enough, I'm totally fine if you want another file

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @thecodingaviator, I took note of suggestions, and I will address them in a separate PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If everything else other than changing the background look acceptable, please feel free to merge this PR.

}
</style>
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ videoUrl: 'https://scrimba.com/c/c9bQEA4'
## Description
<section id='description'>
The CSS offsets of <code>top</code> or <code>bottom</code>, and <code>left</code> or <code>right</code> tell the browser how far to offset an item relative to where it would sit in the normal flow of the document. You're offsetting an element away from a given spot, which moves the element away from the referenced side (effectively, the opposite direction). As you saw in the last challenge, using the top offset moved the <code>h2</code> downwards. Likewise, using a left offset moves an item to the right.
<img src='https://i.imgur.com/eWWi3gZ.gif' alt='' />
<img src='https://cdn-media-1.freecodecamp.org/imgr/eWWi3gZ.gif' alt='' />
</section>

## Instructions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: 'Problem 15: Lattice paths'
<section id='description'>
Starting in the top left corner of a 2×2 grid, and only being able to move to the right and down, there are exactly 6 routes to the bottom right corner.

<img class="img-responsive center-block" alt="a diagram of 6 2 by 2 grids showing all the routes to the bottom right corner" src="https://i.imgur.com/1Atixoj.gif">
<img class="img-responsive center-block" alt="a diagram of 6 2 by 2 grids showing all the routes to the bottom right corner" src="https://cdn-media-1.freecodecamp.org/imgr/1Atixoj.gif">

How many such routes are there through a given <code>gridSize</code>?
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ localeTitle: Criar textura adicionando um padrão sutil como imagem de plano de
<section id="description"> Uma maneira de adicionar textura e interesse a um plano de fundo e destacá-lo é adicionar um padrão sutil. A chave é o equilíbrio, já que você não quer que o fundo se destaque muito e tire o primeiro plano. A propriedade <code>background</code> suporta a função <code>url()</code> para vincular a uma imagem da textura ou padrão escolhido. O endereço do link é colocado entre aspas entre parênteses. </section>

## Instructions
<section id="instructions"> Usando o url de <code>https://i.imgur.com/MJAkxbh.png</code> , defina o <code>background</code> de toda a página com o seletor de <code>body</code> . </section>
<section id="instructions"> Usando o url de <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code> , defina o <code>background</code> de toda a página com o seletor de <code>body</code> . </section>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<section id="instructions"> Usando o url de <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code> , defina o <code>background</code> de toda a página com o seletor de <code>body</code> . </section>
<section id="instructions"> Usando o url de <code>https://i.imgur.com/MJAkxbh.png</code> , defina o <code>background</code> de toda a página com o seletor de <code>body</code> . </section>


## Tests
<section id='tests'>

```yml
tests:
- text: Seu elemento <code>body</code> deve ter uma propriedade <code>background</code> definida como <code>url()</code> com o link fornecido.
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi));'


```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ localeTitle: 'Problema 15: caminhos da rede'
---

## Description
<section id="description"> Começando no canto superior esquerdo de uma grade de 2 × 2, e somente sendo capaz de se mover para a direita e para baixo, há exatamente 6 rotas para o canto inferior direito. <img class="img-responsive center-block" alt="um diagrama de 6 2 por 2 grades mostrando todas as rotas para o canto inferior direito" src="https://i.imgur.com/1Atixoj.gif"><p> Quantas dessas rotas estão lá através de um determinado <code>gridSize</code> ? </p></section>
<section id="description"> Começando no canto superior esquerdo de uma grade de 2 × 2, e somente sendo capaz de se mover para a direita e para baixo, há exatamente 6 rotas para o canto inferior direito. <img class="img-responsive center-block" alt="um diagrama de 6 2 por 2 grades mostrando todas as rotas para o canto inferior direito" src="https://cdn-media-1.freecodecamp.org/imgr/1Atixoj.gif"><p> Quantas dessas rotas estão lá através de um determinado <code>gridSize</code> ? </p></section>

## Instructions
<section id="instructions">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ localeTitle: Crear textura agregando un patrón sutil como imagen de fondo
<section id="description"> Una forma de agregar textura e interés a un fondo y hacer que se destaque más es agregar un patrón sutil. La clave es el equilibrio, ya que no desea que el fondo se destaque demasiado y quita el primer plano. La propiedad de <code>background</code> compatible con la función <code>url()</code> para enlazar a una imagen de la textura o patrón elegido. La dirección del enlace está entre comillas dentro de los paréntesis. </section>

## Instructions
<section id="instructions"> Usando la url de <code>https://i.imgur.com/MJAkxbh.png</code> , establezca el <code>background</code> de toda la página con el selector de <code>body</code> . </section>
<section id="instructions"> Usando la url de <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code> , establezca el <code>background</code> de toda la página con el selector de <code>body</code> . </section>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<section id="instructions"> Usando la url de <code>https://cdn-media-1.freecodecamp.org/imgr/MJAkxbh.png</code> , establezca el <code>background</code> de toda la página con el selector de <code>body</code> . </section>
<section id="instructions"> Usando la url de <code>https://i.imgur.com/MJAkxbh.png</code> , establezca el <code>background</code> de toda la página con el selector de <code>body</code> . </section>


## Tests
<section id='tests'>

```yml
tests:
- text: El elemento del <code>body</code> debe tener una propiedad de <code>background</code> establecida en una <code>url()</code> con el enlace dado.
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/cdn-media-1\.freecodecamp\.org\/imgr\/MJAkxbh\.png\1\s*\)/gi), "Your <code>body</code> element should have a <code>background</code> property set to a <code>url()</code> with the given link.");'
testString: 'assert(code.match(/background:\s*?url\(\s*("|"|)https:\/\/i\.imgur\.com\/MJAkxbh\.png\1\s*\)/gi));


```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ localeTitle: 'Problema 15: caminos de celosía'
---

## Description
<section id="description"> Comenzando en la esquina superior izquierda de una cuadrícula de 2 × 2, y solo pudiendo moverse hacia la derecha y hacia abajo, hay exactamente 6 rutas hacia la esquina inferior derecha. <img class="img-responsive center-block" alt="un diagrama de 6 cuadrículas de 2 por 2 que muestra todas las rutas hacia la esquina inferior derecha" src="https://i.imgur.com/1Atixoj.gif"><p> ¿Cuántas de estas rutas hay a través de un <code>gridSize</code> dado? </p></section>
<section id="description"> Comenzando en la esquina superior izquierda de una cuadrícula de 2 × 2, y solo pudiendo moverse hacia la derecha y hacia abajo, hay exactamente 6 rutas hacia la esquina inferior derecha. <img class="img-responsive center-block" alt="un diagrama de 6 cuadrículas de 2 por 2 que muestra todas las rutas hacia la esquina inferior derecha" src="https://cdn-media-1.freecodecamp.org/imgr/1Atixoj.gif"><p> ¿Cuántas de estas rutas hay a través de un <code>gridSize</code> dado? </p></section>

## Instructions
<section id="instructions">
Expand Down
2 changes: 1 addition & 1 deletion mock-guide/english/git/difference-git-github/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Difference between Git and GitHub

Git and GitHub are two different things. [Git](https://git-scm.com/) is the [version control system](https://en.wikipedia.org/wiki/Version_control), while [GitHub](https://github.com/) is a service for hosting Git repos and help people collaborate on writing software. However, they are often confounded because of their similar name, because of the fact that GitHub builds on top of Git, and because many websites and articles don't make the difference between them clear enough.

![Git is not GitHub](https://i.imgur.com/EkjwJdr.png)
![Git is not GitHub](https://cdn-media-1.freecodecamp.org/imgr/EkjwJdr.png)

### Git

Expand Down
2 changes: 1 addition & 1 deletion mock-guide/english/html/layouts/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Layouts organize different areas of the web page.

Almost every web page we see can be divided into boxes, that can be arranged into specific order to create that web page. The image below is one such example.

![Sample of Website Design - www.codementor.io](http://i.imgur.com/Z1DSMYC.png)
![Sample of Website Design - www.codementor.io](https://cdn-media-1.freecodecamp.org/imgr/Z1DSMYC.png)

> Websites often display content in multiple columns (like a magazine or newspaper).

Expand Down