diff --git a/components/core/header/Header.vue b/components/core/header/Header.vue index 6494a6088f..4d86d51a0f 100644 --- a/components/core/header/Header.vue +++ b/components/core/header/Header.vue @@ -25,8 +25,8 @@ import HomeIcon from './HomeIcon' import NavBar from './nav-bar/NavBar' import NavBarHamburger from './nav-bar/NavBarHamburger' -import ScrollableNavBar from './nav-bar/ScrollableNavBar' import LocaleSwitch from './locale-switch/LocaleSwitch' +import ScrollableNavBar from './nav-bar/ScrollableNavBar' export default { name: 'CoreHeader', components: { @@ -47,7 +47,7 @@ export default { } .header__nav-bar { - @apply flex w-full items-center justify-between px-4; + @apply flex w-full items-center justify-between px-2; pointer-events: auto; /*enable click-through ScrollableNavBar*/ } .header-container, diff --git a/components/core/header/HomeIcon.vue b/components/core/header/HomeIcon.vue index e86bdb26b0..3067a17fe4 100644 --- a/components/core/header/HomeIcon.vue +++ b/components/core/header/HomeIcon.vue @@ -1,7 +1,7 @@ diff --git a/pages/ext/discord.vue b/pages/ext/discord.vue index 2a32b87fc2..487ab8a197 100644 --- a/pages/ext/discord.vue +++ b/pages/ext/discord.vue @@ -1,5 +1,5 @@ @@ -234,14 +235,17 @@ export default { 'booth-game': { name: '💪|booth-game', }, - 'program-keynote': { - name: '📝|program-keynote', + 'r0-track': { + name: '📝|r0-track', }, - 'program-talk': { - name: '📝|program-talk', + 'r1-track': { + name: '📝|r1-track', }, - 'program-tutorial': { - name: '📝|program-tutorial', + 'r2-track': { + name: '📝|r2-track', + }, + 'r3-track': { + name: '📝|r3-track', }, }, } diff --git a/pages/index.vue b/pages/index.vue index c80c62ee0e..d027a89b00 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -147,7 +147,7 @@ export default { data() { return { isOpened: false, - primaryButton: landingButtonConfig.BUY_TICKETS, + primaryButton: landingButtonConfig.CHECK_EVENTS, secondaryButton: landingButtonConfig.SECONDARY_JOIN_US, selectedSponsor: {}, } diff --git a/pages/registration/tickets.vue b/pages/registration/tickets.vue index 8ce2da03df..507406dd0f 100644 --- a/pages/registration/tickets.vue +++ b/pages/registration/tickets.vue @@ -64,32 +64,34 @@ -
+
{{ $t(ticket.titleI18nKey) }}
-
    +
    -
    + +
    -
    +
    @@ -603,25 +610,12 @@ li.li-mb-6 { margin-bottom: 6px; } -.ticketContainer .ticketHeader { - @apply m-auto px-0 pb-[24px] pt-0; - @media (min-width: 1440px) { - @apply p-0; - } +.features { + @apply xl:mb-0; } - -.ticketContainer .features { - @apply mx-auto flex min-w-0 flex-col justify-center px-0 pb-[24px] pt-0; - margin-bottom: 0 !important; - @media (min-width: 1440px) { - @apply min-w-[240px] p-0; - } -} - -.ticketContainer .price { - @apply m-auto flex flex-row-reverse px-0 pb-[24px] pt-0 text-center text-[22px] xl:flex-col; - @media (min-width: 1440px) { - @apply p-0 text-[28px]; +.sellingStatusButton { + @media (min-width: 1480px) { + flex-basis: 160px; } } diff --git a/pages/venue/index.vue b/pages/venue/index.vue index 23f52a1e16..664aa7a1fc 100644 --- a/pages/venue/index.vue +++ b/pages/venue/index.vue @@ -30,6 +30,15 @@ v-if="selectedTransModeIndex === 2" >
    + + + + + @@ -42,7 +51,6 @@ import VenueTab from '@/components/venue/VenueTab.vue' import VenuePublicTransporterTab from '@/components/venue/VenuePublicTransporterTab.vue' import VenueDriveTab from '@/components/venue/VenueDriveTab.vue' import VenueShuttleServiceTab from '@/components/venue/VenueShuttleServiceTab.vue' - export default { i18n, name: 'PageVenue', @@ -54,6 +62,7 @@ export default { VenuePublicTransporterTab, VenueDriveTab, VenueShuttleServiceTab, + VenueMap: () => import('./venueMap.vue'), }, data() { return { diff --git a/pages/venue/venueMap.vue b/pages/venue/venueMap.vue new file mode 100644 index 0000000000..e60175baae --- /dev/null +++ b/pages/venue/venueMap.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/plugins/leaflet.js b/plugins/leaflet.js new file mode 100644 index 0000000000..f5438c8424 --- /dev/null +++ b/plugins/leaflet.js @@ -0,0 +1,7 @@ +import Vue from 'vue' +import { LMap, LTileLayer, LMarker } from 'vue2-leaflet' +import 'leaflet/dist/leaflet.css' + +Vue.component('l-map', LMap) +Vue.component('l-tile-layer', LTileLayer) +Vue.component('l-marker', LMarker) diff --git a/static/img/about/community/tainanPy.png b/static/img/about/community/tainanPy.png index 37cb8d4dbb..bd9783ed3e 100644 Binary files a/static/img/about/community/tainanPy.png and b/static/img/about/community/tainanPy.png differ diff --git a/static/img/staff/data/Angus_Yang.JPG b/static/img/staff/data/Angus_Yang.jpg similarity index 100% rename from static/img/staff/data/Angus_Yang.JPG rename to static/img/staff/data/Angus_Yang.jpg diff --git a/static/img/staff/design/Carol.JPG b/static/img/staff/design/Carol.jpg similarity index 100% rename from static/img/staff/design/Carol.JPG rename to static/img/staff/design/Carol.jpg diff --git a/static/img/staff/pycast/Carol.JPG b/static/img/staff/pycast/Carol.jpg similarity index 100% rename from static/img/staff/pycast/Carol.JPG rename to static/img/staff/pycast/Carol.jpg diff --git a/static/img/staff/pycast/Kir.JPG b/static/img/staff/pycast/Kir.jpg similarity index 100% rename from static/img/staff/pycast/Kir.JPG rename to static/img/staff/pycast/Kir.jpg diff --git a/static/img/staff/venue/jaihua.jpg b/static/img/staff/venue/Jaihua.jpg similarity index 100% rename from static/img/staff/venue/jaihua.jpg rename to static/img/staff/venue/Jaihua.jpg diff --git a/static/img/staff/venue/yoyo.jpg b/static/img/staff/venue/Yoyo.jpg similarity index 100% rename from static/img/staff/venue/yoyo.jpg rename to static/img/staff/venue/Yoyo.jpg diff --git a/static/snake-bg.png b/static/snake-bg.png new file mode 100644 index 0000000000..b31db4684c Binary files /dev/null and b/static/snake-bg.png differ diff --git a/static/snake.png b/static/snake.png new file mode 100644 index 0000000000..dd94333df4 Binary files /dev/null and b/static/snake.png differ diff --git a/static/venue-button.png b/static/venue-button.png new file mode 100644 index 0000000000..9a45fcd955 Binary files /dev/null and b/static/venue-button.png differ diff --git a/store/index.js b/store/index.js index 7b34ba7176..07adf6d5a8 100644 --- a/store/index.js +++ b/store/index.js @@ -14,7 +14,7 @@ export const state = () => ({ conferenceYear: '2023', conferenceDate: '2023-09-02', showSpeakingPage: false, - showAboutStaffPage: false, + showAboutStaffPage: true, showSchedulePage: true, showSponsorPage: false, showRegistrationPage: true, @@ -23,9 +23,9 @@ export const state = () => ({ showConferencePage: true, showVenuePage: true, showIndexSponsorSection: true, - showIndexSecondaryBtn: true, + showIndexSecondaryBtn: false, aboutHideItems: ['apacCommunity'], // ['pycontw', 'apacCommunity', 'history', 'community', 'codeOfConduct'] - eventsHideItems: ['openSpaces'], // ['sprints', 'openSpaces', 'jobs'] + eventsHideItems: [], // ['sprints', 'openSpaces', 'jobs'] conferenceHideItems: [], // ['keynotes', 'talks', 'tutorials', 'panelDiscussion'] registrationHideItems: [], // ['tickets', 'financialAid'] venueHideItems: [], // ['venueInfo', 'accommodation']