Skip to content

Commit

Permalink
Merge pull request #105 from harshitsaini17/feature/folder-structure
Browse files Browse the repository at this point in the history
Fix: modify folder structure
  • Loading branch information
a19hu authored Jan 28, 2025
2 parents 62d1f1b + 3cbf6ad commit 1412887
Show file tree
Hide file tree
Showing 23 changed files with 60 additions and 24 deletions.
36 changes: 36 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
4 changes: 2 additions & 2 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import './App.css';
import { BrowserRouter, Route, Routes } from "react-router-dom";
import Navbar from "./component/Navbar";
import Navbar from "./components/Navbar";
import Home from "./pages/Home";
import Search from './pages/Search';
import { DataProvider } from './context/DataContext';
import ImageTree from './pages/ImageTree';
import ImageTree from './pages/3DTree';
import React, { useEffect, useState } from 'react';
import axios from 'axios';
import { ToastContainer, toast } from 'react-toastify';
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { useState } from 'react';
import Tree from 'react-d3-tree';
import '../Style/home.css'
import '../assets/Style/home.css'
import { CircularProgressbar } from 'react-circular-progressbar';
import 'react-circular-progressbar/dist/styles.css';
import Profile from '../component/Profile';
import Profile from './Profile';

const DTree = ({ data }) => {
const TwoDTree = ({ data }) => {
const [roll, setroll] = useState()
const [showModal, setShowModal] = useState(false);
const value = 0.5;
Expand Down Expand Up @@ -104,4 +104,4 @@ const DTree = ({ data }) => {
)
}

export default DTree
export default TwoDTree
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import '../Style/tree.css'
import '../assets/Style/tree.css'
import React, { useState } from 'react'
import Profile from "../component/Profile";
import profileimg from '../image/download.jpeg'
import Profile from "./Profile";
import profileimg from '../assets/image/download.jpeg'

const IitjTree = ({ data }) => {
const studentid = data.student
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "../Style/navbar.css";
import "../assets/Style/navbar.css";
import { Link } from "react-router-dom";
import logo from "../image/logo.png";
import logo from "../assets/image/logo.png";
import React, { useState } from "react";
import { useQuery, gql } from "@apollo/client";
import { useNavigate } from 'react-router-dom';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react'
import '../Style/profile.css'
import '../assets/Style/profile.css'
import { Link } from "react-router-dom";
import { AiOutlineCloseCircle } from 'react-icons/ai';
import { FaLinkedin } from 'react-icons/fa';
import { useQuery, gql } from "@apollo/client";
import { FaChevronRight } from 'react-icons/fa';
import demo from '../image/download.jpeg'
import demo from '../assets/image/download.jpeg'
function Profile({ toggleModal, rollNo }) {
const FILMS_QUERY = gql`
query Query($rollNo: String!) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react'
import '../Style/team.css'
import '../assets/Style/team.css'
import { FaLinkedin, FaGithub} from 'react-icons/fa';
import { AiOutlineCloseCircle } from 'react-icons/ai';

Expand Down
Empty file added frontend/src/hooks/useData.ts
Empty file.
Empty file added frontend/src/hooks/useSearch.ts
Empty file.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ForceGraph3D } from 'react-force-graph';
import React from 'react';
import * as THREE from 'three';
import defaultimage from '../image/download.jpeg'
import logo from '../image/logo.png'
import background from '../image/b1.jpg'
import defaultimage from '../assets/image/download.jpeg'
import logo from '../assets/image/logo.png'
import background from '../assets/image/b1.jpg'

const ImageTree = ({ data }) => {
const nodes = [{
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/pages/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useState} from 'react'
import '../Style/home.css'
import DTree from './DTree';
import Team from './Team';
import background from '../image/b1.jpg'
import '../assets/Style/home.css'
import TwoDTree from '../components/2DTree';
import Team from '../components/Team';
import background from '../assets/image/b1.jpg'
const Home = ({data}) => {
const [teamshow,setteamshow] = useState(false)
const team=()=>{
Expand All @@ -26,7 +26,7 @@ const Home = ({data}) => {
{teamshow && (
<Team team={team} teamshow={teamshow}/>
)}
<DTree data={data}/>
<TwoDTree data={data}/>


</div>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Search.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import { useQuery, gql, } from "@apollo/client";
import IitjTree from './IitjTree';
import IitjTree from '../components/Family';
import { useNavigate,useParams } from 'react-router-dom';
import { ToastContainer, toast } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
import background from '../image/b1.jpg'
import background from '../assets/image/b1.jpg'

const Search = () => {
const navigate = useNavigate();
Expand Down
Empty file added frontend/src/types/index.ts
Empty file.
Empty file added frontend/src/utils/helpers.ts
Empty file.

0 comments on commit 1412887

Please sign in to comment.