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-06 11:58:00 +02:00
parent bfba616df2 fd87c11232
commit 3230cfa0d0
6 changed files with 485 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "housesof", "name": "housesof",
"version": "1.0.0", "version": "1.1.0",
"description": "Houses Of website", "description": "Houses Of website",
"author": { "author": {
"name": "Flayks", "name": "Flayks",
@@ -25,15 +25,15 @@
"rellax": "^1.12.1", "rellax": "^1.12.1",
"scroll-out": "^2.2.8", "scroll-out": "^2.2.8",
"sirv": "^0.4.2", "sirv": "^0.4.2",
"svelte-lazy": "^0.1.10", "svelte-lazy": "^0.1.11",
"swipe-listener": "^1.1.0" "swipe-listener": "^1.1.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.9.0", "@babel/core": "^7.9.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.9.0", "@babel/plugin-transform-runtime": "^7.9.6",
"@babel/preset-env": "^7.9.5", "@babel/preset-env": "^7.9.6",
"@babel/runtime": "^7.9.2", "@babel/runtime": "^7.9.6",
"@rollup/plugin-alias": "^3.1.0", "@rollup/plugin-alias": "^3.1.0",
"@rollup/plugin-babel": "^5.0.0", "@rollup/plugin-babel": "^5.0.0",
"@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-commonjs": "11.0.2",
@@ -42,16 +42,16 @@
"autoprefixer": "^9.7.6", "autoprefixer": "^9.7.6",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"node-fetch": "^2.6.0", "node-fetch": "^2.6.0",
"node-sass": "^4.14.0", "node-sass": "^4.14.1",
"postcss": "^7.0.27", "postcss": "^7.0.29",
"postcss-load-config": "^2.1.0", "postcss-load-config": "^2.1.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"rollup": "^2.7.3", "rollup": "^2.8.0",
"rollup-plugin-glslify": "^1.2.0", "rollup-plugin-glslify": "^1.2.0",
"rollup-plugin-svelte": "^5.2.1", "rollup-plugin-svelte": "^5.2.1",
"rollup-plugin-terser": "^5.3.0", "rollup-plugin-terser": "^5.3.0",
"sapper": "^0.27.12", "sapper": "^0.27.12",
"svelte": "^3.21.0", "svelte": "^3.22.2",
"svelte-preprocess": "^3.7.4" "svelte-preprocess": "^3.7.4"
}, },
"browserslist": [ "browserslist": [

811
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

40
rollup.config.js
View File

@@ -105,14 +105,13 @@ export default {
...replaceOptions ...replaceOptions
}), }),
svelte({ svelte({
generate: 'ssr',
dev, dev,
preprocess, preprocess
generate: 'ssr'
}), }),
aliases, aliases,
glslify(), glslify(),
resolve({ resolve({
browser: true,
extensions: resolveExtensions, extensions: resolveExtensions,
dedupe: ['svelte'] dedupe: ['svelte']
}), }),
@@ -128,21 +127,22 @@ export default {
/* /*
** Service worker ** Service worker
*/ */
// ...(!dev && { ...(!dev && {
// serviceworker: { serviceworker: {
// input: sapperConfig.serviceworker.input(), input: sapperConfig.serviceworker.input(),
// output: sapperConfig.serviceworker.output(), output: sapperConfig.serviceworker.output(),
// plugins: [ plugins: [
// resolve(), resolve(),
// aliases, replace({
// replace({ 'process.browser': false,
// 'process.browser': true, ...replaceOptions
// ...replaceOptions }),
// }), aliases,
// commonjs(), glslify(),
// !dev && terser() commonjs(),
// ], !dev && terser()
// onwarn, ],
// } onwarn,
// }) }
})
} }

2
src/routes/sitemap.xml.js
View File

@@ -46,7 +46,7 @@ const render = (pages, locations) => {
// Get function // Get function
export async function get (req, res, next) { export async function get (req, res, next) {
// Define base url from request // Define base url from request
baseURL = `http${(req.httpVersion >= 2) ? 's' : ''}://${req.headers.host}` baseURL = `https://${req.headers.host}`
// Get locations // Get locations
const locationsReq = await fetch(`${apiEndpoints.rest}/items/locations?fields=slug,country.slug,modified_on&status=published`) const locationsReq = await fetch(`${apiEndpoints.rest}/items/locations?fields=slug,country.slug,modified_on&status=published`)

4
src/style/molecules/_newsletter.scss
View File

@@ -40,10 +40,10 @@
&--small { &--small {
.newsletter__text { .newsletter__text {
max-width: 344px; max-width: 344px;
margin-bottom: 56px; margin-bottom: 32px;
@include breakpoint (sm) { @include breakpoint (sm) {
margin-bottom: 72px; margin-bottom: 48px;
} }
} }
} }

6
src/style/organisms/_pagination.scss
View File

@@ -99,16 +99,14 @@
// Message // Message
&__message { &__message {
padding: pxVW(40) 0;
h3 { h3 {
font-family: $font-serif; font-family: $font-serif;
font-size: rem(32px); font-size: rem(32px);
color: $color-secondary; color: $color-secondary;
margin-bottom: 24px; margin-bottom: 16px;
@include breakpoint (sm) { @include breakpoint (sm) {
margin-bottom: 32px; margin-bottom: 24px;
font-size: rem(40px); font-size: rem(40px);
} }
} }