From d666de45661b39b1c3a4f61bfb88ff5b21a12153 Mon Sep 17 00:00:00 2001 From: Cosme Valera Date: Sat, 6 Sep 2025 17:21:53 +0200 Subject: [PATCH 1/2] Change order to be: Introduction, Jenkins, Tutorials, Deployments --- frontend/src/components/Home.tsx | 41 ++++++++++---------- frontend/src/components/IntroductionPage.tsx | 32 ++++++++------- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/frontend/src/components/Home.tsx b/frontend/src/components/Home.tsx index 14a4b37..3140dce 100644 --- a/frontend/src/components/Home.tsx +++ b/frontend/src/components/Home.tsx @@ -53,18 +53,15 @@ const Home: React.FC = ({ initialTab = "introduction" }) => { strokeLinecap="round" strokeLinejoin="round" className="main-nav__tab__icon"> - - - - + + + Introduction @@ -128,14 +127,14 @@ const Home: React.FC = ({ initialTab = "introduction" }) => { {/* Introduction Content */} {activeTab === "introduction" && } - {/* Deployments Content */} - {activeTab === "deployments" && } + {/* Jenkins Content */} + {activeTab === "jenkins" && } {/* Tutorials Content */} {activeTab === "tutorials" && } - {/* Jenkins Content */} - {activeTab === "jenkins" && } + {/* Deployments Content */} + {activeTab === "deployments" && } ); }; diff --git a/frontend/src/components/IntroductionPage.tsx b/frontend/src/components/IntroductionPage.tsx index ab87559..e9bced9 100644 --- a/frontend/src/components/IntroductionPage.tsx +++ b/frontend/src/components/IntroductionPage.tsx @@ -148,20 +148,21 @@ const IntroductionPage: React.FC = () => {
+ {/* Jenkins */}
handleNavigation('deployments')} + onClick={() => handleNavigation('jenkins')} >
- +
-

Deployments

-

Step-by-step deployment guides for Docker, Kubernetes, Kustomize, and Helm

+

Jenkins

+

CI/CD automation with live pipelines monitoring and configuration.

- Interactive Commands - Real-time Monitoring - Best Practices + Pipeline Status + Interactive Jobs + Configuration
@@ -171,6 +172,7 @@ const IntroductionPage: React.FC = () => {
+ {/* Tutorials */}
handleNavigation('tutorials')} @@ -194,20 +196,21 @@ const IntroductionPage: React.FC = () => {
+ {/* Deployments */}
handleNavigation('jenkins')} + onClick={() => handleNavigation('deployments')} >
- +
-

Jenkins

-

CI/CD automation with live pipelines monitoring and configuration.

+

Deployments

+

Step-by-step deployment guides for Docker, Kubernetes, Kustomize, and Helm

- Pipeline Status - Interactive Jobs - Configuration + Interactive Commands + Real-time Monitoring + Best Practices
@@ -216,6 +219,7 @@ const IntroductionPage: React.FC = () => {
+
From f3c4cc071cff67ae8d476e9bbf9217be5f60de33 Mon Sep 17 00:00:00 2001 From: Cosme Valera Date: Sat, 6 Sep 2025 17:26:54 +0200 Subject: [PATCH 2/2] Merge Home and HomeTabs to HomePage.tsx --- frontend/src/App.tsx | 17 ++++++++--------- .../src/components/{Home.tsx => HomePage.tsx} | 6 +++--- frontend/src/components/HomeWithTab.tsx | 12 ------------ 3 files changed, 11 insertions(+), 24 deletions(-) rename frontend/src/components/{Home.tsx => HomePage.tsx} (97%) delete mode 100644 frontend/src/components/HomeWithTab.tsx diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 83e8e9d..b751144 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -7,8 +7,7 @@ import KubernetesDeployment from "./components/deployments/KubernetesDeployment" import KustomizeDeployment from "./components/deployments/KustomizeDeployment"; import HelmDeployment from "./components/deployments/HelmDeployment"; import Dashboard from "./components/deployments/Dashboard"; -import Home from "./components/Home"; -import HomeWithTab from "./components/HomeWithTab"; +import HomePage from "./components/HomePage"; import DockerTutorial from "./components/tutorials/DockerTutorial"; import KubernetesTutorial from "./components/tutorials/KubernetesTutorial"; import KustomizeTutorial from "./components/tutorials/KustomizeTutorial"; @@ -130,17 +129,17 @@ function App() { {/* Main Content */}
- {/* Home with previews */} - } /> + {/* Main Home Page - defaults to Introduction */} + } /> - {/* Redirect routes to Home with specific tabs */} + {/* Section pages - all use HomePage with specific tabs */} } + element={} /> - } /> - } /> - } /> + } /> + } /> + } /> {/* Individual deployment pages */} } /> diff --git a/frontend/src/components/Home.tsx b/frontend/src/components/HomePage.tsx similarity index 97% rename from frontend/src/components/Home.tsx rename to frontend/src/components/HomePage.tsx index 3140dce..2ec7a56 100644 --- a/frontend/src/components/Home.tsx +++ b/frontend/src/components/HomePage.tsx @@ -5,11 +5,11 @@ import DeploymentPage from "./deployments/DeploymentPage"; import TutorialsPage from "./tutorials/TutorialsPage"; import JenkinsPage from "./jenkins/JenkinsPage"; -interface HomeProps { +interface HomePageProps { initialTab?: "introduction" | "deployments" | "tutorials" | "jenkins"; } -const Home: React.FC = ({ initialTab = "introduction" }) => { +const HomePage: React.FC = ({ initialTab = "introduction" }) => { const [activeTab, setActiveTab] = useState< "introduction" | "deployments" | "tutorials" | "jenkins" >(initialTab); @@ -139,4 +139,4 @@ const Home: React.FC = ({ initialTab = "introduction" }) => { ); }; -export default Home; +export default HomePage; diff --git a/frontend/src/components/HomeWithTab.tsx b/frontend/src/components/HomeWithTab.tsx deleted file mode 100644 index 2ea2336..0000000 --- a/frontend/src/components/HomeWithTab.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import Home from './Home' - -interface HomeWithTabProps { - tab: 'introduction' | 'deployments' | 'tutorials' | 'jenkins' -} - -const HomeWithTab: React.FC = ({ tab }) => { - return -} - -export default HomeWithTab