Skip to content

Commit 68d8f57

Browse files
flashdesignoryflashdesignory
authored
News Site Next: simplify message popup integration (#471)
1 parent a3b0e71 commit 68d8f57

File tree

9 files changed

+16
-23
lines changed

9 files changed

+16
-23
lines changed

‎resources/newssite/news-next/dist/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/9mlbrOqI73KgZatsBRObB/_buildManifest.js" defer=""></script><script src="./_next/static/9mlbrOqI73KgZatsBRObB/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"9mlbrOqI73KgZatsBRObB","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/YM7vvwiEXAPUyTM_zGLyL/_buildManifest.js" defer=""></script><script src="./_next/static/YM7vvwiEXAPUyTM_zGLyL/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"YM7vvwiEXAPUyTM_zGLyL","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>

‎resources/newssite/news-next/dist/_next/static/9mlbrOqI73KgZatsBRObB/_buildManifest.js ‎resources/newssite/news-next/dist/_next/static/YM7vvwiEXAPUyTM_zGLyL/_buildManifest.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/newssite/news-next/dist/_next/static/9mlbrOqI73KgZatsBRObB/_ssgManifest.js ‎resources/newssite/news-next/dist/_next/static/YM7vvwiEXAPUyTM_zGLyL/_ssgManifest.js

File renamed without changes.

‎resources/newssite/news-next/dist/_next/static/chunks/pages/index-4a7faa2ffdab50e6.js ‎resources/newssite/news-next/dist/_next/static/chunks/pages/index-685e1f8c19060c62.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/newssite/news-next/dist/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-4a7faa2ffdab50e6.js" defer=""></script><script src="./_next/static/9mlbrOqI73KgZatsBRObB/_buildManifest.js" defer=""></script><script src="./_next/static/9mlbrOqI73KgZatsBRObB/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"9mlbrOqI73KgZatsBRObB","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-685e1f8c19060c62.js" defer=""></script><script src="./_next/static/YM7vvwiEXAPUyTM_zGLyL/_buildManifest.js" defer=""></script><script src="./_next/static/YM7vvwiEXAPUyTM_zGLyL/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"YM7vvwiEXAPUyTM_zGLyL","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>

‎resources/newssite/news-next/package-lock.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/newssite/news-next/src/pages/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ export default function App() {
2525
<DataContextProvider>
2626
<Router>
2727
<Routes>
28-
<Route path="/business" element={<Page id="business" />} />
29-
<Route path="/health" element={<Page id="health" />} />
30-
<Route path="/opinion" element={<Page id="opinion" />} />
31-
<Route path="/politics" element={<Page id="politics" />} />
32-
<Route path="/us" element={<Page id="us" />} />
33-
<Route path="/world" element={<Page id="world" />} />
34-
<Route path="/home" element={<Page id="home" />} />
35-
<Route path="/" element={<Page id="home" />} />
28+
<Route path="/business" element={<Page id="business" key="business" />} />
29+
<Route path="/health" element={<Page id="health" key="health" />} />
30+
<Route path="/opinion" element={<Page id="opinion" key="opinion" />} />
31+
<Route path="/politics" element={<Page id="politics" key="politics" />} />
32+
<Route path="/us" element={<Page id="us" key="us" />} />
33+
<Route path="/world" element={<Page id="world" key="world" />} />
34+
<Route path="/home" element={<Page id="home" key="home" />} />
35+
<Route path="/" element={<Page id="home" key="home" />} />
3636
</Routes>
3737
</Router>
3838
</DataContextProvider>

‎resources/newssite/news-next/src/partials/layout/layout.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@ import { useDataContext } from "@/context/data-context";
1313
import styles from "news-site-css/dist/layout.module.css";
1414

1515
export default function Layout({ children, id }) {
16-
const [showMessage, setShowMessage] = useState(false);
1716
const { content, links } = useDataContext();
18-
19-
useEffect(() => {
20-
setShowMessage(content[id].message);
21-
}, [id]);
17+
const [showMessage, setShowMessage] = useState(Boolean(content[id].message));
2218

2319
const pageRef = useRef(null);
2420
const { pathname } = useLocation();

‎resources/newssite/news-next/src/partials/page/page.jsx

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useEffect } from "react";
1+
import { useState } from "react";
22
import { createPortal } from "react-dom";
33

44
import Layout from "@/partials/layout/layout";
@@ -8,12 +8,8 @@ import Toast from "@/components/toast/toast";
88
import { useDataContext } from "@/context/data-context";
99

1010
export default function Page({ id }) {
11-
const [showPortal, setShowPortal] = useState(false);
1211
const { content } = useDataContext();
13-
14-
useEffect(() => {
15-
setShowPortal(content[id].notification);
16-
}, [id]);
12+
const [showPortal, setShowPortal] = useState(Boolean(content[id].notification));
1713

1814
function closePortal() {
1915
setShowPortal(false);

0 commit comments

Comments
 (0)