From 4f26e066a3151f3ff8b3502b425cad7c568e3bf7 Mon Sep 17 00:00:00 2001 From: Sebastien Chassande Date: Fri, 15 Nov 2024 07:03:10 +0100 Subject: [PATCH] - mise en place de l'affichage du planning de la conference. - correction du bug de la time zone --- public/img/schedule.png | Bin 0 -> 9035 bytes src/components/DateTimeChangingChild.astro | 2 +- src/components/Menu.astro | 8 ++--- src/components/StorePackage.astro | 2 +- src/data/cfp.json | 13 ++++++-- src/data/organisation.json | 5 --- src/data/ticket.json | 4 +-- src/i18n/en.ts | 9 +++++- src/i18n/fr.ts | 6 ++++ src/i18n/i18n.ts | 3 +- src/layouts/Redirect.astro | 2 +- src/pages/{program.astro => cfp.astro} | 2 +- src/pages/schedule-full.astro | 5 +++ src/pages/schedule.astro | 35 +++++++++++++++++++++ src/pages/scheduling.astro | 5 --- 15 files changed, 76 insertions(+), 25 deletions(-) create mode 100644 public/img/schedule.png rename src/pages/{program.astro => cfp.astro} (93%) create mode 100644 src/pages/schedule-full.astro create mode 100644 src/pages/schedule.astro delete mode 100644 src/pages/scheduling.astro diff --git a/public/img/schedule.png b/public/img/schedule.png new file mode 100644 index 0000000000000000000000000000000000000000..33afda49f4c6fa2bc8c958b2f0add78a3057d7d0 GIT binary patch literal 9035 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 YleJoguDu05k~w3bXR7<=?gP~S0yh~76951J literal 0 HcmV?d00001 diff --git a/src/components/DateTimeChangingChild.astro b/src/components/DateTimeChangingChild.astro index 267bebc..59e2697 100644 --- a/src/components/DateTimeChangingChild.astro +++ b/src/components/DateTimeChangingChild.astro @@ -5,7 +5,7 @@ const id = Math.round(Math.random() * 100000); const beforeId = 'before' + id; const doingId = 'doing' + id; const afterId = 'after' + id; -// console.log(beginDate, endDate, refreshInterval, id); +console.log(beginDate, endDate, refreshInterval, id); --- diff --git a/src/components/Menu.astro b/src/components/Menu.astro index cae58c9..c511b97 100644 --- a/src/components/Menu.astro +++ b/src/components/Menu.astro @@ -27,15 +27,13 @@ const path_fr = path.replace('/en/','/'); {t("past_editions")} - +
  • { t("schedule_menu") }
  • -
    - { !cfp.published ? t("program_translation") : t("schedule_translation") } + {t("program_translation")} Le Tremplin Ligne éditoriale
    diff --git a/src/components/StorePackage.astro b/src/components/StorePackage.astro index 8cd8642..f56b37f 100644 --- a/src/components/StorePackage.astro +++ b/src/components/StorePackage.astro @@ -30,7 +30,7 @@ const price = days === 3 ? store.price_univ : store.price_conf;
  • {t('store_access_meet_and_greet')}
    • - + {t('store_opens_on', (store.open_date as any)[lang])} {t('store_is_soldout')} diff --git a/src/data/cfp.json b/src/data/cfp.json index 1d284ea..a4a808a 100644 --- a/src/data/cfp.json +++ b/src/data/cfp.json @@ -7,18 +7,27 @@ "feedback_url": "", "dates": { "open_date": { - "date": "2024-09-07T00:00:00.000", + "date": "2024-09-07T00:00:00.000+02:00", "fr": "7 Septembre 2024", "en": "7th of September 2024" }, "close_date": { - "date": "2024-10-15T00:00:00.000", + "date": "2024-10-15T00:00:00.000+02:00", "fr": "15 Octobre 2024", "en": "15th of October 2024" }, "notification_date": { "fr": "Début Novembre 2024", "en": "Beginning November 2024" + }, + "schedule" : { + "date": "2024-11-15T00:00:00.000+01:00", + "fr": "15 Novembre 2024", + "en": "15th of November 2024", + "url" : { + "embedded": "https://app-demo.voxxr.in/events/snowcamp25/embedded-schedule", + "full": "https://app-demo.voxxr.in/events/snowcamp25/schedule" + } } } } diff --git a/src/data/organisation.json b/src/data/organisation.json index 7ec8056..9abd63e 100644 --- a/src/data/organisation.json +++ b/src/data/organisation.json @@ -56,11 +56,6 @@ "linkedin": "ludovicp", "github": "ludomp" }, - { - "name": "Mathieu Poissard", - "img": "mathieu.png", - "linkedin": "mathieu-poissard-769800b8" - }, { "name": "Michel Barret", "img": "michel.jpg", diff --git a/src/data/ticket.json b/src/data/ticket.json index e57bec5..0aebf34 100644 --- a/src/data/ticket.json +++ b/src/data/ticket.json @@ -7,8 +7,8 @@ "price_univ": 160, "possible_status": ["not_open", "open", "closed", "deactivated"], "status": "not_open", - "beginDate": "2024-11-18T11:00:00.000", - "endDate": "2025-01-20T00:00:00.000", + "beginDate": "2024-11-18T11:00:00.000+01:00", + "endDate": "2025-01-20T00:00:00.000+01:00", "open_date": { "default": "unknown", "fr": "18 Novembre à 11h00", diff --git a/src/i18n/en.ts b/src/i18n/en.ts index 2a7b955..7610536 100644 --- a/src/i18n/en.ts +++ b/src/i18n/en.ts @@ -491,5 +491,12 @@ Candidate is coached from ideation to the final 20-minute session, that will tak

    Of course, if we notice that your submission is missing information or that your topic/abstract isn’t clear enough, we will do our best to let you know so you can make adjustments.

    However, note that this is only possible while the CFP is open and you can still modify your submission. The closer you submit your session to the CFP closing date, the fewer chances you'll have to revise your text.

    `; - return i18n; + i18n.schedule_menu ='Program'; + i18n.schedule_title ='Program'; + i18n.schedule_unavailable =`The program will be available the ${cfp.dates.schedule.en}.`; + i18n.schedule_available =`The programm is available since the ${cfp.dates.schedule.en}.`; + i18n.schedule_openfullschedule =`To see the program on a full page click on `; + i18n.schedule_change =`Until the last minute, some minor changes are possible. A speaker can be unavailable or the Snowcamp organisation team can decided to swap some talk of room due to the number of expected attendees.`; + + return i18n; } diff --git a/src/i18n/fr.ts b/src/i18n/fr.ts index 0e4ffa8..3bab677 100644 --- a/src/i18n/fr.ts +++ b/src/i18n/fr.ts @@ -511,6 +511,12 @@ contrat avec ce sponsoring pour laisser la place à un autre sponsor.`;

    Bien sûr si nous constatons qu'il manque des informations à votre soumission ou que votre sujet/abstract n'est pas assez clair nous ferons au mieux pour vous en faire part afin que vous puissiez corriger le tir.

    Cependant notez que cela ne nous est possible que pendant que le CFP est ouvert et que vous pouvez modifier votre soumission. Donc plus vous soumettez votre session proche de la date de fermeture du CFP, plus vous réduisez vos chances d'avoir droit à retravailler votre texte.

    `; + i18n.schedule_menu ='Programme'; + i18n.schedule_title ='Programme'; + i18n.schedule_unavailable =`Le programme sera disponible le ${cfp.dates.schedule.fr}.`; + i18n.schedule_available =`Le programme est disponible depuis le ${cfp.dates.schedule.fr}.`; + i18n.schedule_openfullschedule =`Pour le voir sur une page complète cliquer sur `; + i18n.schedule_change =`Jusqu'à la dernière minute un ajustement de programme est possible car un speaker peut être indisponible ou l'organisation peut décider d'inverser 2 salles par rapport à la fréquentation supposée.`; return i18n; } diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts index 4229dc6..28bf5ba 100644 --- a/src/i18n/i18n.ts +++ b/src/i18n/i18n.ts @@ -11,6 +11,8 @@ export async function initConfig(lang: string) { i18nconfig.i18n = en_init(); } else if (lang === 'fr') { i18nconfig.i18n = fr_init(); + } else { + i18nconfig.i18n = en_init(); } } export function t(key: string, ...params:any[]): any { @@ -23,7 +25,6 @@ export function t(key: string, ...params:any[]): any { case 3: return value(params[0], params[1], params[2]); default: return value(params); } - return value(params); } else { return value; } diff --git a/src/layouts/Redirect.astro b/src/layouts/Redirect.astro index e122153..a0bf242 100644 --- a/src/layouts/Redirect.astro +++ b/src/layouts/Redirect.astro @@ -15,5 +15,5 @@ const content = `0; url=${target}`; -

    Redirect to {target}

    +

    Redirect to {target}

    diff --git a/src/pages/program.astro b/src/pages/cfp.astro similarity index 93% rename from src/pages/program.astro rename to src/pages/cfp.astro index e31e9bc..c4d5e8f 100644 --- a/src/pages/program.astro +++ b/src/pages/cfp.astro @@ -35,7 +35,7 @@ const lang = (Astro.locals as any).lang;
    - + diff --git a/src/pages/schedule-full.astro b/src/pages/schedule-full.astro new file mode 100644 index 0000000..72f459a --- /dev/null +++ b/src/pages/schedule-full.astro @@ -0,0 +1,5 @@ +--- +import Redirect from '../layouts/Redirect.astro'; +import cfp from '../data/cfp.json'; +--- + diff --git a/src/pages/schedule.astro b/src/pages/schedule.astro new file mode 100644 index 0000000..e82341c --- /dev/null +++ b/src/pages/schedule.astro @@ -0,0 +1,35 @@ +--- +import Layout from '../layouts/Layout.astro'; +import { t } from "../i18n/i18n"; +import cfp from '../data/cfp.json'; +import DateTimeChangingChild from "../components/DateTimeChangingChild.astro"; + +--- + +
    +
    + +
    + {t('schedule_unavailable')} +
    + +
    +

    {t('schedule_available')} +
    {t('schedule_openfullschedule')} +
    +

    +

    {t('schedule_change')}

    +
    + +
    +
    +     +
    +     + diff --git a/src/pages/scheduling.astro b/src/pages/scheduling.astro deleted file mode 100644 index 185b75b..0000000 --- a/src/pages/scheduling.astro +++ /dev/null @@ -1,5 +0,0 @@ ---- -import Redirect from '../layouts/Redirect.astro'; - ---- -