Skip to content

News Site Next: simplify message popup integration #471

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

Merged
flashdesignory merged 13 commits into from
Jan 29, 2025
Merged

News Site Next: simplify message popup integration #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
77cfc76
test
flashdesignory Jan 8, 2025
159929c
adjust test
flashdesignory Jan 8, 2025
723cd48
rebuild
flashdesignory Jan 10, 2025
f03179f
useLayoutEffect
flashdesignory Jan 10, 2025
7a9a711
use key for page
flashdesignory Jan 13, 2025
7a240d8
case boolean
flashdesignory Jan 13, 2025
4e783ea
Merge branch 'main' into test/useLayoutEffect
flashdesignory Jan 13, 2025
443a06e
rebuild
flashdesignory Jan 13, 2025
43a5e88
Merge branch 'main' into test/useLayoutEffect
flashdesignory Jan 15, 2025
40ccaa4
rebuild workload
flashdesignory Jan 15, 2025
d9fd79b
rebuild
flashdesignory Jan 21, 2025
8a5db3d
Merge branch 'main' into test/useLayoutEffect
flashdesignory Jan 24, 2025
ca29400
run build
flashdesignory Jan 24, 2025
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
2 changes: 1 addition & 1 deletion resources/newssite/news-next/dist/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<!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>
2 changes: 1 addition & 1 deletion ...c/9mlbrOqI73KgZatsBRObB/_buildManifest.js → ...c/YM7vvwiEXAPUyTM_zGLyL/_buildManifest.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...tic/9mlbrOqI73KgZatsBRObB/_ssgManifest.js → ...tic/YM7vvwiEXAPUyTM_zGLyL/_ssgManifest.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ic/chunks/pages/index-4a7faa2ffdab50e6.js → ...ic/chunks/pages/index-685e1f8c19060c62.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/newssite/news-next/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<!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>
1 change: 1 addition & 0 deletions resources/newssite/news-next/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions resources/newssite/news-next/src/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ export default function App() {
<DataContextProvider>
<Router>
<Routes>
<Route path="/business" element={<Page id="business" />} />
<Route path="/health" element={<Page id="health" />} />
<Route path="/opinion" element={<Page id="opinion" />} />
<Route path="/politics" element={<Page id="politics" />} />
<Route path="/us" element={<Page id="us" />} />
<Route path="/world" element={<Page id="world" />} />
<Route path="/home" element={<Page id="home" />} />
<Route path="/" element={<Page id="home" />} />
<Route path="/business" element={<Page id="business" key="business" />} />
<Route path="/health" element={<Page id="health" key="health" />} />
<Route path="/opinion" element={<Page id="opinion" key="opinion" />} />
<Route path="/politics" element={<Page id="politics" key="politics" />} />
<Route path="/us" element={<Page id="us" key="us" />} />
<Route path="/world" element={<Page id="world" key="world" />} />
<Route path="/home" element={<Page id="home" key="home" />} />
<Route path="/" element={<Page id="home" key="home" />} />
</Routes>
</Router>
</DataContextProvider>
Expand Down
6 changes: 1 addition & 5 deletions resources/newssite/news-next/src/partials/layout/layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ import { useDataContext } from "@/context/data-context";
import styles from "news-site-css/dist/layout.module.css";

export default function Layout({ children, id }) {
const [showMessage, setShowMessage] = useState(false);
const { content, links } = useDataContext();

useEffect(() => {
setShowMessage(content[id].message);
}, [id]);
const [showMessage, setShowMessage] = useState(Boolean(content[id].message));

const pageRef = useRef(null);
const { pathname } = useLocation();
Expand Down
8 changes: 2 additions & 6 deletions resources/newssite/news-next/src/partials/page/page.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect } from "react";
import { useState } from "react";
import { createPortal } from "react-dom";

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

export default function Page({ id }) {
const [showPortal, setShowPortal] = useState(false);
const { content } = useDataContext();

useEffect(() => {
setShowPortal(content[id].notification);
}, [id]);
const [showPortal, setShowPortal] = useState(Boolean(content[id].notification));

function closePortal() {
setShowPortal(false);
Expand Down