diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 814f903..2c21482 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -24,6 +24,7 @@ "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-switch": "^1.0.3", "@radix-ui/react-tabs": "^1.0.4", + "@radix-ui/react-toast": "^1.1.5", "@vitejs/plugin-react-swc": "^3.5.0", "autoprefixer": "^10.4.19", "class-variance-authority": "^0.7.0", @@ -1926,6 +1927,40 @@ } } }, + "node_modules/@radix-ui/react-toast": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.1.5.tgz", + "integrity": "sha512-fRLn227WHIBRSzuRzGJ8W+5YALxofH23y0MlPLddaIpLpCDqdE0NZlS2NRQDRiptfxDeeCjgFIpexB1/zkxDlw==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-collection": "1.0.3", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-dismissable-layer": "1.0.5", + "@radix-ui/react-portal": "1.0.4", + "@radix-ui/react-presence": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-callback-ref": "1.0.1", + "@radix-ui/react-use-controllable-state": "1.0.1", + "@radix-ui/react-use-layout-effect": "1.0.1", + "@radix-ui/react-visually-hidden": "1.0.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-use-callback-ref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 353b03a..78bee8a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,6 +26,7 @@ "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-switch": "^1.0.3", "@radix-ui/react-tabs": "^1.0.4", + "@radix-ui/react-toast": "^1.1.5", "@vitejs/plugin-react-swc": "^3.5.0", "autoprefixer": "^10.4.19", "class-variance-authority": "^0.7.0", diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index 1805278..01c2e21 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -119,7 +119,7 @@ export const Navbar = () => { to={"login"} className={`border ${buttonVariants({ variant: "default" })}`} > - Login + Signup diff --git a/frontend/src/components/Team.tsx b/frontend/src/components/Team.tsx index 2917be6..f5924a7 100644 --- a/frontend/src/components/Team.tsx +++ b/frontend/src/components/Team.tsx @@ -25,7 +25,7 @@ const teamList: TeamProps[] = [ { imageUrl: "https://raw.githubusercontent.com/devitq/devitq/main/logo.png", name: "ITQ", - position: "Backend & Frontend Developer & Dev OPS", + position: "Backend & Frontend Developer", socialNetworks: [ { name: "GitHub", url: "https://github.com/devitq" }, ], diff --git a/frontend/src/components/Tree.tsx b/frontend/src/components/Tree.tsx new file mode 100644 index 0000000..9cfe637 --- /dev/null +++ b/frontend/src/components/Tree.tsx @@ -0,0 +1,40 @@ +import React, { Component, RefObject } from "react"; +import OrgChart from "@balkangraph/orgchart.js"; + +interface Node { + name: string; + img: string; + // Add more fields if needed +} + +interface ChartProps { + nodes: Node[]; +} + +export default class Chart extends Component { + private divRef: RefObject; + private chart: any; + + constructor(props: ChartProps) { + super(props); + this.divRef = React.createRef(); + } + + shouldComponentUpdate() { + return false; + } + + componentDidMount() { + this.chart = new OrgChart(this.divRef.current!, { + nodes: this.props.nodes, + nodeBinding: { + field_0: "name", + img_0: "img", + }, + }); + } + + render() { + return
; + } +} diff --git a/frontend/src/components/pages/Landing/Landing.tsx b/frontend/src/components/pages/Landing/Landing.tsx index 4dc4f09..d273a88 100644 --- a/frontend/src/components/pages/Landing/Landing.tsx +++ b/frontend/src/components/pages/Landing/Landing.tsx @@ -1,12 +1,10 @@ import { About } from "../../About"; 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 { ScrollToTop } from "../../ScrollToTop"; -import { Services } from "../../Services"; import { Team } from "../../Team"; import "../../../App.css"; import { ThemeProvider } from "../../theme-provider.tsx"; @@ -18,8 +16,6 @@ function Landing() { - {/* - */}