Merge branch 'main' of https://github.com/akshatjain1004/iitj_family_tree

Author: akshatjain1004

backend/family_tree/family_tree/schema.py

@@ -0,0 +1,7 @@
+import graphene
+from student.schema import Query as student_query
+
+class Query(student_query):
+    pass
+
+schema=graphene.Schema(query=Query)

backend/family_tree/family_tree/settings.py

@@ -31,6 +31,7 @@
 # Application definition
 
 INSTALLED_APPS = [
+    "student",
     "graphene_django",
     'django.contrib.admin',
     'django.contrib.auth',
@@ -126,5 +127,5 @@
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 GRAPHENE = {
-    "SCHEMA": "django_root.schema.schema"
+    "SCHEMA": "family_tree.schema.schema"
 }

backend/family_tree/student/admin.py

@@ -1,3 +1,5 @@
 from django.contrib import admin
 
-# Register your models here.
+from .models import Student
+
+admin.site.register(Student)

backend/family_tree/student/models.py

@@ -1,17 +1,26 @@
 from django.db import models
 
 class Student(models.Model):
-    id= models.CharField(max_length=9)
+    roll_no= models.CharField(max_length=9)
     name= models.CharField(max_length=50)
     branch= models.CharField(max_length=50)
     year= models.CharField(max_length=4)
     picture= models.URLField(max_length=200)
     homeTown= models.CharField(max_length=200)
+<<<<<<< HEAD
     extraCurriculars= models.CharField(max_length=2000)
     socialMedia= models.ForeignKey('SocialMedia')
     linkedIn= models.URLField(max_length=200)
     email= models.EmailField(max_length=254)
     parentId= models.CharField(max_length=9)
+=======
+    extraCurriculars= models.CharField(max_length=400)
+    socialMedia= models.URLField()
+    linkedIn= models.URLField(max_length=200)
+    email= models.EmailField(max_length=254)
+    parentId= models.CharField(max_length=400)
+
+>>>>>>> f3c5d575314c25efa18736f1f5355e7c052ec9a5
 
 class SocialMedia(models.Model):
 		facebook = models.URLField(max_length=255)

backend/family_tree/student/schema.py

@@ -0,0 +1,14 @@
+import graphene
+from graphene_django import DjangoObjectType
+from student.models import Student
+
+class StudentType(DjangoObjectType):
+    class Meta:
+        model= Student
+        fields= ("id","name","branch","year","picture","homeTown","extraCurriculars","socialMedia", "linkedIn","email","parentId","roll_no")
+        filter_fields=["id","name","branch","year","email","parentId","roll_no"]
+
+class Query(graphene.ObjectType):
+    students=graphene.List(StudentType)
+
+schema=graphene.Schema(query=Query)

frontend/family_tree/src/App.css

@@ -4,7 +4,6 @@
   display: flex;
   align-items: center;
   flex-direction: column;
-  /* background-image: linear-gradient(90deg, #8820dd, orange); */
 }
 
 .help {
@@ -47,4 +46,4 @@
   margin-right: 10px;
   width: 150px;
   height: 170px;
-}
+}

frontend/family_tree/src/App.js

@@ -7,7 +7,7 @@ import StudentData from "./Data.json";
 function App() {
   return (
     <div className="App">
-      <SearchBar placeholder="Enter the Name or Roll Number..." data={StudentData} />
+      <SearchBar placeholder="Enter the Name or Roll Number..." studentData={StudentData} />
       <div className="help">
         <Help />
       </div>

frontend/family_tree/src/Components/SearchBar.js

@@ -1,27 +1,26 @@
 import React, { useState } from "react";
-import "./SearchBar.css";
+import "../Styles/SearchBar.css";
 import SearchIcon from "@material-ui/icons/Search";
 import CloseIcon from "@material-ui/icons/Close"
 
-function SearchBar({ placeholder, data }) {
+function SearchBar({ placeholder, studentData }) {
   const [filteredData, setFilteredData] = useState([]);
   const [wordEntered, setWordEntered] = useState("");
 
   const handleFilter = (event) => {
     const searchWord = event.target.value;
     setWordEntered(searchWord);
-    const newFilter = data.filter((value) => {
-      return value.title.toLowerCase().includes(searchWord.toLowerCase());
-    });
-
     if (searchWord.length < 3) {
       setFilteredData([]);
     } else {
-      setFilteredData(newFilter);
+      const filteredResults = studentData.filter((query) => {
+        return query.student.name.toLowerCase().includes(searchWord.toLowerCase()) + query.student.id.toLowerCase().includes(searchWord.toLowerCase());
+      });
+      setFilteredData(filteredResults);
     }
   };
 
-  const clearInput = () => {
+  const clearState = () => {
     setFilteredData([]);
     setWordEntered("");
   };
@@ -36,20 +35,18 @@ function SearchBar({ placeholder, data }) {
           onChange={handleFilter}
         />
         <div className="searchIcon">
-          {filteredData.length === 0 ? (
+          {wordEntered.length === 0 ? (
             <SearchIcon />
           ) : (
-            <CloseIcon id="clearBtn" onClick={clearInput} />
+            <CloseIcon id="clearBtn" onClick={clearState} />
           )}
         </div>
       </div>
-      {filteredData.length != 0 && (
+      {filteredData.length !== 0 && (
         <div className="dataResult">
-          {filteredData.slice(0, 5).map((value, key) => {
+          {filteredData.slice(0, 5).map((value) => {
             return (
-              <a className="dataItem" href={value.link} target="_blank">
-                <p>{value.title} </p>
-              </a>
+              <p className="dataItem">{`${value.student.name} (${value.student.id})`} </p>
             );
           })}
         </div>