diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index f9ae05f30..14bffb0af 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -2,7 +2,7 @@ name: 'Alpha Build' on: push: - branches: [v530/custom-colour] + branches: [v523/video] jobs: frontend: diff --git a/frontend/src/testing/index.tsx b/frontend/src/testing/index.tsx index 46c564eac..9ac31a3d9 100644 --- a/frontend/src/testing/index.tsx +++ b/frontend/src/testing/index.tsx @@ -49,6 +49,7 @@ export const initialSession: Session = { id: 'John Doe', name: 'John Doe', photo: null, + email: null, }, options: { ...defaultOptions, diff --git a/frontend/src/translations/locales/ar-SA.json b/frontend/src/translations/locales/ar-SA.json index f9db656f2..2dd041bb3 100644 --- a/frontend/src/translations/locales/ar-SA.json +++ b/frontend/src/translations/locales/ar-SA.json @@ -29,7 +29,8 @@ "login": "تسجيل الدخول", "searchNoMatch": "لم نتمكن من العثور على رجعي يطابق بحثك ({{search}}).", "proNotSetupWarning": "لقد اشتركت في حساب فريق المحترفين، مما يعني أنه يمكنك منح 19 زميلاً آخر حساب محترف. لإضافتهم إلى اشتراكك حتى يمكنهم أن يصبحوا برو أيضا، الرجاء الذهاب إلى صفحة حسابك وإضافة رسائل البريد الإلكتروني الخاصة بهم (قسم \"فريقك\").", - "proNotSetupWarningAction": "الذهاب إلى صفحة الحساب" + "proNotSetupWarningAction": "الذهاب إلى صفحة الحساب", + "discover": "اكتشف الاستطلاع التراجعي" }, "PreviousGame": { "createdBy": "تم إنشاؤها بواسطة", diff --git a/frontend/src/translations/locales/de-DE.json b/frontend/src/translations/locales/de-DE.json index 6b9bf2a02..3f7cb20a6 100644 --- a/frontend/src/translations/locales/de-DE.json +++ b/frontend/src/translations/locales/de-DE.json @@ -29,7 +29,8 @@ "login": "Anmelden", "searchNoMatch": "Wir konnten keine Retrospektive finden, die Ihrer Suche entspricht ({{search}}).", "proNotSetupWarning": "Sie haben ein Pro-Team-Konto abonniert, was bedeutet, dass Sie 19 anderen Kollegen ein Pro-Konto gewähren können. Um sie Ihrem Abonnement hinzuzufügen, damit sie auch Pro werden können gehen Sie bitte auf Ihre Account-Seite und fügen Sie ihre E-Mails hinzu ('Ihr Team').", - "proNotSetupWarningAction": "Gehe zur Kontoseite" + "proNotSetupWarningAction": "Gehe zur Kontoseite", + "discover": "Entdecke Retrospected" }, "PreviousGame": { "createdBy": "Erstellt von", diff --git a/frontend/src/translations/locales/en-GB.json b/frontend/src/translations/locales/en-GB.json index e4571b96d..9dcfa4eb1 100644 --- a/frontend/src/translations/locales/en-GB.json +++ b/frontend/src/translations/locales/en-GB.json @@ -29,7 +29,8 @@ "login": "Login", "searchNoMatch": "We could not find a retrospective matching your search ({{search}}).", "proNotSetupWarning": "You have subscribed to a Pro Team account, which means you can grant 19 other colleagues a Pro account. To add them to your subscription so they can become Pro as well, please go to your Account page and add their emails ('Your Team' section).", - "proNotSetupWarningAction": "Go to Account page" + "proNotSetupWarningAction": "Go to Account page", + "discover": "Discover Retrospected" }, "PreviousGame": { "createdBy": "Created by", diff --git a/frontend/src/translations/locales/es-ES.json b/frontend/src/translations/locales/es-ES.json index 1f5531e94..63b6d3272 100644 --- a/frontend/src/translations/locales/es-ES.json +++ b/frontend/src/translations/locales/es-ES.json @@ -29,7 +29,8 @@ "login": "Ingresar", "searchNoMatch": "No hemos podido encontrar un retrospectivo que coincida con tu búsqueda ({{search}}).", "proNotSetupWarning": "Te has suscrito a una cuenta Pro Team, lo que significa que puedes conceder a otros 19 colegas una cuenta Pro. Para añadirlos a tu suscripción para que también puedan convertirse en Pro por favor vaya a la página de su cuenta y añada sus correos electrónicos ('Su equipo').", - "proNotSetupWarningAction": "Ir a la página de cuenta" + "proNotSetupWarningAction": "Ir a la página de cuenta", + "discover": "Descubre retrospectivamente" }, "PreviousGame": { "createdBy": "Creado por", diff --git a/frontend/src/translations/locales/fr-FR.json b/frontend/src/translations/locales/fr-FR.json index 3e1c68b1b..f0c03a26a 100644 --- a/frontend/src/translations/locales/fr-FR.json +++ b/frontend/src/translations/locales/fr-FR.json @@ -29,7 +29,8 @@ "login": "Connexion", "searchNoMatch": "Nous n'avons pu trouver une retrospective correspondant à votre recherche ({{search}}).", "proNotSetupWarning": "Vous avez souscrit à un compte Pro Team, ce qui signifie que vous pouvez accorder à 19 autres collègues un compte Pro. Pour les ajouter à votre abonnement afin qu'ils puissent bénéficier de ses avantages, veuillez vous rendre sur la page \"Mon compte\" et ajouter leurs e-mails dans la section « Votre équipe ».", - "proNotSetupWarningAction": "Aller à la page \"Mon compte\"" + "proNotSetupWarningAction": "Aller à la page \"Mon compte\"", + "discover": "Découvrez Retrospected" }, "PreviousGame": { "createdBy": "Créé par", diff --git a/frontend/src/translations/locales/hu-HU.json b/frontend/src/translations/locales/hu-HU.json index 3cc12506d..e09c5b767 100644 --- a/frontend/src/translations/locales/hu-HU.json +++ b/frontend/src/translations/locales/hu-HU.json @@ -29,7 +29,8 @@ "login": "Belépés", "searchNoMatch": "", "proNotSetupWarning": "", - "proNotSetupWarningAction": "" + "proNotSetupWarningAction": "", + "discover": "" }, "PreviousGame": { "createdBy": "Készítette", diff --git a/frontend/src/translations/locales/it-IT.json b/frontend/src/translations/locales/it-IT.json index 1bac0bc32..7a54c3a33 100644 --- a/frontend/src/translations/locales/it-IT.json +++ b/frontend/src/translations/locales/it-IT.json @@ -29,7 +29,8 @@ "login": "Accedi", "searchNoMatch": "Non siamo riusciti a trovare una retrospettiva corrispondente alla tua ricerca ({{search}}).", "proNotSetupWarning": "Hai sottoscritto un account Pro Team, il che significa che puoi concedere ad altri 19 colleghi un account Pro. Per aggiungerli al tuo abbonamento in modo che possano diventare anche Pro, vai alla pagina del tuo Account e aggiungi le loro email (sezione 'Il tuo Team').", - "proNotSetupWarningAction": "Vai alla pagina Account" + "proNotSetupWarningAction": "Vai alla pagina Account", + "discover": "Scopri Retrospetto" }, "PreviousGame": { "createdBy": "Creato da", diff --git a/frontend/src/translations/locales/ja-JP.json b/frontend/src/translations/locales/ja-JP.json index 54e043928..b0d639118 100644 --- a/frontend/src/translations/locales/ja-JP.json +++ b/frontend/src/translations/locales/ja-JP.json @@ -29,7 +29,8 @@ "login": "ログイン", "searchNoMatch": "検索に一致する回顧展が見つかりませんでした ({{search}})。", "proNotSetupWarning": "Proチームアカウントを購読しているため、19人の同僚にProアカウントを付与することができます。 サブスクリプションに追加することで、Pro版にもなります。 アカウントページに行き、メールアドレス(「チーム」セクション)を追加してください。", - "proNotSetupWarningAction": "アカウントページに移動" + "proNotSetupWarningAction": "アカウントページに移動", + "discover": "後退しているものを発見" }, "PreviousGame": { "createdBy": "作成者:", diff --git a/frontend/src/translations/locales/nl-NL.json b/frontend/src/translations/locales/nl-NL.json index e23a1b172..41f731570 100644 --- a/frontend/src/translations/locales/nl-NL.json +++ b/frontend/src/translations/locales/nl-NL.json @@ -29,7 +29,8 @@ "login": "Aanmelden", "searchNoMatch": "We konden geen terugwerkende kracht vinden die overeenkomt met uw zoekopdracht ({{search}}).", "proNotSetupWarning": "U heeft zich geabonneerd op een Pro-teamaccount, wat betekent dat u 19 andere collega's een Pro-account kunt geven. Om ze toe te voegen aan uw abonnement zodat ze ook Pro kunnen worden, Ga naar uw accountpagina en voeg hun e-mails toe ('Uw team' sectie).", - "proNotSetupWarningAction": "Ga naar Account pagina" + "proNotSetupWarningAction": "Ga naar Account pagina", + "discover": "Ontdek Retrospecten" }, "PreviousGame": { "createdBy": "Aangemaakt door", diff --git a/frontend/src/translations/locales/pl-PL.json b/frontend/src/translations/locales/pl-PL.json index f169a061a..57793fc3c 100644 --- a/frontend/src/translations/locales/pl-PL.json +++ b/frontend/src/translations/locales/pl-PL.json @@ -29,7 +29,8 @@ "login": "Logowanie", "searchNoMatch": "Nie mogliśmy znaleźć retrospektywnego pasującego do Twojego wyszukiwania ({{search}}).", "proNotSetupWarning": "Zasubskrybowałeś konto Pro Team, co oznacza, że możesz przyznać 19 innym kolegom konto Pro. Aby dodać je do subskrypcji, aby mogli zostać również Pro, przejdź na stronę swojego konta i dodaj ich e-maile (sekcja \"Twój Zespół\").", - "proNotSetupWarningAction": "Przejdź do strony konta" + "proNotSetupWarningAction": "Przejdź do strony konta", + "discover": "Odkryj przekreślone" }, "PreviousGame": { "createdBy": "Utworzony przez", diff --git a/frontend/src/translations/locales/pt-BR.json b/frontend/src/translations/locales/pt-BR.json index ae8e2a470..e3b7aad27 100644 --- a/frontend/src/translations/locales/pt-BR.json +++ b/frontend/src/translations/locales/pt-BR.json @@ -29,7 +29,8 @@ "login": "Conectar-se", "searchNoMatch": "Não foi possível encontrar um retrospectivo correspondente à sua pesquisa ({{search}}).", "proNotSetupWarning": "Você se inscreveu em uma conta de equipe Pro, o que significa que você pode conceder uma conta Pro a 19 outros colegas. Para adicioná-los à sua assinatura para que possam se tornar o Pro. por favor, acesse a página da sua Conta e adicione os e-mails deles (seção 'Sua Equipe').", - "proNotSetupWarningAction": "Ir para a página da Conta" + "proNotSetupWarningAction": "Ir para a página da Conta", + "discover": "Descubra Retrospecionado" }, "PreviousGame": { "createdBy": "Criado Por", diff --git a/frontend/src/translations/locales/pt-PT.json b/frontend/src/translations/locales/pt-PT.json index 133b8aca4..e3f0b3986 100644 --- a/frontend/src/translations/locales/pt-PT.json +++ b/frontend/src/translations/locales/pt-PT.json @@ -29,7 +29,8 @@ "login": "Conectar-se", "searchNoMatch": "Não foi possível encontrar um retrospectivo correspondente à sua pesquisa ({{search}}).", "proNotSetupWarning": "Você se inscreveu em uma conta de equipe Pro, o que significa que você pode conceder uma conta Pro a 19 outros colegas. Para adicioná-los à sua assinatura para que possam se tornar o Pro. por favor, acesse a página da sua Conta e adicione os e-mails deles (seção 'Sua Equipe').", - "proNotSetupWarningAction": "Ir para a página da Conta" + "proNotSetupWarningAction": "Ir para a página da Conta", + "discover": "Descubra Retrospecionado" }, "PreviousGame": { "createdBy": "Criado Por", diff --git a/frontend/src/translations/locales/uk-UA.json b/frontend/src/translations/locales/uk-UA.json index 6c8c8fc43..c4ece2a0f 100644 --- a/frontend/src/translations/locales/uk-UA.json +++ b/frontend/src/translations/locales/uk-UA.json @@ -29,7 +29,8 @@ "login": "Логін", "searchNoMatch": "Ми не змогли знайти ретроспектив, що відповідає вашому запиту ({{search}}).", "proNotSetupWarning": "Ви підписалися на обліковий запис професійної команди. Це означає, що можна надати 19 інших колег Pro аккаунту. Щоб додати їх у вашу підписку, щоб вони також могли стати Pro. будь ласка, перейдіть на сторінку свого облікового запису та додайте їхні електронні листи ('Розділ «Ваші команди»).", - "proNotSetupWarningAction": "Перейти на сторінку облікового запису" + "proNotSetupWarningAction": "Перейти на сторінку облікового запису", + "discover": "Відкрийте ретроспективу" }, "PreviousGame": { "createdBy": "Створено", diff --git a/frontend/src/translations/locales/zh-CN.json b/frontend/src/translations/locales/zh-CN.json index 686939ba8..547c52db0 100644 --- a/frontend/src/translations/locales/zh-CN.json +++ b/frontend/src/translations/locales/zh-CN.json @@ -29,7 +29,8 @@ "login": "登录", "searchNoMatch": "我们找不到匹配您搜索的 ({{search}} )的追溯。", "proNotSetupWarning": "您已经订阅了专业团队账户，这意味着您可以授予其他19位同事专业版账户。 将他们添加到您的订阅，这样他们也可以成为专业版。 请转到您的帐户页面并添加他们的电子邮件('您的团队'部分)。", - "proNotSetupWarningAction": "转到帐户页面" + "proNotSetupWarningAction": "转到帐户页面", + "discover": "发现回顾过的" }, "PreviousGame": { "createdBy": "创建者", diff --git a/frontend/src/translations/locales/zh-TW.json b/frontend/src/translations/locales/zh-TW.json index 381e85aaa..aeb549abd 100644 --- a/frontend/src/translations/locales/zh-TW.json +++ b/frontend/src/translations/locales/zh-TW.json @@ -29,7 +29,8 @@ "login": "", "searchNoMatch": "", "proNotSetupWarning": "", - "proNotSetupWarningAction": "" + "proNotSetupWarningAction": "", + "discover": "" }, "PreviousGame": { "createdBy": "由...製作", diff --git a/frontend/src/views/Home.tsx b/frontend/src/views/Home.tsx index be016d9d3..4fc6d11c5 100644 --- a/frontend/src/views/Home.tsx +++ b/frontend/src/views/Home.tsx @@ -160,7 +160,23 @@ function Home() { ) : null} - ) : null} + ) : ( + <> + + {t('Home.discover')} + + + + + + )} ); @@ -215,4 +231,17 @@ const LaunchButtons = styled.div` } `; +const VideoContainer = styled.div` + display: flex; + justify-content: center; + > iframe { + width: min(800px, 100%); + aspect-ratio: 800/450; + border: none; + box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, + rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, + rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px; + } +`; + export default Home; diff --git a/frontend/src/views/game/__tests__/partcipants-notifiers.test.ts b/frontend/src/views/game/__tests__/partcipants-notifiers.test.ts index 1e7e5b741..6efce30e9 100644 --- a/frontend/src/views/game/__tests__/partcipants-notifiers.test.ts +++ b/frontend/src/views/game/__tests__/partcipants-notifiers.test.ts @@ -11,6 +11,7 @@ function p(id: string, online = true): Participant { name: id, online, photo: '', + email: null, }; } diff --git a/frontend/src/views/game/__tests__/useSession.test.tsx b/frontend/src/views/game/__tests__/useSession.test.tsx index e218d19ff..d8ce4c9f6 100644 --- a/frontend/src/views/game/__tests__/useSession.test.tsx +++ b/frontend/src/views/game/__tests__/useSession.test.tsx @@ -14,7 +14,7 @@ function post(id: string): Post { giphy: null, group: null, rank: '0', - user: { id: '1', name: 'danièle', photo: 'bl' }, + user: { id: '1', name: 'danièle', photo: 'bl', email: null }, }; } diff --git a/frontend/src/views/game/board/__tests__/permissions-logic.test.ts b/frontend/src/views/game/board/__tests__/permissions-logic.test.ts index 13c27eee8..7fe8eeb77 100644 --- a/frontend/src/views/game/board/__tests__/permissions-logic.test.ts +++ b/frontend/src/views/game/board/__tests__/permissions-logic.test.ts @@ -18,6 +18,7 @@ const userBase: User = { photo: null, id: '0', name: 'name', + email: null, }; const currentUser: User = { diff --git a/frontend/src/views/game/board/post/__tests__/Post.test.tsx b/frontend/src/views/game/board/post/__tests__/Post.test.tsx index da4185986..f72b6b426 100644 --- a/frontend/src/views/game/board/post/__tests__/Post.test.tsx +++ b/frontend/src/views/game/board/post/__tests__/Post.test.tsx @@ -15,6 +15,7 @@ const u = (name: string): User => ({ name, id: name, photo: null, + email: null, }); const renderWithRouter = (children: React.ReactNode) => diff --git a/frontend/src/views/game/summary/types.ts b/frontend/src/views/game/summary/types.ts index c6be0bec8..d9210605d 100644 --- a/frontend/src/views/game/summary/types.ts +++ b/frontend/src/views/game/summary/types.ts @@ -1,5 +1,4 @@ -import { User } from '@sentry/types'; -import { Post, PostGroup } from 'common'; +import { Post, PostGroup, User } from 'common'; import { ColumnContent } from '../types'; export interface Stats { diff --git a/marketing/package.json b/marketing/package.json index 37b525861..e3a98733a 100644 --- a/marketing/package.json +++ b/marketing/package.json @@ -28,6 +28,7 @@ "@types/styled-system": "^5.1.16", "@types/styled-system__theme-get": "^5.0.2", "@types/url-parse": "^1.4.8", + "@use-it/event-listener": "^0.1.7", "animate.css": "^4.1.1", "date-fns": "^2.30.0", "eslint": "8.41.0", diff --git a/marketing/src/containers/Banner/YouTubePlayer.tsx b/marketing/src/containers/Banner/YouTubePlayer.tsx new file mode 100644 index 000000000..8fb88ce46 --- /dev/null +++ b/marketing/src/containers/Banner/YouTubePlayer.tsx @@ -0,0 +1,105 @@ +import useEventListener from '@use-it/event-listener'; +import styled from 'styled-components'; + +type YouTubePlayerProps = { + url: string; + onClose: () => void; +}; + +export function YouTubePlayer({ onClose, url }: YouTubePlayerProps) { + const handleEsc = (event: KeyboardEvent) => { + if (event.code === 'Escape') onClose(); + }; + useEventListener('keydown', handleEsc); + return ( + + + + + + + + + + + + + ); +} + +const Outer = styled.div` + position: fixed; + display: flex; + justify-content: center; + align-items: center; + top: 0; + bottom: 0; + right: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 10000; + backdrop-filter: blur(5px); +`; + +const Player = styled.div` + width: min(80%, 800px); + aspect-ratio: 800/450; + padding: 0; + margin: 0; + background-color: black; + iframe { + padding: 0; + margin: 0; + margin-bottom: -10px; + display: block; + border: none; + } + box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, + rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, + rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px; +`; + +const HeaderContainer = styled.div` + height: 0; + display: flex; + justify-content: flex-end; +`; + +const PlayerHeader = styled.div` + position: relative; + padding-top: 5px; + padding-right: 5px; + cursor: pointer; + + svg { + path { + fill: #673ab7; + } + } + + &:hover { + svg { + path { + fill: #ff4361; + } + } + } +`; diff --git a/marketing/src/containers/Banner/close.svg b/marketing/src/containers/Banner/close.svg new file mode 100644 index 000000000..80bffa3e1 --- /dev/null +++ b/marketing/src/containers/Banner/close.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/marketing/src/containers/Banner/index.tsx b/marketing/src/containers/Banner/index.tsx index 5d72417fb..0697ba316 100755 --- a/marketing/src/containers/Banner/index.tsx +++ b/marketing/src/containers/Banner/index.tsx @@ -16,89 +16,150 @@ import { useConfig } from '@/common/hooks/useConfig'; import dashboardPattern from '@/common/assets/image/webAppCreative/dashboard-pattern.png'; import { useRouter } from 'next/router'; import ReactMarkdown from 'react-markdown'; -import { Fragment } from 'react'; +import { Fragment, useState } from 'react'; +import styled from 'styled-components'; +import { YouTubePlayer } from './YouTubePlayer'; const Banner = () => { const { locale } = useRouter(); const { t } = useTranslation('common'); const { appUrl } = useConfig(); + const [showVideo, setShowVideo] = useState(false); return ( -
- - - - +
setShowVideo(false)}> + + + + + {t('Banner.heading')} + + } + /> + + {t('Banner.text')} + + } + /> + + + +
+ + + + + + + + + +
+ {showVideo ? ( + setShowVideo(false)} + /> + ) : null} + ); }; +const PlayOverlay = styled.div` + position: absolute; + width: 100px; + height: 100px; + top: calc(50% - 50px); + left: calc(50% - 50px); + text-align: center; + font-size: 3rem; + > svg { + fill: #ccc; + } + &:hover { + svg { + fill: #ff4361 !important; + } + } + z-index: 1; + cursor: pointer; +`; + export default Banner; diff --git a/marketing/src/containers/Banner/play.svg b/marketing/src/containers/Banner/play.svg new file mode 100644 index 000000000..09560aaa2 --- /dev/null +++ b/marketing/src/containers/Banner/play.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/marketing/src/containers/webAppCreative.style.tsx b/marketing/src/containers/webAppCreative.style.tsx index 13913bdb5..502d19300 100755 --- a/marketing/src/containers/webAppCreative.style.tsx +++ b/marketing/src/containers/webAppCreative.style.tsx @@ -1,6 +1,5 @@ import styled, { createGlobalStyle, keyframes } from 'styled-components'; import { themeGet } from '@styled-system/theme-get'; -// import bgPattern from '@/common/assets/image/webAppCreative/pattern3.png'; import pattern5 from '@/common/assets/image/webAppCreative/pattern5.png'; import pattern6 from '@/common/assets/image/webAppCreative/pattern6.png'; import pattern7 from '@/common/assets/image/webAppCreative/pattern7.png'; diff --git a/marketing/yarn.lock b/marketing/yarn.lock index 0fcf659b9..431bb94b6 100644 --- a/marketing/yarn.lock +++ b/marketing/yarn.lock @@ -685,6 +685,11 @@ "@typescript-eslint/types" "5.59.6" eslint-visitor-keys "^3.3.0" +"@use-it/event-listener@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@use-it/event-listener/-/event-listener-0.1.7.tgz#443a9b6df87f2f2961b74d42997ce723a7078623" + integrity sha512-hgfExDzUU9uTRTPDCpw2s9jWTxcxmpJya3fK5ADpf5VDpSy8WYwY/kh28XE0tUcbsljeP8wfan48QvAQTSSa3Q== + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"