Skip to content

Commit

Permalink
update articles part 2 and remove covid (#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nebulis authored Feb 20, 2024
1 parent b57c676 commit d45c7f1
Show file tree
Hide file tree
Showing 24 changed files with 25 additions and 85 deletions.
20 changes: 0 additions & 20 deletions src/components/core/section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -300,26 +300,6 @@ export const HomeSubSection: FunctionComponent = ({ children }) => (
{children}
</h3>
)
export const HighLight = styled.span`
font-weight: bold;
`

const covidStyle = css`
.covid-title {
background-color: rgba(245, 101, 101);
}
.covid-content {
background-color: rgba(255, 245, 245); // from tailwind
color: rgba(197, 48, 48);
border-color: rgba(252, 129, 129);
}
`
export const Covid: FunctionComponent = ({ children }) => (
<div role="alert" css={covidStyle} className="mb2 mt2">
<div className="covid-title white b pv2 ph3 mh3 br2 br--top ">Covid-19</div>
<div className="covid-content pv2 ph3 mh3 ba bt-0 br2 br--bottom ">{children}</div>
</div>
)

const noteStyle = css`
font-size: 0.8rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const TransportVietnamImages: React.FunctionComponent<ExtraImageProps & {
query {
plane: file(relativePath: { eq: "asia/vietnam/transport/transport-vietnam-plane.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
...GatsbyImageSharpFluid
}
}
Expand Down Expand Up @@ -107,7 +107,7 @@ export const TransportVietnamImages: React.FunctionComponent<ExtraImageProps & {
}
moto: file(relativePath: { eq: "asia/vietnam/transport/transport-vietnam-moto.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
...GatsbyImageSharpFluid
}
}
Expand Down
Binary file modified src/images/asia/vietnam/transport/transport-vietnam-moto.jpg
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/vietnam/transport/transport-vietnam-plane.jpg
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/vietnam/transport/transport-vietnam-train.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/locales/en/asia/japan/prepare-japan.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"index": "Index",
"visa": {
"title": "Visa",
"part1": "Please note that Japan has suspended the entry of all foreigners, until further notice to limit the spread of COVID-19. We will let you know once exemption are lifted.",
"part2": "To travel to Japan as a tourist, you have two main possibilities:",
"part3": "A short-stay ↠ of less than 90 days",
"part4": "A long-term stay ↠ of more than 90 days",
Expand Down
1 change: 0 additions & 1 deletion src/locales/en/asia/vietnam/prepare.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"title": "Visa",
"duration": "Duration",
"country": "Country",
"part1": "Please note that Vietnam has suspended the entry of all foreigners since March 22, 2020, until further notice to limit the spread of COVID-19. We will let you know once exemption are lifted.",
"part2": "There are three different ways to get a visa:",
"part3": "#E-visa:#",
"part4": "Online visa that you can apply on [the official website](https://evisa.xuatnhapcanh.gov.vn/web/guest/home).",
Expand Down
3 changes: 1 addition & 2 deletions src/locales/en/asia/vietnam/southern-vietnam/can-tho.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"part3": "If you find a boat by yourself from Ninh Kieu wharf, it will cost you around 250,000 VND for two people (12$). That's usually the highest price that you should pay, up to you to negotiate.",
"part4": "We booked via our homestay: Floating market, breakfast on site, rice paper factory, local pancakes and tropical fruits all for #840,000 VND ($40 for two people)#.",
"part5": "It is best to book from your hotel or manage on your own. On the other hand, if you come from Ho Chi Minh City, many multi-day excursions will allow you to visit Can Tho and its floating market.",
"part6": "You can compare more tours on [GetYourGuide](gyg:s/?q=can%20tho) or [Tripadvisor](tripadvisor:Attractions-g303942-Activities-c42-Can_Tho_Mekong_Delta.html).",
"part7": "Because of the Covid, the cheapest tours, public tours with more than 15 people, seem no longer available."
"part6": "You can compare more tours on [GetYourGuide](gyg:s/?q=can%20tho) or [Tripadvisor](tripadvisor:Attractions-g303942-Activities-c42-Can_Tho_Mekong_Delta.html)."
},
"where-to-stay": {
"title": "Where to stay in Can Tho ?",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"part1": "The price varies depending on your mode of transport. If you book a guided tour it will also depends on the agency.",
"part2": "If you reach the tunnels by yourself, you will have to pay the entrance ticket. We do not know exactly the price, we have found different prices, from 90,000 VND to 120,000 VND depending on the site. Expect to pay #120,000 VND#, which is around $6.",
"part3": "Here you will find three suggested tours to do. We booked the first one, and we found the two others interesting.",
"part4": "You can compare more tours on [GetYourGuide](gyg:s/?q=cu%20chi%20tunnels) or [Tripadvisor](tripadvisor:Attraction_Review-g293925-d17582591-Reviews-Cu_Chi_Tunnels_Tours-Ho_Chi_Minh_City.html).",
"part5": "Because of the Covid, the cheapest tours, public tours with more than 15 people, seem no longer available."
"part4": "You can compare more tours on [GetYourGuide](gyg:s/?q=cu%20chi%20tunnels) or [Tripadvisor](tripadvisor:Attraction_Review-g293925-d17582591-Reviews-Cu_Chi_Tunnels_Tours-Ho_Chi_Minh_City.html)."
},
"where-to-stay": {
"part1": "We advise you to book a hotel in Ho Chi Minh City.",
Expand Down
5 changes: 3 additions & 2 deletions src/locales/en/asia/vietnam/southern-vietnam/discover.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
"part2": "You will be amazed by all #those scooters# passing around every second near you. It's like a parade. It's not easy to break through but do not be afraid to force your way. It's a bit like that here. Hô Chi Minh City is very dynamic to say the least.",
"part3": "If you have time to visit the city, take the opportunity to visit #the District 1#. You can appreciate many French constructions making this district somewhat appealing: the Cathedral - based on Notre Dame de Paris -, the Central Post Office or even the Town Hall.",
"part4": "Day or night, take a walk, enjoy your time, you will always discover something.",
"part5": "From local and authentic markets at every street corner, to the huge popular #Ben Thanh market# , also built by the French and located in the heart of the city or even the #Binh Tay market# in the Chinatown district, you only are spoilt for choice.",
"part6": "Talking about #Chinatown#, we found pictures of one dragon statue and we clearly wanted to take a look. What a disappointment. The biggest during our trip. It was supposed to be shiny gold but what we found was completely different."
"part5": "Beautiful hornbill in Ho Chi Minh City.",
"part6": "From local and authentic markets at every street corner, to the huge popular #Ben Thanh market# , also built by the French and located in the heart of the city or even the #Binh Tay market# in the Chinatown district, you only are spoilt for choice.",
"part7": "Talking about #Chinatown#, we found pictures of one dragon statue and we clearly wanted to take a look. What a disappointment. The biggest during our trip. It was supposed to be shiny gold but what we found was completely different."
},
"visit3": {
"title": "Mekong River Delta",
Expand Down
3 changes: 1 addition & 2 deletions src/locales/en/asia/vietnam/southern-vietnam/my-tho.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"part3": "More information about [Transports in Vietnam](transport-vietnam).",
"part4": "We opted for a [one day trip](gyg:activity/ho-chi-minh-city-l272/upper-mekong-river-full-day-tour-t69167) with guide. We came across a lot of tourist buses on the road. However once we reached Mỹ Tho, we didn't see any tourists groups until the end of the day. Departure at 7h30 - Return at 18h.",
"part5": "Here you will find three suggested tours to do. We booked the first one, and we found the two others interesting.",
"part6": "You can compare more tours on [GetYourGuide](gyg:s/?q=my%20tho) or [Tripadvisor](tripadvisor:Attractions-g469417-Activities-My_Tho_Tien_Giang_Province_Mekong_Delta.html).",
"part7": "Because of the Covid, the cheapest tours, public tours with more than 15 people, seem no longer available."
"part6": "You can compare more tours on [GetYourGuide](gyg:s/?q=my%20tho) or [Tripadvisor](tripadvisor:Attractions-g469417-Activities-My_Tho_Tien_Giang_Province_Mekong_Delta.html)."
},
"how-long": {
"part1": "It all depends on how you got there.",
Expand Down
1 change: 0 additions & 1 deletion src/locales/fr/asia/japan/prepare-japan.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"index": "Sommaire",
"visa": {
"title": "Visa",
"part1": "À noter qu’à l’heure actuelle, toutes les démarches pour demander un visa sont annulées à cause du Covid, on vous tiendra informé dès que ce ne sera plus le cas et si des changements sont à prévoir sur les prix ou les exemptions de visas.",
"part2": "Pour voyager au Japon en tant que touriste, vous avez deux grandes possibilités :",
"part3": "Un séjour court ↠ moins de 90 jours",
"part4": "Un séjour longue durée ↠ plus de 90 jours",
Expand Down
1 change: 0 additions & 1 deletion src/locales/fr/asia/vietnam/prepare.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"title": "Visa",
"duration": "Durée",
"country": "Pays",
"part1": "À noter qu’à l’heure actuelle, toutes les démarches pour demander un visa sont annulées à cause du Covid, on vous tiendra informé dès que ce ne sera plus le cas et si des changements sont à prévoir sur les prix ou les exemptions de visa.",
"part2": "Vous avez trois façons de demander un visa :",
"part3": "#E-visa :#",
"part4": "Il s’obtient sur internet. Vous pouvez faire la demande sur [le site officiel](https://evisa.xuatnhapcanh.gov.vn/web/guest/home).",
Expand Down
3 changes: 1 addition & 2 deletions src/locales/fr/asia/vietnam/southern-vietnam/can-tho.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"part3": "Si vous prenez une barque vous-même à partir du quai Ninh Kieu, prévoyez au moins 250 000 VND pour deux (9 €), on vous donne là la plus grosse fourchette de prix, à vous de négocier.",
"part4": "De notre côté, nous avons réservé via notre homestay : Marché flottant, petit déjeuner sur place, fabrique de feuilles de riz, dégustation de crêpes et fruits tropicaux le tout pour #840 000 VND (30 € pour deux)#.",
"part5": "Le mieux est quand même de réserver depuis votre hôtel ou de gérer par vos propres moyens si vous êtes sur place, par contre si vous venez de Ho Chi Minh-Ville, il existe de nombreuses excursions de plusieurs jours qui vous permettront de réserver pour Can Tho et son marché flottant également.",
"part6": "Vous pouvez comparer d’autres offres par vous-même sur [GetYourGuide](gyg:s/?q=can%20tho) ou [Tripadvisor](tripadvisor:Attractions-g303942-Activities-c42-Can_Tho_Mekong_Delta.html).",
"part7": "A cause du Covid, les tours les moins chers qui correspondent au tour public avec plus de 15 personnes ne semblent plus disponibles actuellement."
"part6": "Vous pouvez comparer d’autres offres par vous-même sur [GetYourGuide](gyg:s/?q=can%20tho) ou [Tripadvisor](tripadvisor:Attractions-g303942-Activities-c42-Can_Tho_Mekong_Delta.html)."
},
"where-to-stay": {
"title": "Où dormir à Can Tho ?",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"part1": "Le prix varie en fonction du moyen avec lequel vous y allez et si vous prenez un tour tout dépendra également de l’agence que vous prenez.",
"part2": "Pour le prix d’entrée sur le site si vous y allez par vous même, on ne sait pas exactement, on voit de tout, ça passe de 90 000 VND à 120 000 VND entre chaque site donc on ne préfère pas dire de bêtise. Prévoyez #120 000 VND#, ça équivaut à 4€ environ.",
"part3": "Voici 3 propositions d’excursions à faire, avec en premier celle que nous avons réservée et deux autres qui nous avaient également tapé dans l'œil.",
"part4": "Vous pouvez comparer d’autres offres par vous-même sur [GetYourGuide](gyg:s/?q=cu%20chi%20tunnels) ou [Tripadvisor](tripadvisor:Attraction_Review-g293925-d17582591-Reviews-Cu_Chi_Tunnels_Tours-Ho_Chi_Minh_City.html).",
"part5": "A cause du Covid, les tours les moins chers qui correspondent au tour public avec plus de 15 personnes ne semblent plus disponibles actuellement."
"part4": "Vous pouvez comparer d’autres offres par vous-même sur [GetYourGuide](gyg:s/?q=cu%20chi%20tunnels) ou [Tripadvisor](tripadvisor:Attraction_Review-g293925-d17582591-Reviews-Cu_Chi_Tunnels_Tours-Ho_Chi_Minh_City.html)."
},
"where-to-stay": {
"part1": "On vous conseille très clairement de prendre un hôtel sur Hô Chi Minh-Ville.",
Expand Down
5 changes: 3 additions & 2 deletions src/locales/fr/asia/vietnam/southern-vietnam/discover.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
"part2": "Vous serez impressionnés par le #défilé de deux roues#, qui passent chaque seconde devant vous, pas facile de se frayer un chemin mais n’ayez pas peur de forcer le passage. C’est un peu comme ça ici, on ne dit pas que Hô Chi Minh-Ville est dynamique pour rien.",
"part3": "Si vous avez le temps de visiter la ville profitez-en pour #visiter le District 1#, vous pourrez y admirer de nombreuses constructions françaises qui font le charme de ce district: la cathédrale par exemple est basée sur la construction de Notre Dame de Paris, vous pourrez admirez également la Poste Centrale ou bien encore l’Hôtel de Ville.",
"part4": "De jour comme de nuit, promenez-vous, profitez, vous découvrirez de toute façon toujours quelque chose.",
"part5": "Entre les petits marchés authentiques au coin des rues, l’immense #marché Ben Thanh# très prisé, lui aussi construit par des Français et situé au cœur de la ville ou bien encore le #marché Binh Tay# dans le quartier de Chinatown, vous n’avez que l’embarras du choix.",
"part6": "Tiens en parlant de #Chinatown#, nous avions une statue de dragon qui nous avait clairement fait de l'œil quand nous avions vu des photos sur internet. Énorme déception lors de notre visite, elle était censée être d'un or flamboyant mais nous n’avons pas vu la même chose de nos propres yeux."
"part5": "Magnifique calao en plein centre ville de Hô Chi Minh-Ville.",
"part6": "Entre les petits marchés authentiques au coin des rues, l’immense #marché Ben Thanh# très prisé, lui aussi construit par des Français et situé au cœur de la ville ou bien encore le #marché Binh Tay# dans le quartier de Chinatown, vous n’avez que l’embarras du choix.",
"part7": "Tiens en parlant de #Chinatown#, nous avions une statue de dragon qui nous avait clairement fait de l'œil quand nous avions vu des photos sur internet. Énorme déception lors de notre visite, elle était censée être d'un or flamboyant mais nous n’avons pas vu la même chose de nos propres yeux."
},
"visit3": {
"title": "Le Delta du Mékong",
Expand Down
3 changes: 1 addition & 2 deletions src/locales/fr/asia/vietnam/southern-vietnam/my-tho.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"part3": "En savoir plus sur [Les Transports au Vietnam](transport-vietnam).",
"part4": "De notre côté nous avons opté pour une [excursion d’une journée](gyg:activity/ho-chi-minh-city-l272/upper-mekong-river-full-day-tour-t69167) avec guide. Nous avons croisé certes beaucoup de bus de touristes sur la route néanmoins une fois à notre bateau à Mỹ Tho et ça jusqu’à notre départ nous n’avons plus jamais croisé ne serait-ce qu’un groupe. Départ 7h30 - Retour 18h.",
"part5": "Voici 3 propositions d’excursions à faire, avec en premier celle que nous avons réservée et deux autres qui nous avaient également tapé dans l'œil.",
"part6": "Vous pouvez comparer d’autres offres par vous-même sur [GetYourGuide](gyg:s/?q=my%20tho) ou [Tripadvisor](tripadvisor:Attractions-g469417-Activities-My_Tho_Tien_Giang_Province_Mekong_Delta.html).",
"part7": "A cause du Covid, les tours les moins chers qui correspondent au tour public avec plus de 15 personnes ne semblent plus disponibles actuellement."
"part6": "Vous pouvez comparer d’autres offres par vous-même sur [GetYourGuide](gyg:s/?q=my%20tho) ou [Tripadvisor](tripadvisor:Attractions-g469417-Activities-My_Tho_Tien_Giang_Province_Mekong_Delta.html)."
},
"how-long": {
"part1": "Tout dépend du moyen avec lequel vous y êtes allé.",
Expand Down
4 changes: 1 addition & 3 deletions src/pages/asia/japan/prepare-japan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
} from "../../../components/core/japan/japan"
import {
Baggage,
Covid,
FewWords,
Health,
How,
Expand Down Expand Up @@ -158,7 +157,7 @@ const VisaHeaderRow = styled.tr`
// TODO sous titre pas les meme
// TODO dans opinion les fleches sont pas soulignes au vietnam
const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
const { development, covid } = useContext(ApplicationContext)
const { development } = useContext(ApplicationContext)
const { t, i18n } = useCustomTranslation([namespace, "common"])
const title = t(`common:country.japan.card.prepare`)
const transportLinkPublished = development || getLink("transports-in-japan").published
Expand Down Expand Up @@ -242,7 +241,6 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
</MenuArticle>
<Divider />
<Visa id="visa">
{covid && <Covid>{t("visa.part1")}</Covid>}
<ImageAsLandscape>
<PrepareJapanImages image="visa" />
</ImageAsLandscape>
Expand Down
4 changes: 1 addition & 3 deletions src/pages/asia/vietnam/prepare.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { ImageAsLandscape, ImageAsPortrait } from "../../../components/images/la
import { FaBriefcaseMedical, FaLaptop, FaShoppingBag, FaTshirt } from "react-icons/fa"
import {
Baggage,
Covid,
FewWords,
Health,
How,
Expand Down Expand Up @@ -493,7 +492,7 @@ const namespace = "asia/vietnam/prepare"
i18n.addResourceBundle("fr", namespace, translationFr)
i18n.addResourceBundle("en", namespace, translationEn)
const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
const { development, covid } = useContext(ApplicationContext)
const { development } = useContext(ApplicationContext)
const { t, i18n } = useCustomTranslation([namespace, "common"])
const title = t("common:country.vietnam.card.prepare")
const foodLinkPublished = development || getLink("food-vietnam").published
Expand Down Expand Up @@ -576,7 +575,6 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
</MenuArticle>
<Divider />
<Visa id="visa">
{covid && <Covid>{t("section1.part1")}</Covid>}
<ImageAsLandscape>
<PrepareVietnamImages image="visa" />
</ImageAsLandscape>
Expand Down
5 changes: 0 additions & 5 deletions src/pages/asia/vietnam/southern-vietnam/can-tho.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import translationFr from "../../../../locales/fr/asia/vietnam/southern-vietnam/
import translationEn from "../../../../locales/en/asia/vietnam/southern-vietnam/can-tho.json"
import { VietnamBlogLayout, VietnamHeadline } from "../../../../components/core/asia/vietnam/vietnam"
import {
Covid,
How,
HowLong,
HowMuch,
Expand All @@ -35,8 +34,6 @@ import { CanThoImages } from "../../../../components/images/asia/vietnam/souther
import styled from "@emotion/styled"
import { Title } from "../../../../components/core/title"
import { Quote } from "../../../../components/core/quote"
import { ApplicationContext } from "../../../../components/application"
import { useContext } from "react"
import { css } from "@emotion/react"
import { GetYourGuideCard } from "../../../../components/core/get-your-guide"
import { BookingGygCardContainer } from "../../../../components/layout/layout"
Expand All @@ -55,7 +52,6 @@ const InsideQuote = styled.p`
`

const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
const { covid } = useContext(ApplicationContext)
const { t, i18n } = useCustomTranslation([namespace, "common"])
const title = t(`common:country.vietnam.card.${id}`)
return (
Expand Down Expand Up @@ -150,7 +146,6 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
>
{t("how-much.part6")}
</p>
{covid && <Covid>{t("how-much.part7")}</Covid>}
</HowMuch>
<WhereToStay title={t("where-to-stay.title")}>
<p>{t("where-to-stay.part1")}</p>
Expand Down
Loading

0 comments on commit d45c7f1

Please sign in to comment.