flayks/housesof
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Félix Péault
2020-05-08 12:41:58 +02:00
parent 720ca69902 bc6b7a664d
commit 19d26d8820
10 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "housesof",
"version": "1.1.0",
"version": "1.2.0",
"description": "Houses Of website",
"author": {
"name": "Flayks",
@@ -46,7 +46,7 @@
"postcss": "^7.0.29",
"postcss-load-config": "^2.1.0",
"postcss-preset-env": "^6.7.0",
"rollup": "^2.8.0",
"rollup": "^2.8.2",
"rollup-plugin-glslify": "^1.2.0",
"rollup-plugin-svelte": "^5.2.1",
"rollup-plugin-terser": "^5.3.0",

66
pnpm-lock.yaml generated
View File

@@ -16,11 +16,11 @@ devDependencies:
'@babel/plugin-transform-runtime': 7.9.6_@babel+core@7.9.6
'@babel/preset-env': 7.9.6_@babel+core@7.9.6
'@babel/runtime': 7.9.6
'@rollup/plugin-alias': 3.1.0_rollup@2.8.0
'@rollup/plugin-babel': 5.0.0_@babel+core@7.9.6+rollup@2.8.0
'@rollup/plugin-commonjs': 11.0.2_rollup@2.8.0
'@rollup/plugin-node-resolve': 7.1.3_rollup@2.8.0
'@rollup/plugin-replace': 2.3.2_rollup@2.8.0
'@rollup/plugin-alias': 3.1.0_rollup@2.8.2
'@rollup/plugin-babel': 5.0.0_@babel+core@7.9.6+rollup@2.8.2
'@rollup/plugin-commonjs': 11.0.2_rollup@2.8.2
'@rollup/plugin-node-resolve': 7.1.3_rollup@2.8.2
'@rollup/plugin-replace': 2.3.2_rollup@2.8.2
autoprefixer: 9.7.6
dotenv: 8.2.0
node-fetch: 2.6.0
@@ -28,10 +28,10 @@ devDependencies:
postcss: 7.0.29
postcss-load-config: 2.1.0
postcss-preset-env: 6.7.0
rollup: 2.8.0
rollup: 2.8.2
rollup-plugin-glslify: 1.2.0
rollup-plugin-svelte: 5.2.1_rollup@2.8.0+svelte@3.22.2
rollup-plugin-terser: 5.3.0_rollup@2.8.0
rollup-plugin-svelte: 5.2.1_rollup@2.8.2+svelte@3.22.2
rollup-plugin-terser: 5.3.0_rollup@2.8.2
sapper: 0.27.12_svelte@3.22.2
svelte: 3.22.2
svelte-preprocess: 3.7.4_0f5e9935bde736cfabfb00c1d85a6ff4
@@ -908,9 +908,9 @@ packages:
dev: false
resolution:
integrity: sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
/@rollup/plugin-alias/3.1.0_rollup@2.8.0:
/@rollup/plugin-alias/3.1.0_rollup@2.8.2:
dependencies:
rollup: 2.8.0
rollup: 2.8.2
slash: 3.0.0
dev: true
engines:
@@ -919,12 +919,12 @@ packages:
rollup: ^1.20.0||^2.0.0
resolution:
integrity: sha512-IzoejtAqdfwAvx4D0bztAJFoL5Js36kJgnbO00zfI1B9jf9G80vWysyG0C4+E6w5uG5hz0EeetPpoBWKdNktCQ==
/@rollup/plugin-babel/5.0.0_@babel+core@7.9.6+rollup@2.8.0:
/@rollup/plugin-babel/5.0.0_@babel+core@7.9.6+rollup@2.8.2:
dependencies:
'@babel/core': 7.9.6
'@babel/helper-module-imports': 7.8.3
'@rollup/pluginutils': 3.0.9_rollup@2.8.0
rollup: 2.8.0
'@rollup/pluginutils': 3.0.9_rollup@2.8.2
rollup: 2.8.2
dev: true
engines:
node: '>= 10.0.0'
@@ -933,14 +933,14 @@ packages:
rollup: ^1.20.0||^2.0.0
resolution:
integrity: sha512-YpVnwdUeVj/fDFN75Y3CAzJTMYNcqbH05SJs551wqj+BSwLT9pS3dqJrVDPYl3eH4OrI8ueiEseX5VgUn+0HLA==
/@rollup/plugin-commonjs/11.0.2_rollup@2.8.0:
/@rollup/plugin-commonjs/11.0.2_rollup@2.8.2:
dependencies:
'@rollup/pluginutils': 3.0.10_rollup@2.8.0
'@rollup/pluginutils': 3.0.10_rollup@2.8.2
estree-walker: 1.0.1
is-reference: 1.1.4
magic-string: 0.25.7
resolve: 1.17.0
rollup: 2.8.0
rollup: 2.8.2
dev: true
engines:
node: '>= 8.0.0'
@@ -948,14 +948,14 @@ packages:
rollup: ^1.20.0
resolution:
integrity: sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g==
/@rollup/plugin-node-resolve/7.1.3_rollup@2.8.0:
/@rollup/plugin-node-resolve/7.1.3_rollup@2.8.2:
dependencies:
'@rollup/pluginutils': 3.0.9_rollup@2.8.0
'@rollup/pluginutils': 3.0.9_rollup@2.8.2
'@types/resolve': 0.0.8
builtin-modules: 3.1.0
is-module: 1.0.0
resolve: 1.17.0
rollup: 2.8.0
rollup: 2.8.2
dev: true
engines:
node: '>= 8.0.0'
@@ -963,22 +963,22 @@ packages:
rollup: ^1.20.0||^2.0.0
resolution:
integrity: sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==
/@rollup/plugin-replace/2.3.2_rollup@2.8.0:
/@rollup/plugin-replace/2.3.2_rollup@2.8.2:
dependencies:
'@rollup/pluginutils': 3.0.9_rollup@2.8.0
'@rollup/pluginutils': 3.0.9_rollup@2.8.2
magic-string: 0.25.7
rollup: 2.8.0
rollup: 2.8.2
dev: true
peerDependencies:
rollup: ^1.20.0 || ^2.0.0
resolution:
integrity: sha512-KEEL7V2tMNOsbAoNMKg91l1sNXBDoiP31GFlqXVOuV5691VQKzKBh91+OKKOG4uQWYqcFskcjFyh1d5YnZd0Zw==
/@rollup/pluginutils/3.0.10_rollup@2.8.0:
/@rollup/pluginutils/3.0.10_rollup@2.8.2:
dependencies:
'@types/estree': 0.0.39
estree-walker: 1.0.1
picomatch: 2.2.2
rollup: 2.8.0
rollup: 2.8.2
dev: true
engines:
node: '>= 8.0.0'
@@ -986,12 +986,12 @@ packages:
rollup: ^1.20.0||^2.0.0
resolution:
integrity: sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw==
/@rollup/pluginutils/3.0.9_rollup@2.8.0:
/@rollup/pluginutils/3.0.9_rollup@2.8.2:
dependencies:
'@types/estree': 0.0.39
estree-walker: 1.0.1
micromatch: 4.0.2
rollup: 2.8.0
rollup: 2.8.2
dev: true
engines:
node: '>= 8.0.0'
@@ -3364,10 +3364,10 @@ packages:
dev: true
resolution:
integrity: sha512-EqUFINMICD9U3MJ4jsxBcCRhzWNZJBWyAK2ol+2ClWIPaIWOuz0OY/Ml8rdT81F4aufwxJN5I9N7QvCth0OrUQ==
/rollup-plugin-svelte/5.2.1_rollup@2.8.0+svelte@3.22.2:
/rollup-plugin-svelte/5.2.1_rollup@2.8.2+svelte@3.22.2:
dependencies:
require-relative: 0.8.7
rollup: 2.8.0
rollup: 2.8.2
rollup-pluginutils: 2.8.2
sourcemap-codec: 1.4.8
svelte: 3.22.2
@@ -3377,11 +3377,11 @@ packages:
svelte: '*'
resolution:
integrity: sha512-wc93cN66sRpX6uFljVFqvWT6NU3V5ab/uLXKt2UiARuexFU/ctolzkmdXM7WM5iKdTX9scToS9sabJTJV4DUMA==
/rollup-plugin-terser/5.3.0_rollup@2.8.0:
/rollup-plugin-terser/5.3.0_rollup@2.8.2:
dependencies:
'@babel/code-frame': 7.8.3
jest-worker: 24.9.0
rollup: 2.8.0
rollup: 2.8.2
rollup-pluginutils: 2.8.2
serialize-javascript: 2.1.2
terser: 4.6.12
@@ -3396,7 +3396,7 @@ packages:
dev: true
resolution:
integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
/rollup/2.8.0:
/rollup/2.8.2:
dev: true
engines:
node: '>=10.0.0'
@@ -3404,7 +3404,7 @@ packages:
optionalDependencies:
fsevents: 2.1.3
resolution:
integrity: sha512-hyjpreMA0BTNrO68o4wCtcktwYTK8o1UtauOqsPniwDGzN2PvNaKmwa/RHmjNHJMrt6ItY2C7XjpT7TDf6WmJw==
integrity: sha512-LRzMcB8V1M69pSvf6uCbR+W9OPCy5FuxcIwqioWg5RKidrrqKbzjJF9pEGXceaMVkbptNFZgIVJlUokCU0sfng==
/safe-buffer/5.1.2:
resolution:
integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -4042,7 +4042,7 @@ specifiers:
postcss-load-config: ^2.1.0
postcss-preset-env: ^6.7.0
rellax: ^1.12.1
rollup: ^2.8.0
rollup: ^2.8.2
rollup-plugin-glslify: ^1.2.0
rollup-plugin-svelte: ^5.2.1
rollup-plugin-terser: ^5.3.0

2
src/molecules/NewsletterForm.svelte
View File

@@ -22,7 +22,7 @@
<div class="newsletter__input form__group form__inputgroup">
<input type="email" id="SUB_EMAIL" name="EMAIL" value="" placeholder="Your email address..." class="input__text" required>
<button type="submit" form="sib-form" class="button-control dir-right"
<button type="submit" form="sib-form" aria-label="Subscribe" class="button-control dir-right"
class:button-control--pink={brightness === 'light'}
class:button-control--lightpink={brightness === 'dark'}
>

2
src/routes/_layout.svelte
View File

@@ -161,7 +161,7 @@
</style>
<svelte:head>
<link rel="canonical" href={`https://${$page.host}${$page.path}`} />
<link rel="canonical" href="{process.env.CONFIG.PROD_URL}{$page.path}">
{#each preconnect as host}
<link rel="preconnect" href={host} crossorigin>
<link rel="dns-prefetch" href={host}>

2
src/routes/choose.svelte
View File

@@ -44,7 +44,7 @@
<title>{pageTitle}</title>
<meta name="description" content={$site.seo_description_default}>
<SocialMetas
url="https://{$page.host}{$page.path}"
url="{process.env.CONFIG.PROD_URL}{$page.path}"
title="{pageTitle}"
description={$site.seo_description_default}
image={$site.seo_share_image.full_url}

2
src/routes/credits.svelte
View File

@@ -33,7 +33,7 @@
<title>{pageTitle}</title>
<meta name="description" content={$site.credits_text}>
<SocialMetas
url="https://{$page.host}{$page.path}"
url="{process.env.CONFIG.PROD_URL}{$page.path}"
title="{pageTitle}"
description={$site.credits_text}
image={$site.seo_share_image.full_url}

2
src/routes/index.svelte
View File

@@ -73,7 +73,7 @@
<title>{$site.seo_name} - {$site.seo_title_default} across the globe</title>
<meta name="description" content={$site.seo_description_default}>
<SocialMetas
url="https://{$page.host}"
url="{process.env.CONFIG.PROD_URL}"
title="{$site.seo_name} - {$site.seo_title_default} across the globe"
description={$site.seo_description_default}
image={$site.seo_share_image.full_url}

2
src/routes/location/[country]/[place].svelte
View File

@@ -99,7 +99,7 @@
<title>{$site.seo_name} – {$site.seo_title_default} of {location.name}, {country.name}</title>
<meta name="description" content="{$site.seo_name} {location.name} {description}">
<SocialMetas
url="https://{$page.host}/location/{country.slug}/{location.slug}"
url="{process.env.CONFIG.PROD_URL}/location/{country.slug}/{location.slug}"
title="{$site.seo_name} – {$site.seo_title_default} of {location.name}, {country.name}"
description="{$site.seo_name} {location.name} {description}"
image={latestPhoto ? getThumbnail(latestPhoto.image.private_hash, 1200, 630) : null}

2
src/routes/subscribe.svelte
View File

@@ -34,7 +34,7 @@
<title>{pageTitle}</title>
<meta name="description" content={$site.subscribe_text}>
<SocialMetas
url="https://{$page.host}{$page.path}"
url="{process.env.CONFIG.PROD_URL}{$page.path}"
title="{pageTitle}"
description={$site.subscribe_text}
image={$site.seo_share_image.full_url}

2
src/routes/viewer/[country]/[place]/[photo].svelte
View File

@@ -96,7 +96,7 @@
<title>{$site.seo_name} – {$site.seo_title_default} of {$currentLocation.name}, {$currentLocation.country.name}</title>
<meta name="description" content="{$site.seo_name} {$currentLocation.name} {$currentLocation.description}">
<SocialMetas
url="https://{$page.host}/viewer/{currentPhoto.location.country.slug}/{currentPhoto.location.slug}/{currentPhoto.slug}"
url="{process.env.CONFIG.PROD_URL}/viewer/{currentPhoto.location.country.slug}/{currentPhoto.location.slug}/{currentPhoto.slug}"
title="{$site.seo_name} - {$site.seo_title_default} of {$currentLocation.name}, {$currentLocation.country.name}"
description="{$site.seo_name} {$currentLocation.name} {$currentLocation.description}"
image={getThumbnail(currentPhoto.image.private_hash, 1200, 630)}