Skip to content
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
25 changes: 12 additions & 13 deletions firebase/functions/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,19 @@ exports.commentsNotification = functions.database
<p>Delete comment: TODO</p>`,
};

console.log("Send mail")
return new Promise<void>((resolve, reject) => {
mg.messages().send(data, function (error) {
if (error) {
reject(error)
console.error(JSON.stringify(error));
} else {
resolve()
console.log("Mail sent with success:", JSON.stringify(data));
}
});

})
console.log("Send mail");

return new Promise<void>((resolve, reject) => {
mg.messages().send(data, function (error) {
if (error) {
reject(error);
console.error(JSON.stringify(error));
} else {
resolve();
console.log("Mail sent with success:", JSON.stringify(data));
}
});
});
});

exports.contact = functions.https.onRequest(contactApp);
Expand Down
8 changes: 0 additions & 8 deletions src/components/images/asia/japan/tokyo/ueno-park.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const alt = {
park10: "Ueno Park",
park11: "Ueno Park",
park12: "Ueno Park",
park13: "Ueno Park",
park14: "Ueno Park",
park15: "Ueno Park",
park16: "Ueno Park",
Expand Down Expand Up @@ -129,13 +128,6 @@ export const UenoParkImages: React.FunctionComponent<ExtraImageProps & { image:
}
}
}
park13: file(relativePath: { eq: "asia/japan/tokyo/ueno-park/ueno-park13.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
...GatsbyImageSharpFluid
}
}
}
park14: file(relativePath: { eq: "asia/japan/tokyo/ueno-park/ueno-park14.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/images/asia/japan/transports-in-japan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const TransportsInJapanImages: React.FunctionComponent<ExtraImageProps &
query {
taxi: file(relativePath: { eq: "asia/japan/transports-in-japan/transports-in-japan-taxi.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
...GatsbyImageSharpFluid
}
}
Expand All @@ -51,7 +51,7 @@ export const TransportsInJapanImages: React.FunctionComponent<ExtraImageProps &
}
boat: file(relativePath: { eq: "asia/japan/transports-in-japan/transports-in-japan-boat.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
...GatsbyImageSharpFluid
}
}
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/asia/japan/tokyo/ueno-park/ueno-park12.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/locales/en/asia/japan/transports-in-japan.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"part11": "The times shown are estimations. They are likely to vary according to the days, the months, the weather conditions, and anything else. Prices may change as well. We give you an estimation, so it's better to check the information beforehand.",
"part12": "For cruises:",
"part13": "Biwa Lake ↠ [Website link](https://www.biwakokisen.co.jp/en/index.html)",
"part14": "Towada Lake ↠ [PDF link](http://www.toutetsu.co.jp/ship/pamphlet/english.pdf) - Website in japanese",
"part14": "Towada Lake ↠ [PDF link](https://www.toutetsu.co.jp/ship/leaflet/lake_towada_cruise_english.pdf) - Website in japanese",
"part15": "Ashinoko Lake ↠ [Website link](https://www.hakone-kankosen.co.jp/foreign/en/)",
"part16": "Fujigoko (the region of the 5 Great Lakes) ↠ [Website link](https://www.fujigokokisen.jp/contents/en/)"
},
Expand Down
2 changes: 1 addition & 1 deletion src/locales/fr/asia/japan/transports-in-japan.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"part11": "Les durées indiquées sont des estimations. Elles sont susceptibles de varier en fonction des jours, des mois, des conditions météorologiques et de tout autre élément. Les prix peuvent être amenés à changer également, nous vous donnons ici un ordre d’idée, il est donc nécessaire de vérifier à l’avance ces informations.",
"part12": "Pour les croisières :",
"part13": "Lac Biwa ↠ [Lien du site](https://www.biwakokisen.co.jp/en/index.html)",
"part14": "Lac Towada ↠ [Lien du PDF](http://www.toutetsu.co.jp/ship/pamphlet/english.pdf) - site en japonais",
"part14": "Lac Towada ↠ [Lien du PDF](https://www.toutetsu.co.jp/ship/leaflet/lake_towada_cruise_english.pdf) - site en japonais",
"part15": "Lake Ashinoko ↠ [Lien du site](https://www.hakone-kankosen.co.jp/foreign/en/)",
"part16": "Fujigoko (le territoire des 5 lacs) ↠ [Lien du site](https://www.fujigokokisen.jp/contents/en/)"
},
Expand Down
10 changes: 0 additions & 10 deletions src/pages/asia/japan/kyoto/fushimi-inari-taisha.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import { FushimiInariTaishaImages } from "../../../../components/images/asia/jap
import { BookingCard, BookingWarning } from "../../../../components/core/booking"
import urbanKyoto from "../../../../images/asia/japan/kyoto/fushimi/urban-kyoto-kyoto.jpg"
import yamashinaHotel from "../../../../images/asia/japan/kyoto/fushimi/kyoto-yamashina-hotel-sanraku.jpg"
import jingTing from "../../../../images/asia/japan/kyoto/fushimi/jing-ting-wu-yu-wu-song.jpg"
import { BookingGygCardContainer } from "../../../../components/layout/layout"

const namespace = "asia/japan/kyoto/fushimi-inari-taisha"
Expand Down Expand Up @@ -123,15 +122,6 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
people={2}
kind="hotel"
/>
<BookingCard
hotel="jp/jing-ting-wu-yu-wu-song"
title="京町屋 御屋・松"
image={jingTing}
note="9,4"
price={230}
people={2}
kind="flat"
/>
</BookingGygCardContainer>
<BookingWarning>{t("where-to-stay.part4")}</BookingWarning>
<p>{t("where-to-stay.part5")}</p>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/asia/japan/kyoto/kinkakuji.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
kind="hotel"
/>
<BookingCard
hotel="jp/mitsui-garden-kyoto-sanjo"
hotel="jp/san-jing-gadenhoterujing-du-san-tiao-puremia"
title="Mitsui Garden Hotel Kyoto Sanjo"
image={mitsuiGarden}
note="8,5"
Expand Down
10 changes: 1 addition & 9 deletions src/pages/asia/japan/tokyo/shibuya-district.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ import shibuyaExcelTokyo from "../../../../images/asia/japan/tokyo/shibuya-distr
import ceruleanTowerTokyo from "../../../../images/asia/japan/tokyo/shibuya-district/cerulean-tower-tokyu.jpg"
import { BookingGygCardContainer } from "../../../../components/layout/layout"
import { ShibuyaDistrictImages } from "../../../../components/images/asia/japan/tokyo/shibuya-district"
import { ExternalLinkNotUnderlined } from "../../../../components/core/links/link"
import { buildPixabayUrl } from "../../../../utils"

const namespace = "asia/japan/tokyo/shibuya-district"
const id = "shibuya-district"
Expand Down Expand Up @@ -226,13 +224,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
<ImageAsPortrait>
<ShibuyaDistrictImages image="takeshitaStreet9" />
</ImageAsPortrait>
<ImageAsLandscape
credit={
<ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("users/kirahoffmann-1855684")}>
kirahoffmann
</ExternalLinkNotUnderlined>
}
>
<ImageAsLandscape>
<ShibuyaDistrictImages image="takeshitaStreet10" />
</ImageAsLandscape>
<ImageAsPortrait>
Expand Down
25 changes: 3 additions & 22 deletions src/pages/asia/japan/tokyo/ueno-park.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ import {
} from "../../../../components/images/layout"
import { SharedCardJapanImages } from "../../../../components/images/asia/japan/shared-card-japan-images"
import { UenoParkImages } from "../../../../components/images/asia/japan/tokyo/ueno-park"
import { ExternalLinkNotUnderlined } from "../../../../components/core/links/link"
import { buildPixabayUrl } from "../../../../utils"
import { BookingCard, BookingWarning } from "../../../../components/core/booking"
import { BookingGygCardContainer } from "../../../../components/layout/layout"
import keiseiHotel from "../../../../images/asia/japan/tokyo/ueno-park/apa-hotel-keisei-ueno-ekimae.jpg"
Expand Down Expand Up @@ -186,26 +184,9 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
</GroupOfImages>
<p>{t("visit.part9")}</p>
<p>{t("visit.part10")}</p>
<GroupOfImages>
<ImageAsLandscape
credit={
<ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("users/yui_ma-406082")}>
yui_ma
</ExternalLinkNotUnderlined>
}
>
<UenoParkImages image="park12" />
</ImageAsLandscape>
<ImageAsLandscape
credit={
<ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("users/yui_ma-406082")}>
yui_ma
</ExternalLinkNotUnderlined>
}
>
<UenoParkImages image="park13" />
</ImageAsLandscape>
</GroupOfImages>
<ImageAsLandscape>
<UenoParkImages image="park12" />
</ImageAsLandscape>
<p>{t("visit.part11")}</p>
<GroupOfImages>
<ImageAsLandscape>
Expand Down
26 changes: 4 additions & 22 deletions src/pages/asia/japan/transports-in-japan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
} from "../../../components/images/layout"
import { SharedCardJapanImages } from "../../../components/images/asia/japan/shared-card-japan-images"
import { ExternalLinkNotUnderlined } from "../../../components/core/links/link"
import { buildPixabayUrl, price } from "../../../utils"
import { price } from "../../../utils"
import { TransportsInJapanImages } from "../../../components/images/asia/japan/transports-in-japan"
import TokyoIslands from "../../../images/asia/japan/transports-in-japan/transports-in-japan-tokyo-islands.jpg"
import OkinawaMap from "../../../images/asia/japan/transports-in-japan/transports-in-japan-okinawa-map.jpg"
Expand Down Expand Up @@ -163,13 +163,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
<section>
<JapanHeadline>{buildTitle(t("boat.title"))}</JapanHeadline>
<Divider />
<ImageAsLandscape
credit={
<ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("nick115-10240673")}>
Nick115
</ExternalLinkNotUnderlined>
}
>
<ImageAsLandscape>
<TransportsInJapanImages image="boat" />
</ImageAsLandscape>
<Information title={t("plane.information.title")}>
Expand Down Expand Up @@ -420,13 +414,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
<section>
<JapanHeadline>{buildTitle(t("taxi.title"))}</JapanHeadline>
<Divider />
<ImageAsLandscape
credit={
<ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("rmsep4-12979322")}>
rmsep4
</ExternalLinkNotUnderlined>
}
>
<ImageAsLandscape>
<TransportsInJapanImages image="taxi" />
</ImageAsLandscape>
<Information title={t("taxi.information.title")}>
Expand Down Expand Up @@ -546,13 +534,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
<section>
<JapanHeadline>{buildTitle(t("bike.title"))}</JapanHeadline>
<Divider />
<ImageAsLandscape
credit={
<ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("michelleraponi-165491")}>
michelleraponi
</ExternalLinkNotUnderlined>
}
>
<ImageAsLandscape>
<TransportsInJapanImages image="bike" />
</ImageAsLandscape>
<Information title={t("bike.information.title")}>
Expand Down