From bf06bf437c73ef71fdb9407b1eb424a5ba10801a Mon Sep 17 00:00:00 2001 From: chapati23 Date: Wed, 30 Dec 2015 18:58:50 +0100 Subject: [PATCH] moved images to assets/images --- scripts/imagemin.js | 7 +-- scripts/server.js | 2 +- src/{ => assets}/images/bg-mobile.jpg | Bin src/{ => assets}/images/bg-web.jpg | Bin src/{ => assets}/images/grunge-over-image.png | Bin src/{ => assets}/images/grunge-white-top.gif | Bin src/{ => assets}/images/grunge-white-top.jpg | Bin src/{ => assets}/images/h1-my-story.png | Bin src/{ => assets}/images/h1-walk-with.png | Bin src/{ => assets}/images/icons/checkmark.svg | 0 src/{ => assets}/images/icons/error.svg | 0 src/{ => assets}/images/journey/Emad.jpg | Bin src/{ => assets}/images/journey/Heba.jpg | Bin src/{ => assets}/images/journey/Kana.jpg | Bin src/{ => assets}/images/journey/Mohammed.jpg | Bin src/{ => assets}/images/journey/Tariq.jpg | Bin .../images/journey/hamada.jpg} | Bin .../images/journey/map-aleppo-to-berlin.gif | Bin .../images/journey/map-cairo-to-berlin.gif | Bin .../images/journey/sahar.jpg} | Bin .../images/journey/zahira.jpg} | Bin src/{ => assets}/images/spinner.svg | 0 src/{ => assets}/images/walk-with-me-logo.png | Bin src/sections/addProfile.html | 58 +++++++++--------- src/sections/home.html | 2 +- src/sections/journey.html | 6 +- src/sections/profileAdded.html | 2 +- src/styles/sections/addProfile.scss | 4 +- src/styles/sections/home.scss | 4 +- src/styles/sections/journey.scss | 4 +- src/styles/sections/profileAdded.scss | 4 +- 31 files changed, 47 insertions(+), 46 deletions(-) rename src/{ => assets}/images/bg-mobile.jpg (100%) rename src/{ => assets}/images/bg-web.jpg (100%) rename src/{ => assets}/images/grunge-over-image.png (100%) rename src/{ => assets}/images/grunge-white-top.gif (100%) rename src/{ => assets}/images/grunge-white-top.jpg (100%) rename src/{ => assets}/images/h1-my-story.png (100%) rename src/{ => assets}/images/h1-walk-with.png (100%) rename src/{ => assets}/images/icons/checkmark.svg (100%) rename src/{ => assets}/images/icons/error.svg (100%) rename src/{ => assets}/images/journey/Emad.jpg (100%) rename src/{ => assets}/images/journey/Heba.jpg (100%) rename src/{ => assets}/images/journey/Kana.jpg (100%) rename src/{ => assets}/images/journey/Mohammed.jpg (100%) rename src/{ => assets}/images/journey/Tariq.jpg (100%) rename src/{images/journey/Hamada.jpg => assets/images/journey/hamada.jpg} (100%) rename src/{ => assets}/images/journey/map-aleppo-to-berlin.gif (100%) rename src/{ => assets}/images/journey/map-cairo-to-berlin.gif (100%) rename src/{images/journey/Sahar.jpg => assets/images/journey/sahar.jpg} (100%) rename src/{images/journey/Zahira.jpg => assets/images/journey/zahira.jpg} (100%) rename src/{ => assets}/images/spinner.svg (100%) rename src/{ => assets}/images/walk-with-me-logo.png (100%) diff --git a/scripts/imagemin.js b/scripts/imagemin.js index cfdafda..bacee48 100644 --- a/scripts/imagemin.js +++ b/scripts/imagemin.js @@ -1,15 +1,14 @@ var Imagemin = require('imagemin'); new Imagemin() - .src('src/images/**/*.{gif,jpg,png,svg}') - .dest('dist/images') + .src('src/assets/images/**/*.{gif,jpg,png,svg}') + .dest('dist/assets/images') .use(Imagemin.jpegtran({ progressive: true })) .use(Imagemin.gifsicle({ interlaced: true })) .use(Imagemin.optipng()) .use(Imagemin.svgo({ cleanupIDs: false })) .run(function (err, files) { if (err) { - console.error('Error:', err); + console.error('Error:', err, files); } - console.log(files[0]); }); diff --git a/scripts/server.js b/scripts/server.js index e21c86e..f803df8 100644 --- a/scripts/server.js +++ b/scripts/server.js @@ -28,7 +28,7 @@ if (argv.env && argv.env === 'build') { }, files: [ '.tmp/styles/index.css', - 'src/images/**/*', + 'src/assets/images/**/*', { match: ['src/styles/**/*.scss'], fn: function(event, file) { diff --git a/src/images/bg-mobile.jpg b/src/assets/images/bg-mobile.jpg similarity index 100% rename from src/images/bg-mobile.jpg rename to src/assets/images/bg-mobile.jpg diff --git a/src/images/bg-web.jpg b/src/assets/images/bg-web.jpg similarity index 100% rename from src/images/bg-web.jpg rename to src/assets/images/bg-web.jpg diff --git a/src/images/grunge-over-image.png b/src/assets/images/grunge-over-image.png similarity index 100% rename from src/images/grunge-over-image.png rename to src/assets/images/grunge-over-image.png diff --git a/src/images/grunge-white-top.gif b/src/assets/images/grunge-white-top.gif similarity index 100% rename from src/images/grunge-white-top.gif rename to src/assets/images/grunge-white-top.gif diff --git a/src/images/grunge-white-top.jpg b/src/assets/images/grunge-white-top.jpg similarity index 100% rename from src/images/grunge-white-top.jpg rename to src/assets/images/grunge-white-top.jpg diff --git a/src/images/h1-my-story.png b/src/assets/images/h1-my-story.png similarity index 100% rename from src/images/h1-my-story.png rename to src/assets/images/h1-my-story.png diff --git a/src/images/h1-walk-with.png b/src/assets/images/h1-walk-with.png similarity index 100% rename from src/images/h1-walk-with.png rename to src/assets/images/h1-walk-with.png diff --git a/src/images/icons/checkmark.svg b/src/assets/images/icons/checkmark.svg similarity index 100% rename from src/images/icons/checkmark.svg rename to src/assets/images/icons/checkmark.svg diff --git a/src/images/icons/error.svg b/src/assets/images/icons/error.svg similarity index 100% rename from src/images/icons/error.svg rename to src/assets/images/icons/error.svg diff --git a/src/images/journey/Emad.jpg b/src/assets/images/journey/Emad.jpg similarity index 100% rename from src/images/journey/Emad.jpg rename to src/assets/images/journey/Emad.jpg diff --git a/src/images/journey/Heba.jpg b/src/assets/images/journey/Heba.jpg similarity index 100% rename from src/images/journey/Heba.jpg rename to src/assets/images/journey/Heba.jpg diff --git a/src/images/journey/Kana.jpg b/src/assets/images/journey/Kana.jpg similarity index 100% rename from src/images/journey/Kana.jpg rename to src/assets/images/journey/Kana.jpg diff --git a/src/images/journey/Mohammed.jpg b/src/assets/images/journey/Mohammed.jpg similarity index 100% rename from src/images/journey/Mohammed.jpg rename to src/assets/images/journey/Mohammed.jpg diff --git a/src/images/journey/Tariq.jpg b/src/assets/images/journey/Tariq.jpg similarity index 100% rename from src/images/journey/Tariq.jpg rename to src/assets/images/journey/Tariq.jpg diff --git a/src/images/journey/Hamada.jpg b/src/assets/images/journey/hamada.jpg similarity index 100% rename from src/images/journey/Hamada.jpg rename to src/assets/images/journey/hamada.jpg diff --git a/src/images/journey/map-aleppo-to-berlin.gif b/src/assets/images/journey/map-aleppo-to-berlin.gif similarity index 100% rename from src/images/journey/map-aleppo-to-berlin.gif rename to src/assets/images/journey/map-aleppo-to-berlin.gif diff --git a/src/images/journey/map-cairo-to-berlin.gif b/src/assets/images/journey/map-cairo-to-berlin.gif similarity index 100% rename from src/images/journey/map-cairo-to-berlin.gif rename to src/assets/images/journey/map-cairo-to-berlin.gif diff --git a/src/images/journey/Sahar.jpg b/src/assets/images/journey/sahar.jpg similarity index 100% rename from src/images/journey/Sahar.jpg rename to src/assets/images/journey/sahar.jpg diff --git a/src/images/journey/Zahira.jpg b/src/assets/images/journey/zahira.jpg similarity index 100% rename from src/images/journey/Zahira.jpg rename to src/assets/images/journey/zahira.jpg diff --git a/src/images/spinner.svg b/src/assets/images/spinner.svg similarity index 100% rename from src/images/spinner.svg rename to src/assets/images/spinner.svg diff --git a/src/images/walk-with-me-logo.png b/src/assets/images/walk-with-me-logo.png similarity index 100% rename from src/images/walk-with-me-logo.png rename to src/assets/images/walk-with-me-logo.png diff --git a/src/sections/addProfile.html b/src/sections/addProfile.html index 4decfc3..697091f 100644 --- a/src/sections/addProfile.html +++ b/src/sections/addProfile.html @@ -1,9 +1,10 @@
- Walk With Me: Berlin + Walk With Me: Berlin

Add A Profile

+
    @@ -12,6 +13,7 @@

    Add A Profile

    - loading indicator + loading indicator
    This photo is too large. Photo size can be maxium 20MB.
    @@ -47,8 +49,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    What's the person's name?
    @@ -57,8 +59,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    How old is the person? Please enter as a number with max. 3 digits @@ -68,8 +70,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    What's the person's home town? If not known, just write 'Unknown'.
    @@ -78,8 +80,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    What's the person's home country?
    @@ -88,8 +90,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    What's the person's current city of residence?
    @@ -98,8 +100,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    What's the person's current country of residence?
    @@ -108,8 +110,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    Please provide some background information about the person
    @@ -118,8 +120,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    Why did the person have to leave his or her home country?
    @@ -128,8 +130,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    How did the person get to his or her current country of residence? Which route did they take? How long was the trip?
    @@ -138,8 +140,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon
    What does this person wish for in the future?
    @@ -148,8 +150,8 @@

    Add A Profile

  • - Checkmark Icon - Error Icon + Checkmark Icon + Error Icon

    - I hereby grant WalkWithMe.berlin the right and permission to use any images and text I upload. - I declare that I am the owner of any images and text I upload, and that I have permission to upload it for the purposes described here. + I hereby grant WalkWithMe.berlin the right and permission to use any assets/images and text I upload. + I declare that I am the owner of any assets/images and text I upload, and that I have permission to upload it for the purposes described here.

    I understand that WalkWithMe.berlin may use, re-use, publish and re-publish my content in whole or in part, in any medium now or hereafter known, and for any purpose whatsoever. diff --git a/src/sections/home.html b/src/sections/home.html index 9d39b07..441421e 100644 --- a/src/sections/home.html +++ b/src/sections/home.html @@ -1,4 +1,4 @@

    -
    Walk With Me: Berlin
    +
    Walk With Me: Berlin
    diff --git a/src/sections/journey.html b/src/sections/journey.html index 1db82c4..20db763 100644 --- a/src/sections/journey.html +++ b/src/sections/journey.html @@ -1,7 +1,7 @@
    @@ -30,7 +30,7 @@

    -

    My story

    +

    My story

    Why did you leave?

    diff --git a/src/sections/profileAdded.html b/src/sections/profileAdded.html index 0daecc9..bd00ac6 100644 --- a/src/sections/profileAdded.html +++ b/src/sections/profileAdded.html @@ -1,6 +1,6 @@
    - Walk With Me: Berlin + Walk With Me: Berlin

    diff --git a/src/styles/sections/addProfile.scss b/src/styles/sections/addProfile.scss index 8f34052..0636703 100644 --- a/src/styles/sections/addProfile.scss +++ b/src/styles/sections/addProfile.scss @@ -1,10 +1,10 @@ #add-profile { - background: transparent url('../images/bg-mobile.jpg') center center no-repeat fixed; + background: transparent url('../assets/images/bg-mobile.jpg') center center no-repeat fixed; background-size: cover; padding: 1rem; @media(min-width: $layout-s) { - background-image: url('../images/bg-web.jpg'); + background-image: url('../assets/images/bg-web.jpg'); } h2 { diff --git a/src/styles/sections/home.scss b/src/styles/sections/home.scss index ab58f77..fc5af24 100644 --- a/src/styles/sections/home.scss +++ b/src/styles/sections/home.scss @@ -1,11 +1,11 @@ #home { - background: transparent url('../images/bg-mobile.jpg') center center no-repeat; + background: transparent url('../assets/images/bg-mobile.jpg') center center no-repeat; background-size: cover; padding: 1rem; position: relative; @media(min-width: 768px) { - background-image: url('../images/bg-web.jpg'); + background-image: url('../assets/images/bg-web.jpg'); } .age-form { diff --git a/src/styles/sections/journey.scss b/src/styles/sections/journey.scss index c466268..16964ad 100644 --- a/src/styles/sections/journey.scss +++ b/src/styles/sections/journey.scss @@ -47,7 +47,7 @@ $map-height: 460px; &::after { content: ""; - background: transparent url('../images/grunge-over-image.png') left bottom no-repeat; + background: transparent url('../assets/images/grunge-over-image.png') left bottom no-repeat; top: 0; left: 0; bottom: 0; @@ -112,7 +112,7 @@ $map-height: 460px; } article { - background: transparent url('../images/grunge-white-top.jpg') left -55px no-repeat; + background: transparent url('../assets/images/grunge-white-top.jpg') left -55px no-repeat; line-height: 1.5; max-width: $content-max-width; padding: 2rem; diff --git a/src/styles/sections/profileAdded.scss b/src/styles/sections/profileAdded.scss index 8ca4120..678e27c 100644 --- a/src/styles/sections/profileAdded.scss +++ b/src/styles/sections/profileAdded.scss @@ -1,11 +1,11 @@ #profile-added { - background: transparent url('../images/bg-mobile.jpg') center center no-repeat; + background: transparent url('../assets/images/bg-mobile.jpg') center center no-repeat; background-size: cover; padding: 1rem; position: relative; @media(min-width: $layout-s) { - background-image: url('../images/bg-web.jpg'); + background-image: url('../assets/images/bg-web.jpg'); } .success-message {