Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: popup download header icons #96

Merged
merged 2 commits into from
Dec 22, 2023
Merged

fix: popup download header icons #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b8a688
fix: popup download header icons
YoanRos Dec 19, 2023
a1230d5
fix: index import
YoanRos Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions components/Navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@ const DownloadPopupTrigger = ({ setShowPopup }) => {

export const DownloadPopup = ({ showPopup, setShowPopup }) => {
const popupFirstFocus = useRef(null)
const [baseUrl, setBaseUrl] = useState("")

useEffect(() => {
// on popup open, focus on the first link
popupFirstFocus.current.focus()
if (typeof window !== "undefined") {
setBaseUrl(window.location.origin)
}
}, [showPopup])

return (
Expand Down Expand Up @@ -138,14 +142,14 @@ export const DownloadPopup = ({ showPopup, setShowPopup }) => {
<a href={ANDROID_URL} ref={popupFirstFocus} tabIndex={1}>
<img
className="object-contain w-full"
src="images/other/google-play-fr.png"
src={`${baseUrl}/images/other/google-play-fr.png`}
alt="télécharger dans Google Play"
/>
</a>
<a href={IOS_URL} tabIndex={1}>
<img
className="object-contain w-full"
src="images/other/app-store-fr.png"
src={`${baseUrl}/images/other/app-store-fr.png`}
alt="télécharger dans l'App Store"
/>
</a>
Expand Down
8 changes: 5 additions & 3 deletions pages/blog/[blog].js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import Navigation from "../../components/Navigation"
import React, { useState } from "react"
import Navigation, { DownloadPopup } from "../../components/Navigation"
import Footer from "../../components/Footer"
import { serialize } from "next-mdx-remote/serialize"
import { MDXRemote } from "next-mdx-remote"
Expand All @@ -11,6 +11,7 @@ import { HiChevronLeft } from "react-icons/hi"
import styles from "../../style/bloga.module.css"

const Blog = ({ mdxSource, data }) => {
const [showPopup, setShowPopup] = useState(false)
return (
<>
<Head>
Expand All @@ -20,7 +21,8 @@ const Blog = ({ mdxSource, data }) => {
<meta property="og:description" content={data.description} />
<meta property="og:image" content={data.image} />
</Head>
<Navigation />
<DownloadPopup showPopup={showPopup} setShowPopup={setShowPopup} />
<Navigation showPopup={showPopup} setShowPopup={setShowPopup} />
<div className="p-4 lg:pt-16 sm:mx-20 xl:mx-auto xl:w-[1100px]">
<div className="mb-6 text-oz-pink">
<a
Expand Down
8 changes: 5 additions & 3 deletions pages/blog/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
import React from "react"
import React, { useState } from "react"
import fs from "fs"
import path from "path"
import matter from "gray-matter"
import { serialize } from "next-mdx-remote/serialize"
import Head from "next/head"
import Navigation from "../../components/Navigation"
import Navigation, { DownloadPopup } from "../../components/Navigation"
import Footer from "../../components/Footer"
import BlogCard from "../../components/BlogCard"

const Index = ({ posts }) => {
const [showPopup, setShowPopup] = useState(false)
return (
<>
<Head>
<title>Blog | Oz Ensemble</title>
<meta property="og:title" content="Blog | Oz EEnsemble" />
</Head>
<DownloadPopup showPopup={showPopup} setShowPopup={setShowPopup} />
<div className="flex flex-col min-h-screen">
<Navigation />
<Navigation showPopup={showPopup} setShowPopup={setShowPopup} />
<div className="flex-grow py-16 mx-[10%] sm:mx-20 h-auto">
<div className="w-full mx-auto xl:w-[1100px]">
<h3 className="mb-16 text-4xl xl:text-5xl font-bold text-center lg:text-4xl text-oz-blue">
Expand Down
Loading