Skip to content

Commit

Permalink
Merge pull request #21 from snowcamp/cfp-enhancement
Browse files Browse the repository at this point in the history
extracting cfp to its own page
  • Loading branch information
barmic authored Sep 5, 2024
2 parents 213ac91 + 6b4b8c0 commit f3f5556
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 77 deletions.
14 changes: 11 additions & 3 deletions src/components/Menu.astro
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,22 @@ const path_fr = path.replace('/en/','/');
<div class="dropdown-menu" aria-labelledby="navSnowcampDropdown">
<a class="dropdown-item" href={url_prefix+'/snowcamp/#what'}>{t("what_is_this")}</a>
<a class="dropdown-item" href={url_prefix+'/organisation/'}>Organisation</a>
<a class="dropdown-item" href={url_prefix+'/tremplin/'}>Le Tremplin</a>
<a class="dropdown-item" href={url_prefix+'/association/'}>Association</a>
<a class="dropdown-item" href={url_prefix+'/previous-editions/'}>{t("past_editions")}</a>
</div>
</li>
<li class="nav-item"><a class="nav-link" href={url_prefix+'/#program'}>
<!-- <li class="nav-item"><a class="nav-link" href={url_prefix+'/#program'}>
{ !cfp.published ? t("program_translation") : t("schedule_translation") }
</a></li>
</a></li> -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href={url_prefix+'/program/'} id="navCfpDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
CFP <span class="caret"></span>
</a>
<div class="dropdown-menu" aria-labelledby="navCfpDropdown">
<a class="nav-link" href={url_prefix+'/program/'}>{ !cfp.published ? t("program_translation") : t("schedule_translation") }</a>
<a class="dropdown-item" href={url_prefix+'/tremplin/'}>Le Tremplin</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href={url_prefix+'/#sponsors'} id="navSponsorsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Sponsors <span class="caret"></span>
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import cfp from '../data/cfp.json';

export function init() {
const i18n: any = {};
i18n.program_translation = 'CFP';
i18n.program_translation = 'Conference';
i18n.cfp_program_translation = 'Call For Proposals';
i18n.ticketlabel = 'Tickets';
i18n.what_is_this = "What's this?";
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import cfp from '../data/cfp.json';

export function init() {
const i18n: any = {};
i18n.program_translation = 'CFP';
i18n.program_translation = 'Conférence';
i18n.cfp_program_translation = 'Call For Proposals';
i18n.ticketlabel = 'Tickets';
i18n.what_is_this = "C'est quoi ?";
Expand Down
72 changes: 0 additions & 72 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
import Layout from '../layouts/Layout.astro';
import cfp from '../data/cfp.json';
import edition from '../data/edition.json';
import { t } from "../i18n/i18n";
import CFPDates from '../components/CFPDates.astro';
import SponsorsLogosSection from '../components/SponsorsLogosSection.astro';
import DateTimeChangingChild from "../components/DateTimeChangingChild.astro";
Expand Down Expand Up @@ -126,76 +124,6 @@ const lang = (Astro.locals as any).lang;
</div>
</div>
</section>

<section>
{ !cfp.published &&
<div id="program" class="snc-programme">
<div class="snc-inner">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="snc-heading-area">
<h2 class="snc-heading">
<span class="back-heading">
<i class="fa fa-calendar" aria-hidden="true"></i>
</span>
<span class="heading">{t('cfp_program_translation')}</span>
</h2>
<CFPDates></CFPDates>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-6 col-md-6">
<div class="single">
<img src="/img/themas.webp" alt="themas">
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6">
<div class="single">
<DateTimeChangingChild beginDate={Date.parse(cfp.dates.open_date.date)} endDate={Date.parse(cfp.dates.close_date.date)} refreshInterval="30000">
<span slot="before" set:html={t('cfp_open_soon_desc')}></span>
<span slot="doing" set:html={t('cfp_open_desc')}></span>
<span slot="after" set:html={t('cfp_closed_desc')}></span>
</DateTimeChangingChild>
</div>
</div>
</div>
</div>
</div>
</div>
}
{ cfp.published &&
<div id="program" class="snc-programme">
<div class="snc-inner">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="snc-heading-area">
<h2 class="snc-heading">
<span class="back-heading">
<i class="fa fa-calendar" aria-hidden="true"></i>
</span>
<span class="heading">{t('schedule_title')}</span>
</h2>
</div>
</div>
</div>
<div class="row">
<p>{t('schedule_desc')}
<a id="sched-embed" href={cfp.sched_url} data-sched-sidebar="no">SnowCamp {cfp.year}</a>
</p>
<p>
<br>
<a id="sched-embed" href={cfp.feedback_url} data-sched-sidebar="no">Feedback SnowCamp {cfp.year}</a>
</p>
</div>
</div>
</div>
</div>
</div>
}
</section>
<section>
<SponsorsLogosSection></SponsorsLogosSection>
</section>
Expand Down
83 changes: 83 additions & 0 deletions src/pages/program.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
import Layout from '../layouts/Layout.astro';
import cfp from '../data/cfp.json';
import { t } from "../i18n/i18n";
import CFPDates from '../components/CFPDates.astro';
import DateTimeChangingChild from "../components/DateTimeChangingChild.astro";
const lang = (Astro.locals as any).lang;
---
<Layout title="Call For Paper Snowcamp">
<main>
<section>
{ !cfp.published &&
<div id="program" class="snc-programme">
<div class="snc-inner">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="snc-heading-area">
<h2 class="snc-heading">
<span class="back-heading">
<i class="fa fa-calendar" aria-hidden="true"></i>
</span>
<span class="heading">{t('cfp_program_translation')}</span>
</h2>
<CFPDates></CFPDates>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-6 col-md-6">
<div class="single">
<img src="/img/themas.webp" alt="themas">
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6">
<div class="single">
<DateTimeChangingChild beginDate={Date.parse(cfp.dates.open_date.date)} endDate={Date.parse(cfp.dates.close_date.date)} refreshInterval="30000">
<span slot="before" set:html={t('cfp_open_soon_desc')}></span>
<span slot="doing" set:html={t('cfp_open_desc')}></span>
<span slot="after" set:html={t('cfp_closed_desc')}></span>
</DateTimeChangingChild>
</div>
</div>
</div>
</div>
</div>
</div>
}
{ cfp.published &&
<div id="program" class="snc-programme">
<div class="snc-inner">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="snc-heading-area">
<h2 class="snc-heading">
<span class="back-heading">
<i class="fa fa-calendar" aria-hidden="true"></i>
</span>
<span class="heading">{t('schedule_title')}</span>
</h2>
</div>
</div>
</div>
<div class="row">
<p>{t('schedule_desc')}
<a id="sched-embed" href={cfp.sched_url} data-sched-sidebar="no">SnowCamp {cfp.year}</a>
</p>
<p>
<br>
<a id="sched-embed" href={cfp.feedback_url} data-sched-sidebar="no">Feedback SnowCamp {cfp.year}</a>
</p>
</div>
</div>
</div>
</div>
</div>
}
</section>
</main>
<script is:inline src="/js/homepage.js"></script>
</Layout>

0 comments on commit f3f5556

Please sign in to comment.