Skip to content

Commit e971009

Browse files
flashdesignoryflashdesignory
authored
Release/3.1 - merge 471 (news site remove useEffect) (#475)
1 parent 8d67f28 commit e971009

File tree

8 files changed

+15
-23
lines changed

8 files changed

+15
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
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/hVjtt3DRTxwTZ0w7LdK0j/_buildManifest.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_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":"hVjtt3DRTxwTZ0w7LdK0j","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/Jwc4rJ4Pv1N1tzU_L-d5Q/_buildManifest.js" defer=""></script><script src="./_next/static/Jwc4rJ4Pv1N1tzU_L-d5Q/_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":"Jwc4rJ4Pv1N1tzU_L-d5Q","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>

‎resources/newssite/news-next/dist/_next/static/hVjtt3DRTxwTZ0w7LdK0j/_buildManifest.js‎ renamed to ‎resources/newssite/news-next/dist/_next/static/Jwc4rJ4Pv1N1tzU_L-d5Q/_buildManifest.js‎

Lines changed: 1 addition & 1 deletion
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/hVjtt3DRTxwTZ0w7LdK0j/_ssgManifest.js‎ renamed to ‎resources/newssite/news-next/dist/_next/static/Jwc4rJ4Pv1N1tzU_L-d5Q/_ssgManifest.js‎

File renamed without changes.

‎resources/newssite/news-next/dist/_next/static/chunks/pages/index-a6d76b1b73bbfbe0.js‎ renamed to ‎resources/newssite/news-next/dist/_next/static/chunks/pages/index-d614e8004ed1a15b.js‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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-a6d76b1b73bbfbe0.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_buildManifest.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_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":"hVjtt3DRTxwTZ0w7LdK0j","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-d614e8004ed1a15b.js" defer=""></script><script src="./_next/static/Jwc4rJ4Pv1N1tzU_L-d5Q/_buildManifest.js" defer=""></script><script src="./_next/static/Jwc4rJ4Pv1N1tzU_L-d5Q/_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":"Jwc4rJ4Pv1N1tzU_L-d5Q","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ export default function App() {
1414
<DataContextProvider>
1515
<Router>
1616
<Routes>
17-
<Route path="/business" element={<Page id="business" />} />
18-
<Route path="/health" element={<Page id="health" />} />
19-
<Route path="/opinion" element={<Page id="opinion" />} />
20-
<Route path="/politics" element={<Page id="politics" />} />
21-
<Route path="/us" element={<Page id="us" />} />
22-
<Route path="/world" element={<Page id="world" />} />
23-
<Route path="/home" element={<Page id="home" />} />
24-
<Route path="/" element={<Page id="home" />} />
17+
<Route path="/business" element={<Page id="business" key="business" />} />
18+
<Route path="/health" element={<Page id="health" key="health" />} />
19+
<Route path="/opinion" element={<Page id="opinion" key="opinion" />} />
20+
<Route path="/politics" element={<Page id="politics" key="politics" />} />
21+
<Route path="/us" element={<Page id="us" key="us" />} />
22+
<Route path="/world" element={<Page id="world" key="world" />} />
23+
<Route path="/home" element={<Page id="home" key="home" />} />
24+
<Route path="/" element={<Page id="home" key="home" />} />
2525
</Routes>
2626
</Router>
2727
</DataContextProvider>

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

Lines changed: 1 addition & 5 deletions
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‎

Lines changed: 2 additions & 6 deletions
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)