Skip to content

Commit

Permalink
Merge pull request #533 from pycontw/feat/venue-2024
Browse files Browse the repository at this point in the history 
 feat(venue): update venue i18n string and svg to 2024
  • Loading branch information
@SivanYeh
SivanYeh authored Jun 24, 2024
2 parents 5a22b61 + 7d9b6ad commit 857e457
Show file tree
Hide file tree
Showing 15 changed files with 501 additions and 380 deletions.
54 changes: 28 additions & 26 deletions components/venue/VenueDriveTab.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,25 @@
{{ $t('parkingInfo.car.title') }}
</h5>
</div>
<i18n path="parkingInfo.car.description" tag="p">
<i18n
path="parkingInfo.car.description"
tag="p"
class="whitespace-pre-line"
>
<a
:href="parkingPlaceCarLink"
class="text-pink-500"
class="text-pink-500 underline"
target="_blank"
>
{{ $t('parkingInfo.car.parkingPlace') }}
</a>
<a
:href="parkingPlaceCar2Link"
class="text-pink-500 underline"
target="_blank"
>
{{ $t('parkingInfo.car.parkingPlace2') }}
</a>
</i18n>
</div>
<div class="md:flex-1">
Expand Down Expand Up @@ -89,23 +100,16 @@
>{{ $t('parkingInfo.motor.descriptionLinkTitle3') }}</a
>
</i18n>

<i18n class="pt-10 md:pt-0" path="parkingInfo.moreInfo" tag="p">
<a
:href="parkingMoreInfoLink[0]"
class="text-pink-500"
target="_blank"
>{{ $t('parkingInfo.moreInfoLinkTitle') }}</a
>
<a
:href="parkingMoreInfoLink[1]"
class="text-pink-500"
target="_blank"
>{{ $t('parkingInfo.moreInfoLinkTitle2') }}</a
>
</i18n>
</div>
</div>
<i18n class="pt-10" path="parkingInfo.moreInfo" tag="p">
<a
:href="parkingMoreInfoLink[0]"
class="text-pink-500 underline"
target="_blank"
>{{ $t('parkingInfo.moreInfoLinkTitle') }}</a
>
</i18n>
</div>
</template>

Expand All @@ -119,18 +123,16 @@ export default {
components: { VenueDivision },
data() {
return {
carDestinationLink: 'https://goo.gl/maps/HfVQkZULCWNs4tfz6',
parkingPlaceCarLink:
'https://www.google.com/maps/place/%E4%B8%AD%E5%A4%AE%E7%A0%94%E7%A9%B6%E9%99%A2%E4%BA%BA%E6%96%87%E7%A4%BE%E6%9C%83%E7%A7%91%E5%AD%B8%E9%A4%A8/@25.0409679,121.6068671,17z/data=!4m7!3m6!1s0x3442ab46b3aaaaab:0x6ad0b8243ddc70ef!8m2!3d25.0409679!4d121.6113732!15sCiTkuK3lpK7noJTnqbbpmaLkurrmlofnpL7mnIPnp5HlrbjppKhaLCIq5Lit5aSuIOeglOeptiDpmaIg5Lq65paHIOekvuacgyDnp5Hlrbgg6aSokgEGc2Nob29s4AEA!16s%2Fg%2F11f50wylmj?entry=tts&shorturl=1',
carDestinationLink: 'https://maps.app.goo.gl/hrRwqEmNmLBpZUHx6',
parkingPlaceCarLink: 'https://maps.app.goo.gl/vYTZGnDHgTViKsL47',
parkingPlaceCar2Link: 'https://maps.app.goo.gl/BFgMmi6MqgjY3FbZA',
parkingPlaceMotorLink: [
'https://goo.gl/maps/DnFQvhu8QiCvRgYE7',
'https://goo.gl/maps/BaJw3ufc4rfqz5wh8',
'https://goo.gl/maps/EZ4RDMZTPYwFxAvh9',
'https://maps.app.goo.gl/PpmgUFNRgFi3Cm3Y9',
'https://maps.app.goo.gl/kxGrgPbr9EXTvqiQ6',
'https://maps.app.goo.gl/SzU75zJ1c9wrrUug9',
],
parkingMoreInfoLink: [
'https://dga.sinica.edu.tw/posts/78705',
'https://dga.sinica.edu.tw/pages/1442',
'https://www.nstm.gov.tw/Reference/VisitorInformation/TrafficInfo.htm',
],
}
},
Expand Down
120 changes: 18 additions & 102 deletions components/venue/VenuePublicTransporterTab.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@
target="_blank"
>{{ $t('publicTransport.uBike.link.description1') }}</a
>
<a
:href="publicTransportUBikeLink[1]"
class="text-pink-500 underline"
target="_blank"
>{{ $t('publicTransport.uBike.link.description2') }}</a
>
<br />
</i18n>
</div>
Expand Down Expand Up @@ -88,96 +82,29 @@
</div>
<div class="grid grid-cols-1 md:grid-cols-2 md:gap-10">
<div>
<i18n
path="publicTransportInfo.info"
tag="p"
class="pb-3 md:pb-0"
>
<a
:href="publicTransportBusLink"
class="text-pink-500"
target="_blank"
>{{ $t('publicTransportInfo.publicTransport') }}</a
>
</i18n>
</div>
<div>
<i18n path="publicTransportInfo.1843infoTitle">
<a
:href="publicTransportBusLink"
class="text-pink-500"
target="_blank"
>{{ $t('publicTransportInfo.publicTransport') }}</a
>
</i18n>

<ul class="ml-[19px] list-outside list-disc pb-3 md:pb-0">
<li>
{{ $t('publicTransportInfo.description1') }}
</li>
</ul>
</div>
<div>
<ul class="ml-[19px] list-outside list-disc pb-3 md:pb-0">
<li>
{{ $t('publicTransportInfo.description2.title') }}

<ul class="ml-[19px] list-outside list-disc">
<li>
{{
$t(
'publicTransportInfo.description2.info1',
)
}}
</li>
<li>
{{
$t(
'publicTransportInfo.description2.info2',
)
}}
</li>
</ul>
</li>
<li>
{{ $t('publicTransportInfo.description3.title') }}
<ul class="ml-[19px] list-outside list-disc">
<li>
{{
$t(
'publicTransportInfo.description3.info1',
)
}}
</li>
<li>
{{
$t(
'publicTransportInfo.description3.info2',
)
}}
</li>
</ul>
</li>
<li>
{{ $t('publicTransportInfo.description4') }}
</li>
<li>
{{ $t('publicTransportInfo.description5') }}
{{ $t('publicTransportInfo.description2') }}
</li>
</ul>
<i18n path="publicTransportInfo.moreInfo.title">
<a
:href="publicTransportMoreInfoLink[0]"
class="text-pink-500"
target="_blank"
>{{ $t('publicTransportInfo.moreInfo.info1') }}</a
>
<a
:href="publicTransportMoreInfoLink[1]"
class="text-pink-500"
target="_blank"
>{{ $t('publicTransportInfo.moreInfo.info2') }}</a
>
</i18n>
</div>
</div>
</div>
<i18n class="pt-10" path="publicTransportInfo.moreInfo.title" tag="p">
<a
:href="publicTransportMoreInfoLink[0]"
class="text-pink-500"
target="_blank"
>{{ $t('publicTransportInfo.moreInfo.info1') }}</a
>
</i18n>
</div>
</template>

Expand All @@ -192,52 +119,41 @@ export default {
components: { VenueDivision },
data() {
return {
publicTransportBusLink:
'https://www.taiwanbus.tw/eBUSPage/Query/QueryResult.aspx?rno=18430',
publicTransportUBikeLink: [
'https://www.youbike.com.tw/region/taipei/stations/',
'https://www.opencyclemap.org/?zoom=16&lat=25.04974&lon=121.61213&layers=B000',
],
publicTransportMoreInfoLink: [
'https://dga.sinica.edu.tw/pages/1349',
'https://www.taoyuan-airport.com/transportation?lang=ch',
'https://www.nstm.gov.tw/Reference/VisitorInformation/TrafficInfo.htm',
],
uBikeParkInfo: [
{
i18nPath: 'publicTransport.uBikePark.parkingInfo.park1',
link: '',
link: 'https://maps.app.goo.gl/dVtGS7SicBGKs8Uw9',
i18nLinkPath: this.$t(
'publicTransport.uBikePark.parkPlace.park1',
),
},
{
i18nPath: 'publicTransport.uBikePark.parkingInfo.park2',
link: '',
link: 'https://maps.app.goo.gl/qdDmHFTVtVxadus76',
i18nLinkPath: this.$t(
'publicTransport.uBikePark.parkPlace.park2',
),
},
{
i18nPath: 'publicTransport.uBikePark.parkingInfo.park3',
link: '',
link: 'https://maps.app.goo.gl/xFjq5akYqWq5jpnf6',
i18nLinkPath: this.$t(
'publicTransport.uBikePark.parkPlace.park3',
),
},
{
i18nPath: 'publicTransport.uBikePark.parkingInfo.park4',
link: '',
link: 'https://maps.app.goo.gl/szJsnmgTjk5yR1Y98',
i18nLinkPath: this.$t(
'publicTransport.uBikePark.parkPlace.park4',
),
},
{
i18nPath: 'publicTransport.uBikePark.parkingInfo.park5',
link: '',
i18nLinkPath: this.$t(
'publicTransport.uBikePark.parkPlace.park5',
),
},
],
}
},
Expand Down
Loading

0 comments on commit 857e457

Please sign in to comment.