info-site-generator 1.0.6 → 1.0.8

package/lib/App.d.ts

@@ -0,0 +1,12 @@
+import { UserProvidedSiteData } from "../declarations";
+import "./index.css";
+import React from "react";
+/**
+ * The info site generator main component
+ * @returns A ready app based on the data provided
+ */
+declare function SiteGen({ data_provided, children, }: {
+    data_provided: UserProvidedSiteData;
+    children: React.ReactNode;
+}): import("react/jsx-runtime").JSX.Element;
+export default SiteGen;

package/lib/App.js

@@ -1,84 +1,81 @@
-import { HashRouter, Routes, Route } from "react-router-dom";
-import Home from "info-site-generator/src/pages/Home.tsx";
-import defaults from "info-site-generator/src/contentDefaults.json";
-import { ThemeContext } from "info-site-generator/src/theme.ts";
-import Wrapper from "info-site-generator/src/components/Wrapper.tsx";
-import {
-    UserProvidedSiteData,
-    ValidSiteData,
-} from "info-site-generator/declarations";
-import "./index.css";
-import Content from "info-site-generator/src/pages/Content.tsx";
-import PageGen from "info-site-generator/src/pages/Page.tsx";
-import Search from "info-site-generator/src/pages/Search.tsx";
-import React from "react";
-
+import { HashRouter, Routes, Route } from "react-router-dom";
+import Home from "./pages/Home";
+import defaults from "./contentDefaults.json";
+import { ThemeContext } from "./theme";
+import Wrapper from "./components/Wrapper";
+import "./index.css";
+import Content from "./pages/Content";
+import PageGen from "./pages/Page";
+import Search from "./pages/Search";
+import React from "react";
+
 /**
- * The info site generator
- * @param {UserProvidedSiteData} data The data of the site in SiteData format
- * @param {React.ReactNode[]} children The children
+ * The info site generator main component
  * @returns A ready app based on the data provided
- */
-function SiteGen({ data, children }) {
-    // loop through the possible site data and set defaults
-    let dataSecond = data;
-    Object.keys(defaults).forEach((key) => {
-        dataSecond[key] = data[key] || defaults[key];
-    });
-    /**
-     * @type {ValidSiteData}
-     */
-    let validData = dataSecond;
-    validData.pages?.forEach((page) => {
-        page.withLink = page.withLink ?? true;
-        // page.withLink = page.withLink === undefined ? false : page.withLink;
-    });
-    return (
-        <ThemeContext.Provider value={localStorage.getItem("theme") || "light"}>
-            <HashRouter>
-                <Routes>
-                    <Route
-                        index
-                        element={
-                            <Wrapper
-                                data={validData}
-                                component={<Home data={validData} />}
-                            />
-                        }
-                    />
-                    <Route
-                        path="all-content"
-                        element={
-                            <Wrapper
-                                data={validData}
-                                component={<Content data={validData} />}
-                            />
-                        }
-                    />
-                    <Route
-                        path="search"
-                        element={
-                            <Wrapper
-                                data={validData}
-                                component={<Search data={validData} />}
-                            />
-                        }
-                    />
-                    {children.map((page) => (
-                        <Route
-                            element={
-                                <Wrapper
-                                    data={validData}
-                                    component={<PageGen page={page} />}
-                                />
-                            }
-                            path={page.slug}
-                        />
-                    ))}
-                </Routes>
-            </HashRouter>
-        </ThemeContext.Provider>
-    );
-}
-
-export default SiteGen;
+ */
+function SiteGen({
+  data_provided,
+  children
+}) {
+  const validData = {
+    ...defaults,
+    ...data_provided
+  };
+  Object.values(validData.pages).forEach(page => {
+    page.withLink = page.withLink ?? true;
+    // page.withLink = page.withLink === undefined ? false : page.withLink;
+  });
+  return /*#__PURE__*/React.createElement(ThemeContext.Provider, {
+    value: localStorage.getItem("theme") || "light"
+  }, /*#__PURE__*/React.createElement(HashRouter, null, /*#__PURE__*/React.createElement(Routes, null, /*#__PURE__*/React.createElement(Route, {
+    index: true,
+    element: /*#__PURE__*/React.createElement(Wrapper, {
+      data: validData,
+      component: /*#__PURE__*/React.createElement(Home, {
+        data: validData
+      })
+    })
+  }), /*#__PURE__*/React.createElement(Route, {
+    path: "all-content",
+    element: /*#__PURE__*/React.createElement(Wrapper, {
+      data: validData,
+      component: /*#__PURE__*/React.createElement(Content, {
+        data: validData
+      })
+    })
+  }), /*#__PURE__*/React.createElement(Route, {
+    path: "search",
+    element: /*#__PURE__*/React.createElement(Wrapper, {
+      data: validData,
+      component: /*#__PURE__*/React.createElement(Search, {
+        data: validData
+      })
+    })
+  }), React.Children.map(children, child => {
+    // Check if it's a valid React element (not a string or null)
+    if (! /*#__PURE__*/React.isValidElement(child)) return null;
+
+    // Tell TS this element has props with an 'id'
+    const pageElement = child;
+    const pageId = pageElement.props.id;
+
+    // Get the metadata from our data object
+    const pageMetadata = validData.pages[pageId];
+    if (!pageMetadata) {
+      console.warn(`No metadata found in data object for page ID: ${pageId}`);
+      return null;
+    }
+    return /*#__PURE__*/React.createElement(Route, {
+      key: pageId,
+      path: pageMetadata.slug,
+      element: /*#__PURE__*/React.createElement(Wrapper, {
+        data: validData,
+        component: /*#__PURE__*/React.createElement(PageGen, {
+          page: pageElement,
+          data: pageMetadata
+        })
+      })
+    });
+  }))));
+}
+export default SiteGen;

package/lib/App.tsx

@@ -0,0 +1,95 @@
+import { HashRouter, Routes, Route } from "react-router-dom";
+import Home from "./pages/Home";
+import defaults from "./contentDefaults.json";
+import { ThemeContext } from "./theme";
+import Wrapper from "./components/Wrapper";
+import { UserProvidedSiteData, ValidSiteData, Theme } from "../declarations";
+import "./index.css";
+import Content from "./pages/Content";
+import PageGen from "./pages/Page";
+import Search from "./pages/Search";
+import React from "react";
+
+/**
+ * The info site generator main component
+ * @returns A ready app based on the data provided
+ */
+function SiteGen({
+    data_provided: data,
+    children,
+}: {
+    data_provided: UserProvidedSiteData;
+    children: React.ReactNode;
+}) {
+    // loop through the possible site data and set defaults
+    let dataSecond = data;
+    const typed_defaults = defaults as unknown as ValidSiteData;
+    Object.keys(defaults).forEach((key) => {
+        dataSecond[key as keyof ValidSiteData] =
+            data[key as keyof UserProvidedSiteData] ||
+            typed_defaults[key as keyof ValidSiteData];
+    });
+    /**
+     * @type {ValidSiteData}
+     */
+    let validData = dataSecond as ValidSiteData;
+    validData.pages?.forEach((page) => {
+        page.withLink = page.withLink ?? true;
+        // page.withLink = page.withLink === undefined ? false : page.withLink;
+    });
+    return (
+        <ThemeContext.Provider
+            value={(localStorage.getItem("theme") as Theme) || "light"}
+        >
+            <HashRouter>
+                <Routes>
+                    <Route
+                        index
+                        element={
+                            <Wrapper
+                                data={validData}
+                                component={<Home data={validData} />}
+                            />
+                        }
+                    />
+                    <Route
+                        path="all-content"
+                        element={
+                            <Wrapper
+                                data={validData}
+                                component={<Content data={validData} />}
+                            />
+                        }
+                    />
+                    <Route
+                        path="search"
+                        element={
+                            <Wrapper
+                                data={validData}
+                                component={<Search data={validData} />}
+                            />
+                        }
+                    />
+                    {React.Children.map(children, (page: React.ReactNode) => (
+                        <Route
+                            element={
+                                <Wrapper
+                                    data={validData}
+                                    component={
+                                        <PageGen
+                                            page={page}
+                                            data={validData.pages[page.id]}
+                                        />
+                                    }
+                                />
+                            }
+                            path={validData.pages[page?.id].slug}
+                        />
+                    ))}
+                </Routes>
+            </HashRouter>
+        </ThemeContext.Provider>
+    );
+}
+
+export default SiteGen;

package/lib/components/Navbar.js

@@ -52,7 +52,7 @@ export default function Navbar({
     id: "navbarSupportedContent"
   }, /*#__PURE__*/React.createElement("ul", {
     className: "navbar-nav me-auto mb-2 mb-lg-0"
-  }, data.pages?.map(page => /*#__PURE__*/React.createElement("li", {
+  }, Object.values(data.pages).map(page => /*#__PURE__*/React.createElement("li", {
     className: "nav-item",
     key: page.slug
   }, /*#__PURE__*/React.createElement(Link, {

package/lib/index.js

@@ -1,2 +1,3 @@
-import SiteGen from "./src/App.js";
+import SiteGen from "./App.js";
+
 export default SiteGen;

package/lib/pages/Content.js

@@ -6,7 +6,7 @@ export default function Content({
     className: "container"
   }, /*#__PURE__*/React.createElement("h2", null, data.siteTitle, " content"), /*#__PURE__*/React.createElement("div", {
     className: "row"
-  }, data.pages.map((page, index) => /*#__PURE__*/React.createElement("div", {
+  }, Object.values(data.pages).map((page, index) => /*#__PURE__*/React.createElement("div", {
     key: index,
     className: "col-md-4 mb-4 mx-2"
   }, /*#__PURE__*/React.createElement("div", {

package/lib/pages/Home.js

@@ -41,7 +41,7 @@ export default function Home({
     className: "btn btn-primary p-2"
   }, "Search")), /*#__PURE__*/React.createElement("datalist", {
     id: "searchdata"
-  }, data.pages?.map((page, index) => /*#__PURE__*/React.createElement("option", {
+  }, Object.values(data.pages).map((page, index) => /*#__PURE__*/React.createElement("option", {
     key: index,
     value: page.title
   }, page.title)))), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement("h2", null, "We answer these questions and more: "), /*#__PURE__*/React.createElement("ul", null, data.answeredQuestions?.map((question, index) => /*#__PURE__*/React.createElement("li", {
@@ -49,7 +49,7 @@ export default function Home({
   }, question))), /*#__PURE__*/React.createElement(Link, {
     to: "all-content"
   }, "Descover more content")), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement("h2", null, "Dive in with those pages:"), /*#__PURE__*/React.createElement("ul", null, data.startUpPages?.map((page, index) => {
-    const pageData = data.pages.find(p => p.title === page);
+    const pageData = Object.values(data.pages).find(p => p.title === page);
     if (!pageData) {
       console.warn(`Page with title "${page}" not found in data.pages`);
       return null;

package/lib/pages/Page.d.ts

@@ -1,4 +1,6 @@
-import { Page } from "../../declarations";
-export default function PageGen({ page }: {
-    page: Page;
+/// <reference types="react" />
+import { PageData } from "../../declarations";
+export default function PageGen({ page, data, }: {
+    page: React.ReactElement;
+    data: PageData;
 }): import("react/jsx-runtime").JSX.Element;

package/lib/pages/Page.js

@@ -1,8 +1,9 @@
 import ArrowBack from "../components/ArrowBack";
 export default function PageGen({
-  page
+  page,
+  data
 }) {
   return /*#__PURE__*/React.createElement("div", {
     className: "container mt-3"
-  }, /*#__PURE__*/React.createElement(ArrowBack, null), /*#__PURE__*/React.createElement("h2", null, page.title), /*#__PURE__*/React.createElement("blockquote", null, page.shortTitle || page.title, " - ", page.description), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("br", null), page.content || page);
+  }, /*#__PURE__*/React.createElement(ArrowBack, null), /*#__PURE__*/React.createElement("h2", null, data.title), /*#__PURE__*/React.createElement("blockquote", null, data.shortTitle || data.title, " - ", data.description), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("br", null), page || data.content);
 }

package/lib/pages/Search.js

@@ -26,10 +26,10 @@ export default function Search({
     className: "btn btn-primary p-2"
   }, "Search")), /*#__PURE__*/React.createElement("datalist", {
     id: "search-data"
-  }, data.pages?.map((page, index) => /*#__PURE__*/React.createElement("option", {
+  }, Object.values(data.pages).map((page, index) => /*#__PURE__*/React.createElement("option", {
     key: index,
     value: page.title
-  }, page.title))), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("h2", null, "Results for \"", query, "\""), data.pages?.map((page, index) => {
+  }, page.title))), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("h2", null, "Results for \"", query, "\""), Object.values(data.pages).map((page, index) => {
     if (page.title.toLowerCase().includes(searchQuery.toLowerCase())) return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "mb-3"

package/lib/styles/styles.d.ts

@@ -0,0 +1,4 @@
+declare module "*.css" {
+    const styles: CSSStyleDeclaration;
+    export default styles;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "info-site-generator",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "main": "lib/index.js",
     "author": "Enderfarmer",
     "license": "MIT",