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

#80 Rename images to media folder #84

Merged
merged 5 commits into from
Sep 13, 2018
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
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Below are listed the versions used in Netlify to create the live, preview and br
- If after running the above command it complains that *xcode alone is not sufficient on sierra*, try running `xcode-select --install`. Note that **macOS Sierra 10.12.6 or higher and XCode 9.2 are required.**


1. [hugo](https://gohugo.io/) v0.37.1 - builds the structure of the website based on the content setup, although we're phasing it out in favor of a fully JS/React solution. Any version over 0.27.1 should still work though.
1. [hugo](https://gohugo.io/) v0.48.0 - builds the structure of the website based on the content setup, although we're phasing it out in favor of a fully JS/React solution. Any version over 0.27.1 should still work though.

- Install:
```sh
Expand All @@ -30,7 +30,7 @@ Below are listed the versions used in Netlify to create the live, preview and br
brew update && brew upgrade hugo
```

2. [yarn](https://yarnpkg.com/) v1.5.1 - package/dependency manager. Any version of yarn above 0.27.5 should still work though.
2. [yarn](https://yarnpkg.com/) v1.10.0 - package/dependency manager. Any version of yarn above 0.27.5 should still work though.

- Install:
```sh
Expand All @@ -46,22 +46,22 @@ Below are listed the versions used in Netlify to create the live, preview and br
```
- Switch between yarn versions (global change):
```sh
brew switch yarn 1.5.1
brew switch yarn 1.10.0
```

3. [nvm](https://github.com/creationix/nvm) v0.33.8 - (not used by Netlify), very useful to manage your locale Node.js versions.
3. [nvm](https://github.com/creationix/nvm) v0.33.11 - (not used by Netlify), very useful to manage your locale Node.js versions.

- Install or update:
```sh
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
```

- After installing you may need to re-open the terminal or run this for it to recognize the `nvm` command (repeat for every terminal you currently have open in which you want to use it):
```sh
source ~/.bash_profile
```

4. [Node.js](https://nodejs.org/en/) v8.9.3 LTS (lts/carbon) - our JavaScript runtime, we need it, for everything. Any Node v8.x.x or even v6.x.x (lts/boron) should still work though.
4. [Node.js](https://nodejs.org/en/) v8.11.3 LTS (lts/carbon) - our JavaScript runtime, we need it, for everything. Any Node v8.x.x or even v6.x.x (lts/boron) should still work though.

- Install or update:
```sh
Expand Down Expand Up @@ -220,8 +220,8 @@ We can use *jpg* (and the *jpeg* variant), *png*, *webp* and *tiff* file types.
To take advantage of these, you must first define in *package.json* what sizes and suffixes (to be appended to the original filename) sharp should work with; e.g.:
```json
"sharp-config": {
"src": "static/images",
"dest": "public/images",
"src": "static/media",
"dest": "public/media",
"quality": 80,
"sizes": [
{
Expand Down
4 changes: 2 additions & 2 deletions configs/cms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ backend:
repo: marzeelabs/besugo # Path to your Github repository
branch: <% CURRENT_BRANCH %> # Branch to update (current branch dynamically set by Gulp)

media_folder: "/static/images/uploads" # Folder where user uploaded files should go
public_folder: "/images/uploads"
media_folder: "/static/media/uploads" # Folder where user uploaded files should go
public_folder: "/media/uploads"
publish_mode: "editorial_workflow"

collections: # A list of collections the CMS should be able to edit
Expand Down
2 changes: 1 addition & 1 deletion content/blog/blog-post-title-3.pt.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: pt
title: Blog post title 3
image: /images/uploads/example.jpg
image: /media/uploads/example.jpg
people:
- person: Name of the person 2
---
Expand Down
2 changes: 1 addition & 1 deletion content/blog/blog_post_1.en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: en
title: Blog post Title 1
image: /images/uploads/example.jpg
image: /media/uploads/example.jpg
people:
- person: Name of the person 1
---
Expand Down
2 changes: 1 addition & 1 deletion content/blog/blog_post_2.en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: en
title: Blog post title 2
image: /images/uploads/example.jpg
image: /media/uploads/example.jpg

---

Expand Down
4 changes: 2 additions & 2 deletions content/blog/blog_post_3.en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: en
title: Blog post title 3
image: /images/uploads/example.jpg
image: /media/uploads/example.jpg
people:
- person: Name of the person 1
- person: Name of the person 4
Expand All @@ -22,7 +22,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasauris dignissim, ni
2. bullet 2
3. bullet 3

![Image Alt Text](/images/uploads/example.jpg)
![Image Alt Text](/media/uploads/example.jpg)

```
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus et tincidunt odio, ut semper dolor. Etiam at massa vitae enim tempus luctus in hendrerit eros. Vivamus ornare, nulla a vestibulum lacinia, nisl velit pharetra nunc, sed malesuada erat nibh eu purus.
Expand Down
2 changes: 1 addition & 1 deletion content/pages/about.en.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: About page
image: /images/uploads/example.jpg
image: /media/uploads/example.jpg
description: Integer iaculis tortor ut magna suscipit, in suscipit risus pharetra.

---
Expand Down
2 changes: 1 addition & 1 deletion content/pages/about.pt.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Sobre nós
image: /images/uploads/example.jpg
image: /media/uploads/example.jpg
description: Integer iaculis tortor ut magna suscipit, in suscipit risus pharetra.

---
Expand Down
3 changes: 1 addition & 2 deletions content/people/person1.en.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
---
i18nlanguage: en
title: Name of the person 1
image: /images/uploads/example_profile.jpg
image: /media/uploads/example_profile.jpg
---


Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus et tincidunt odio, ut semper dolor. Etiam at massa vitae enim tempus luctus in hendrerit eros. Vivamus ornare, nulla a vestibulum lacinia, nisl velit pharetra nunc, sed malesuada erat nibh eu purus.

2 changes: 1 addition & 1 deletion content/people/person1.pt.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Name of the person 1
image: /images/uploads/example_profile.jpg
image: /media/uploads/example_profile.jpg
i18nlanguage: pt
---

Expand Down
2 changes: 1 addition & 1 deletion content/people/person2.en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: en
title: Name of the person 2
image: /images/uploads/example_profile.jpg
image: /media/uploads/example_profile.jpg
---


Expand Down
2 changes: 1 addition & 1 deletion content/people/person3.en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: en
title: Name of the person 3
image: /images/uploads/example_profile.jpg
image: /media/uploads/example_profile.jpg
---


Expand Down
3 changes: 1 addition & 2 deletions content/people/person4.en.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
---
i18nlanguage: en
title: Name of the person 4
image: /images/uploads/lady.jpg
image: /media/uploads/lady.jpg
---


Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus et tincidunt odio, ut semper dolor. Etiam at massa vitae enim tempus luctus in hendrerit eros. Vivamus ornare, nulla a vestibulum lacinia, nisl velit pharetra nunc, sed malesuada erat nibh eu purus.

2 changes: 1 addition & 1 deletion content/people/person5.en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
i18nlanguage: en
title: Name of the person 5
image: /images/uploads/example_profile.jpg
image: /media/uploads/example_profile.jpg
---


Expand Down
24 changes: 12 additions & 12 deletions layouts/partials/styleguide.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h1 class="styleguide__section-component__title">Image with text-overlay</h1>

<SrcSet
className="teaser__element"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 1024px) 100vw,
1024px" ></SrcSet>
Expand All @@ -107,19 +107,19 @@ <h2 class="section-component__subtitle">Slider</h2>
<SlideShow>
<SlideShowSlide
title="First Slide"
image="/images/uploads/example.jpg"
image="/media/uploads/example.jpg"
link-label="Link"
link-url="#"
></SlideShowSlide>
<SlideShowSlide
title="Second Slide"
image="/images/uploads/example.jpg"
image="/media/uploads/example.jpg"
link-label="Link"
link-url="#"
></SlideShowSlide>
<SlideShowSlide
title="Third Slide"
image="/images/uploads/example.jpg"
image="/media/uploads/example.jpg"
link-label="Link"
link-url="#"
></SlideShowSlide>
Expand All @@ -141,7 +141,7 @@ <h1 class="styleguide__section-component__title">Teasers in grid</h1>

<SrcSet
className="teaser__element"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 730px) 100vw,
(max-width: 1024px) 33vw,
Expand All @@ -158,7 +158,7 @@ <h1 class="styleguide__section-component__title">Teasers in grid</h1>

<SrcSet
className="teaser__element"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 730px) 100vw,
(max-width: 1024px) 33vw,
Expand All @@ -175,7 +175,7 @@ <h1 class="styleguide__section-component__title">Teasers in grid</h1>

<SrcSet
className="teaser__element"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 730px) 100vw,
(max-width: 1024px) 33vw,
Expand All @@ -195,7 +195,7 @@ <h1 class="styleguide__section-component__title">Teaser with image and text side
<div class="teaser-text-side__image__wrapper">
<SrcSet
className="teaser-text-side__image"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 729px) 100vw,
(max-width: 1024px) 60vw,
Expand All @@ -217,7 +217,7 @@ <h1 class="styleguide__section-component__title">Teaser with image and text side
<div class="teaser-text-side__image__wrapper">
<SrcSet
className="teaser-text-side__image"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 729px) 100vw,
(max-width: 1024px) 60vw,
Expand All @@ -239,7 +239,7 @@ <h1 class="styleguide__section-component__title">Teaser with image and text side
<div class="teaser-text-side__image__wrapper">
<SrcSet
className="teaser-text-side__image"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 729px) 100vw,
(max-width: 1024px) 60vw,
Expand All @@ -261,7 +261,7 @@ <h1 class="styleguide__section-component__title">Teaser with image and text side
<div class="teaser-text-side__image__wrapper">
<SrcSet
className="teaser-text-side__image"
src="/images/uploads/example.jpg"
src="/media/uploads/example.jpg"
sizes="
(max-width: 729px) 100vw,
(max-width: 1024px) 60vw,
Expand Down Expand Up @@ -289,7 +289,7 @@ <h2 class="section-component__subtitle">Profile</h2>
<div class="profile__image__wrapper">
<SrcSet
className="profile__image"
src="/images/uploads/example_profile.jpg"
src="/media/uploads/example_profile.jpg"
sizes="
(max-width: 730px) 100vw,
730px"></SrcSet>
Expand Down
12 changes: 6 additions & 6 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
# Production context: All deploys to the main
# repository branch will inherit these settings.
[context.production.environment]
HUGO_VERSION = "0.42.1"
YARN_VERSION = "1.7.0"
HUGO_VERSION = "0.47.1"
YARN_VERSION = "1.10.0"
YARN_FLAGS = "--no-ignore-optional"

# Deploy Preview context: All Deploy Previews
# will inherit these settings.
[context.deploy-preview.environment]
HUGO_VERSION = "0.42.1"
YARN_VERSION = "1.7.0"
HUGO_VERSION = "0.47.1"
YARN_VERSION = "1.10.0"
YARN_FLAGS = "--no-ignore-optional"

# Branch Deploy context: All Branch Deploys
# will inherit these settings.
[context.branch-deploy.environment]
HUGO_VERSION = "0.42.1"
YARN_VERSION = "1.7.0"
HUGO_VERSION = "0.47.1"
YARN_VERSION = "1.10.0"
YARN_FLAGS = "--no-ignore-optional"

# Branch Deploy context: All deploys that are not in
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"last 4 ios_saf versions"
],
"sharp-config": {
"src": "static/images",
"dest": "public/images",
"src": "static/media",
"dest": "public/media",
"quality": 80,
"types": [
"jpg",
Expand Down Expand Up @@ -58,7 +58,7 @@
"watch:webpack": "nodemon -q -w webpack.config.js -x 'yarn compile:webpack'",
"dummy:refresh": "node scripts/dummy-refresh.js",
"webpack": "webpack",
"build": "export NODE_ENV=production && npm-run-all -p erase:* && npm-run-all -p build:* && hugo && webpack --mode production",
"build": "export NODE_ENV=production && npm-run-all -p erase:* && npm-run-all -p build:* && hugo --minify && webpack --mode production",
"start:verbose": "export NODE_ENV=development && npm-run-all -p erase:* && yarn build:configs && npm-run-all -p watch:*",
"start": "nodemon -q -w package.json -w scripts/serve.js -w scripts/libs -w scripts/tasks -x 'node scripts/serve.js'",
"linter:eslint": "eslint --ext .jsx,.js . --fix",
Expand Down
2 changes: 1 addition & 1 deletion scss/components/_more-arrow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
height: 20px;
font-size: 0;
display: block;
background-image: url("/images/down_c2a.svg");
background-image: url("/media/down_c2a.svg");
background-position: center center;
background-repeat: no-repeat;
bottom: ritmo(4);
Expand Down
2 changes: 1 addition & 1 deletion static/admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body>
<!-- custom login message -->
<div class="custom-login-message">
<img class="custom-login-message__image" src="/images/logo_admin.svg" />
<img class="custom-login-message__image" src="/media/logo_admin.svg" />
<h3 class="custom-login-message__title">
Enter here to manage your amazing content.
</h3>
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes