OneBuffaloLabs · Bana0615 · Apr 22, 2025 · Apr 9, 2025 · Apr 9, 2025 · Apr 10, 2025
diff --git a/.github/workflows/reset-test-branch.yml b/.github/workflows/reset-test-branch.yml
@@ -0,0 +1,44 @@
+name: Weekly Reset Test Branch
+
+on:
+  #schedule:
+    # Runs every Sunday at 08:00 UTC (adjust as needed)
+    # Cron syntax: minute hour day(month) month day(week)
+  #  - cron: "0 8 * * 0"
+  workflow_dispatch: # Allows manual triggering from the Actions tab
+
+jobs:
+  reset_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          # Fetch all history so we can reset to main correctly
+          fetch-depth: 0
+          # Make sure the token has write permissions
+          persist-credentials: true
+
+      - name: Configure Git User
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+
+      - name: Reset Test Branch to Main
+        run: |
+          # Ensure main is up-to-date locally
+          git checkout main
+          git pull origin main
+
+          # Check out the test branch, or create it if it doesn't exist
+          git checkout test || git checkout -b test
+
+          # Reset test branch to the state of origin/main
+          echo "Resetting test branch to origin/main..."
+          git reset --hard origin/main
+
+          # Force push the reset state to the remote test branch
+          echo "Force pushing changes to test branch..."
+          git push origin test --force
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ Open [http://localhost:3000](http://localhost:3000) in your browser to view the
 
 You can modify the main content of the site by editing the following files:
 
-- pages/index.tsx: The main landing page of the website.
+- app/pages.tsx: The main landing page of the website.
 
-- pages/\_app.js: The layout file for shared elements like headers or footers.
+- app/layout.tsx: The layout file for shared elements like headers or footers.
 
 The project auto-updates changes as you edit.
 

diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -1,6 +1,8 @@
 import { Container, Row, Col } from "react-bootstrap";
 import type { Metadata } from "next";
-//Helpers
+// --- Layout ---
+import PageLayout from "@/components/PageLayout";
+// --- Helpers ---
 import { generateGithubLink } from "@/helpers/_silabs/generateGithubLink";
 
 export const metadata: Metadata = {
@@ -14,103 +16,108 @@ export default function AboutPage() {
     { template: "feature-request-template.md" }
   );
   return (
-    <Container className="main-content mt-3 mb-3">
-      <Row className="shadow-lg mt-3 p-3 bg-body rounded">
-        <h2 className="fw-bold mb-3 text-center">
-          About {process.env.NEXT_PUBLIC_APP_NAME}
-        </h2>
-        <Col lg={8}>
-          <p className="lead fs-6">About section</p>
-          <h4>Tech used to build this site</h4>
-          <div>
-            <ul>
-              <li>
-                <a
-                  href="https://github.com/SiloCityLabs/SiloCityPages"
-                  target="_blank"
-                >
-                  SiloCityPages
-                </a>
-                {" - "} A framework by SiloCityLabs leveraging Bootstrap, React,
-                and Next.js for efficient static site development. Deploy
-                seamlessly to GitHub Pages.
-              </li>
-              <li>
-                <a href="https://pokenode-ts.vercel.app/" target="_blank">
-                  Pokenode-ts
-                </a>
-                {" - "} A powerful Node.js wrapper for the PokéAPI with built-in
-                types
-              </li>
-              <li>
-                <a href="https://pages.github.com/" target="_blank">
-                  GitHub Pages
-                </a>
-              </li>
-              <li>
-                <a href="https://nextjs.org/" target="_blank">
-                  NextJs
-                </a>
-              </li>
-              <li>
-                <a href="https://react-bootstrap.netlify.app/" target="_blank">
-                  React Bootstrap
-                </a>
-              </li>
-              <li>
-                <a href="https://git-scm.com/" target="_blank">
-                  Git
-                </a>
-                {" - "} Version control software
-              </li>
-            </ul>
-          </div>
-          <h4>Non tech used to build this site</h4>
-          <div>
+    <PageLayout headerShowBadge={true}>
+      <Container className="main-content mt-3 mb-3">
+        <Row className="shadow-lg mt-3 p-3 bg-body rounded">
+          <h2 className="fw-bold mb-3 text-center">
+            About {process.env.NEXT_PUBLIC_APP_NAME}
+          </h2>
+          <Col lg={8}>
+            <p className="lead fs-6">About section</p>
+            <h4>Tech used to build this site</h4>
+            <div>
+              <ul>
+                <li>
+                  <a
+                    href="https://github.com/SiloCityLabs/SiloCityPages"
+                    target="_blank"
+                  >
+                    SiloCityPages
+                  </a>
+                  {" - "} A framework by SiloCityLabs leveraging Bootstrap,
+                  React, and Next.js for efficient static site development.
+                  Deploy seamlessly to GitHub Pages.
+                </li>
+                <li>
+                  <a href="https://pokenode-ts.vercel.app/" target="_blank">
+                    Pokenode-ts
+                  </a>
+                  {" - "} A powerful Node.js wrapper for the PokéAPI with
+                  built-in types
+                </li>
+                <li>
+                  <a href="https://pages.github.com/" target="_blank">
+                    GitHub Pages
+                  </a>
+                </li>
+                <li>
+                  <a href="https://nextjs.org/" target="_blank">
+                    NextJs
+                  </a>
+                </li>
+                <li>
+                  <a
+                    href="https://react-bootstrap.netlify.app/"
+                    target="_blank"
+                  >
+                    React Bootstrap
+                  </a>
+                </li>
+                <li>
+                  <a href="https://git-scm.com/" target="_blank">
+                    Git
+                  </a>
+                  {" - "} Version control software
+                </li>
+              </ul>
+            </div>
+            <h4>Non tech used to build this site</h4>
+            <div>
+              <p>
+                Even though this site is made primarily by{" "}
+                <a href="https://github.com/OneBuffaloLabs">OneBuffaloLabs</a>{" "}
+                we did leverage alot of other tech and sources to help bring
+                this site to you:
+              </p>
+              <ul>
+                <li>
+                  The data for this site comes from{" "}
+                  <a href="https://pokeapi.co/" target="_blank">
+                    PokéApi
+                  </a>
+                </li>
+                <li>
+                  The Pokémon type icons come from{" "}
+                  <a
+                    href="https://github.com/partywhale/pokemon-type-icons"
+                    target="_blank"
+                  >
+                    partywhale
+                  </a>{" "}
+                  and{" "}
+                  <a
+                    href="https://github.com/duiker101/pokemon-type-svg-icons"
+                    target="_blank"
+                  >
+                    duiker101
+                  </a>
+                </li>
+              </ul>
+            </div>
+          </Col>
+          <Col lg={4}>
+            <h4>Contact Us</h4>
             <p>
-              Even though this site is made primarily by{" "}
-              <a href="https://github.com/OneBuffaloLabs">OneBuffaloLabs</a> we
-              did leverage alot of other tech and sources to help bring this
-              site to you:
+              Have you found a bug, an error or just havea cool feature we
+              should add to the site? Create a ticket on our Github{" "}
+              <a href={githubLink} target="_blank" rel="noopener noreferrer">
+                here
+              </a>{" "}
+              and we will look into it!
             </p>
-            <ul>
-              <li>
-                The data for this site comes from{" "}
-                <a href="https://pokeapi.co/" target="_blank">
-                  PokéApi
-                </a>
-              </li>
-              <li>
-                The Pokémon type icons come from{" "}
-                <a
-                  href="https://github.com/partywhale/pokemon-type-icons"
-                  target="_blank"
-                >
-                  partywhale
-                </a>{" "}
-                and{" "}
-                <a
-                  href="https://github.com/duiker101/pokemon-type-svg-icons"
-                  target="_blank"
-                >
-                  duiker101
-                </a>
-              </li>
-            </ul>
-          </div>
-        </Col>
-        <Col lg={4}>
-          <h4>Contact Us</h4>
-          <p>
-            Have you found a bug, an error or just havea cool feature we should
-            add to the site? Create a ticket on our Github{" "}
-            <a href={githubLink} target="_blank" rel="noopener noreferrer">
-              here
-            </a>{" "}
-            and we will look into it!
-          </p>
-        </Col>
-      </Row>
-    </Container>
+          </Col>
+        </Row>
+      </Container>
+    </PageLayout>
   );
 }
diff --git a/app/feedback/page.tsx b/app/feedback/page.tsx
@@ -1,6 +1,8 @@
 import React, { Suspense } from "react";
 import type { Metadata } from "next";
 import { Container, Row, Col, Spinner } from "react-bootstrap";
+// --- Layout ---
+import PageLayout from "@/components/PageLayout";
 // Components
 import FeedbackForm from "@/components/FeedbackForm";
 
@@ -11,24 +13,26 @@ export const metadata: Metadata = {
 
 export default function FeedbackPage() {
   return (
-    <Container className="main-content py-3 py-md-4">
-      <h3 className="text-center mt-4">Feedback</h3>
-      <Row className="justify-content-center mt-3">
-        <Col md={10} lg={8}>
-          <Suspense
-            fallback={
-              <div className="text-center py-5">
-                <Spinner animation="border" role="status">
-                  <span className="visually-hidden">Loading Form...</span>
-                </Spinner>
-                <p className="mt-2">Loading Form...</p>
-              </div>
-            }
-          >
-            <FeedbackForm />
-          </Suspense>
-        </Col>
-      </Row>
-    </Container>
+    <PageLayout>
+      <Container className="py-3">
+        <h3 className="text-center">Feedback</h3>
+        <Row className="justify-content-center mt-3">
+          <Col md={10} lg={8}>
+            <Suspense
+              fallback={
+                <div className="text-center py-5">
+                  <Spinner animation="border" role="status">
+                    <span className="visually-hidden">Loading Form...</span>
+                  </Spinner>
+                  <p className="mt-2">Loading Form...</p>
+                </div>
+              }
+            >
+              <FeedbackForm />
+            </Suspense>
+          </Col>
+        </Row>
+      </Container>
+    </PageLayout>
   );
 }
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,13 +1,14 @@
-// app/layout.tsx
 import { Suspense } from "react";
+// --- Next ---
 import type { Metadata, Viewport } from "next";
 import { Inter } from "next/font/google";
-import MonHeader from "@/components/MonHeader";
-import MonFooter from "@/components/MonFooter";
+// --- Components ---
+import GoogleAnalytics from "@/components/_silabs/GoogleAnalytics";
+
+// --- Styles ---
 import "bootstrap/dist/css/bootstrap.min.css";
 import "@/public/styles/_fw.css";
 import "./globals.css";
-import GoogleAnalytics from "@/components/_silabs/GoogleAnalytics";
 
 // --- Environment Variables ---
 const GA_TRACKING_ID = process.env.NEXT_PUBLIC_APP_GA_TRACKING_ID;
@@ -33,10 +34,9 @@ export const viewport: Viewport = {
   width: "device-width",
   initialScale: 1,
   maximumScale: 1,
-  // themeColor: "#ffffff", // Optional: Add theme color
 };
 
-// Setup a font (example using Inter)
+// Setup a font
 const inter = Inter({ subsets: ["latin"] });
 
 export default function RootLayout({
@@ -47,13 +47,7 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body className={inter.className}>
-        <div className="main-container">
-          <MonHeader showBadge={true} />
-          <main className="main-content">
-            {children} {/* Page content */}
-          </main>
-          <MonFooter />
-        </div>
+        {children}
 
         {GA_TRACKING_ID && (
           <Suspense fallback={null}>