Merge branch 'main' of https://github.com/Central-University-IT-prod/PROD-Animulichki-SkillHub

frontend/src/components/pages/Admin/Admin.tsx

@@ -1,32 +1,32 @@
-import { Button } from "../../shared/ui/button"
-import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "../../shared/ui/resizable"
-import less from "./Admin.module.less"
-import PlayerCard from "../../entities/PlayerCard/PlayerCard"
-import { useTranslation } from "react-i18next"
-import CreateTeam from "../../widgets/CreateTeams/CreateTeams"
-import { Link } from "react-router-dom"
+import { Button } from "../../shared/ui/button";
+import {
+  ResizableHandle,
+  ResizablePanel,
+  ResizablePanelGroup,
+} from "../../shared/ui/resizable";
+import less from "./Admin.module.less";
+import PlayerCard from "../../entities/PlayerCard/PlayerCard";
+import { useTranslation } from "react-i18next";
+import CreateTeam from "../../widgets/CreateTeams/CreateTeams";
 
-const AdminPage = () =>{
-    const { t } = useTranslation();
-    return(
-        <ResizablePanelGroup direction="horizontal">
-  <ResizablePanel defaultSize={95} maxSize={95}>
-    <div className={less["main-admin"]}>
-    <Button asChild><Link to={"skill-tree"}>{t("EditTree")}</Link></Button>
-
-    <CreateTeam/>
-    </div>
-
-  </ResizablePanel>
-  <ResizableHandle withHandle />
-  <ResizablePanel>
-    <PlayerCard/>
-    <PlayerCard/>
-    <PlayerCard/>
-    <PlayerCard/>
-
-  </ResizablePanel>
-</ResizablePanelGroup>
-    )
-}
-export default AdminPage
+const AdminPage = () => {
+  const { t } = useTranslation();
+  return (
+    <ResizablePanelGroup direction="horizontal">
+      <ResizablePanel defaultSize={95} maxSize={95}>
+        <div className={less["main-admin"]}>
+          <Button>{t("EditTree")}</Button>
+          <CreateTeam />
+        </div>
+      </ResizablePanel>
+      <ResizableHandle withHandle />
+      <ResizablePanel>
+        <PlayerCard />
+        <PlayerCard />
+        <PlayerCard />
+        <PlayerCard />
+      </ResizablePanel>
+    </ResizablePanelGroup>
+  );
+};
+export default AdminPage;

frontend/src/components/pages/Landing/Landing.tsx

@@ -1,22 +1,41 @@
-import less from "./Landing.module.less"
-import '../../../i18n'
-import { Button } from "../../shared/ui/button"
-import { Label } from "@radix-ui/react-menubar"
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { About } from "../../About";
+import { Cta } from "../../Cta";
+import { FAQ } from "../../FAQ";
+import { Features } from "../../Features";
+import { Footer } from "../../Footer";
+import { Hero } from "../../Hero";
+import { HowItWorks } from "../../HowItWorks";
+import { Navbar } from "../../Navbar";
+import { Newsletter } from "../../Newsletter";
+import { Pricing } from "../../Pricing";
+import { ScrollToTop } from "../../ScrollToTop";
+import { Services } from "../../Services";
+import { Sponsors } from "../../Sponsors";
+import { Team } from "../../Team";
+import { Testimonials } from "../../Testimonials";
+import "../../../App.css";
+import { ThemeProvider } from "../../theme-provider.tsx";
 
 function Landing() {
-    const { t } = useTranslation();
-
   return (
-      <><div className={less.block}></div>
-        <h1 className={less.landing}>{t("landingLogo")}</h1>
-        <div className={less["info-block"]}>
-            <Label className={less["desc-text"]}>{t("landingDesc")}</Label>
-            <Button variant="outline" asChild><Link to={"login"}> {t("buttonGoTOReg")}</Link></Button>
-        </div>
-        </>
-  )
+    <ThemeProvider>
+      <Navbar />
+      <Hero />
+      <Sponsors />
+      <About />
+      <HowItWorks />
+      <Features />
+      <Services />
+      <Cta />
+      <Testimonials />
+      <Team />
+      <Pricing />
+      <Newsletter />
+      <FAQ />
+      <Footer />
+      <ScrollToTop />
+    </ThemeProvider>
+  );
 }
 
-export default Landing
+export default Landing;

frontend/src/components/pages/Tree/Tree.jsx

@@ -0,0 +1,21 @@
+import React, { Component } from "react";
+import OrgChart from "../../../mytree.jsx";
+
+const Tree = () => {
+  return (
+    <div style={{ height: "100%" }}>
+      <OrgChart
+        nodes={[
+          { id: 1, name: "Denny Curtis", title: "CEO", img: "https://cdn.balkan.app/shared/2.jpg" },
+          { id: 2, pid: 1, name: "Ashley Barnett", title: "Sales Manager", img: "https://cdn.balkan.app/shared/3.jpg" },
+          { id: 3, pid: 1, name: "Caden Ellison", title: "Dev Manager", img: "https://cdn.balkan.app/shared/4.jpg" },
+          { id: 4, pid: 2, name: "Elliot Patel", title: "Sales", img: "https://cdn.balkan.app/shared/5.jpg" },
+          { id: 5, pid: 2, name: "Lynn Hussain", title: "Sales", img: "https://cdn.balkan.app/shared/6.jpg" },
+          { id: 6, pid: 3, name: "Tanner May", title: "Developer", img: "https://cdn.balkan.app/shared/7.jpg" },
+          { id: 7, pid: 3, name: "Fran Parsons", title: "Developer", img: "https://cdn.balkan.app/shared/8.jpg" },
+        ]}
+      />
+    </div>
+  );
+};
+export default Tree;