From e1219ea959b1dda4a90e820e1c44024f353bde39 Mon Sep 17 00:00:00 2001 From: Malo <37849933+MaloPolese@users.noreply.github.com> Date: Tue, 30 Jan 2024 18:53:16 +0100 Subject: [PATCH] feat(ticket): open ticketing (#183) * feat(ticket): open ticketing [8e2ca818e2d3125a2a426c996aa86489615c70a5] * feat(navigation): add FAQ link [e10a08de84cb0819f1b3bf1ebd02dcfe25843986] * Update resources.json to change faq link [0b41d506378bdfb7bb61f475de18490b2d4d4d28] --------- Co-authored-by: Hugo Gresse --- docs/default-firebase-data.json | 8 +++--- public/data/resources.json | 37 ++++++++++++------------ src/elements/header-toolbar.ts | 50 ++++++++++++++++++++++++--------- src/hoverboard-app.ts | 42 ++++++++++++++------------- src/utils/data.ts | 1 + 5 files changed, 82 insertions(+), 56 deletions(-) diff --git a/docs/default-firebase-data.json b/docs/default-firebase-data.json index 197e165062..c61c12fe51 100644 --- a/docs/default-firebase-data.json +++ b/docs/default-firebase-data.json @@ -503,7 +503,7 @@ "url": "https://www.billetweb.fr/sunny-tech-2024" }, { - "available": false, + "available": true, "currency": "€", "ends": "", "inDemand": true, @@ -513,18 +513,18 @@ "primary": true, "regular": true, "soldOut": false, - "starts": "Bientôt disponible", + "starts": "1 Fév 10h", "url": "https://www.billetweb.fr/sunny-tech-2024" }, { - "available": false, + "available": true, "currency": "€", "ends": "", "info": "Requiert une carte étudiante", "name": "Étudiant", "price": 40, "soldOut": false, - "starts": "Bientôt disponible", + "starts": "1 Fév 10h", "url": "https://www.billetweb.fr/sunny-tech-2024" } ], diff --git a/public/data/resources.json b/public/data/resources.json index 2ad9b3e367..c747560dfd 100644 --- a/public/data/resources.json +++ b/public/data/resources.json @@ -21,6 +21,7 @@ "buyTicketTopRight": "Billetterie", "cfpHeader": "Call For Paper", "cfpLink": "https://conference-hall.io/public/event/Jnevkv3bLyxZOyYyiWSC", + "faqLink": "https://sunny-tech.io/faq", "becomeSponsorMenu": "Devenir sponsor", "signIn": "Connexion", "signOut": "Déconnexion", @@ -255,7 +256,7 @@ "label": "Voir tous les speakers", "link": "/speakers/" } -}, + }, "speakerDetails": { "sessions": "Sessions" }, @@ -316,7 +317,7 @@ }, "callToSchedule": { "display": true, - "title" :"Appel à orateurs", + "title": "Appel à orateurs", "description": "Intéressé(e) pour parler à Sunny Tech ?", "description2": "Notre CFP est désormais ouvert", "description3": "Nous avons hâte de recevoir vos propositions !", @@ -324,36 +325,36 @@ "url": "https://conference-hall.io/public/event/Jnevkv3bLyxZOyYyiWSC", "categories": [ { - "title": "Cloud & Devops", - "icon":"/images/icons/bubble1.svg" + "title": "Cloud & Devops", + "icon": "/images/icons/bubble1.svg" }, { - "title": "BigData & IA", - "icon":"/images/icons/bubble2.svg" + "title": "BigData & IA", + "icon": "/images/icons/bubble2.svg" }, { - "title": "Architecture", - "icon":"/images/icons/bubble3.svg" + "title": "Architecture", + "icon": "/images/icons/bubble3.svg" }, { - "title": "Mobile / IoT", - "icon":"/images/icons/bubble4.svg" + "title": "Mobile / IoT", + "icon": "/images/icons/bubble4.svg" }, { - "title": "Atypique", - "icon":"/images/icons/bubble4.svg" + "title": "Atypique", + "icon": "/images/icons/bubble4.svg" }, { - "title": "Frontend", - "icon":"/images/icons/bubble5.svg" + "title": "Frontend", + "icon": "/images/icons/bubble5.svg" }, { - "title": "Conception", - "icon":"/images/icons/bubble6.svg" + "title": "Conception", + "icon": "/images/icons/bubble6.svg" }, { - "title": "Sécurité", - "icon":"/images/icons/bubble1.svg" + "title": "Sécurité", + "icon": "/images/icons/bubble1.svg" } ] }, diff --git a/src/elements/header-toolbar.ts b/src/elements/header-toolbar.ts index 1ef423c549..56e8efa79b 100644 --- a/src/elements/header-toolbar.ts +++ b/src/elements/header-toolbar.ts @@ -17,7 +17,16 @@ import { ReduxMixin } from '../store/mixin'; import { initialTicketsState, TicketsState } from '../store/tickets/state'; import { initialUiState } from '../store/ui/state'; import { initialUserState } from '../store/user/state'; -import { buyTicket, navigation, signIn, signOut as signOutText, title, cfpHeader, cfpLink } from '../utils/data'; +import { + buyTicket, + navigation, + signIn, + signOut as signOutText, + title, + cfpHeader, + cfpLink, + faqLink, +} from '../utils/data'; import './notification-toggle'; import './shared-styles'; @@ -75,7 +84,8 @@ export class HeaderToolbar extends ReduxMixin(PolymerElement) { } .nav-item a, - .signin-tab { + .signin-tab, + .faq-link { padding: 0 14px; color: inherit; text-transform: uppercase; @@ -177,18 +187,29 @@ export class HeaderToolbar extends ReduxMixin(PolymerElement) { [[nav.label]] - - - - - - - - - - - - + + FAQ + + + + + + + + + + + + + @@ -239,6 +260,7 @@ export class HeaderToolbar extends ReduxMixin(PolymerElement) { private buyTicket = buyTicket; private cfpHeader = cfpHeader; private cfpLink = cfpLink; + private faqLink = faqLink; @property({ type: Boolean, notify: true }) drawerOpened: boolean = false; diff --git a/src/hoverboard-app.ts b/src/hoverboard-app.ts index 3f26edb7ac..4fce3ace28 100644 --- a/src/hoverboard-app.ts +++ b/src/hoverboard-app.ts @@ -39,7 +39,8 @@ import { signInProviders, title, cfpHeader, - cfpLink + cfpLink, + faqLink, } from './utils/data'; import './utils/icons'; import './utils/media-query'; @@ -172,29 +173,29 @@ export class HoverboardApp extends PolymerElement { [[nav.label]] + FAQ
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
@@ -224,6 +225,7 @@ export class HoverboardApp extends PolymerElement { private shortLocation = location.short; private cfpLink = cfpLink; private cfpHeader = cfpHeader; + private faqLink = faqLink; @query('#drawer') drawer!: AppDrawerElement; @@ -248,7 +250,7 @@ export class HoverboardApp extends PolymerElement { stateChanged(state: RootState) { this.tickets = state.tickets; this.routeName = selectRouteName(window.location.pathname); - if(window.location.pathname.includes('/carapuce')){ + if (window.location.pathname.includes('/carapuce')) { this.noLayoutPage = true; } } diff --git a/src/utils/data.ts b/src/utils/data.ts index b9152c08d6..d2b255f172 100644 --- a/src/utils/data.ts +++ b/src/utils/data.ts @@ -52,6 +52,7 @@ export { image, viewHighlights, locationText, + faqLink, } from '../../public/data/resources.json'; export { contentLoaders,