changed navbar commits

components/NavBar.js

@@ -30,7 +30,7 @@ const routes = [
   { title: 'Members', route: `${process.env.ASSET_PREFIX}/members` },
   { title: 'Projects', route: `${process.env.ASSET_PREFIX}/projects` },
   { title: 'Publications', route: `${process.env.ASSET_PREFIX}/publications` },
-  { title: 'Our History', route: `${process.env.ASSET_PREFIX}/about_us` },
+  { title: 'Our History', route: `${process.env.ASSET_PREFIX}/history` },
   {
     title: 'Events',
     route: `${process.env.ASSET_PREFIX}/events`,
@@ -41,7 +41,7 @@ const routes = [
       { title: 'RoadShow', route: `${process.env.ASSET_PREFIX}/roadshow` },
     ],
   },
-  { title: 'Join Us', route: `${process.env.ASSET_PREFIX}/join_us` },
+  // { title: 'Join Us', route: `${process.env.ASSET_PREFIX}/join_us` },
   { title: 'Articles', route: `${process.env.ASSET_PREFIX}/articles` },
 ];
 

pages/alt_home.tsx

@@ -0,0 +1,38 @@
+import LayoutAlt from '../components/LayoutAlt';
+import AboutUs from '../components/index/AboutUs';
+import Hero from '../components/index/Hero';
+import ProfessorsInfo from '../components/index/Professors';
+import CardCarousel from './CardCarousel';
+import Projects_spotlight from './spotlight';
+import projectsData from '../public/data/projects_common.json';
+
+const cardData = projectsData[''].projects;
+
+
+
+function Home() {
+  return (
+		<LayoutAlt title={'PIL | Home'} active={'Projects'} search={false}>
+			<div className="bg-lab-bg text-white">
+				{/* HERO SECTION */}
+				<Hero />
+
+				{/* ABOUT US SECTION */}
+				<AboutUs />
+
+				{/* PROFESSOR INFO */}
+				<ProfessorsInfo />
+				{/* <p
+					id="spotlight_title"
+					className=" text-center text-5xl text-[#8bc34a]"
+				>
+					SPOTLIGHT
+				</p>
+				<Projects_spotlight />
+				<CardCarousel cardData={cardData} /> */}
+			</div>
+		</LayoutAlt>
+  );
+}
+
+export default Home;

pages/index.js → pages/index.tsx

@@ -18,11 +18,7 @@
 // import Layout from '../components/Layout';
 
 // // project spotlight
-// import Projects_spotlight from './spotlight';
-// import CardCarousel from './CardCarousel';
-// import projectsData from '../public/data/projects_common.json';
 
-// const cardData = projectsData[''].projects;
 
 // const mainTitleStyle = {
 //   fontFamily: 'Poppins, sans-serif',
@@ -45,11 +41,7 @@
 //   color: '#8bc34a',
 // };
 
-// const bodyHeadingStyle = {
-//   fontSize: '3rem',
-//   textAlign: 'center',
-//   color: '#8bc34a',
-// };
+
 
 // const details = {
 //   display: 'flex',
@@ -270,12 +262,8 @@
 //       </Dialog>
 
 //       <div>
-//       <p id="spotlight_title" style={bodyHeadingStyle}>
-//           SPOTLIGHT
-//         </p>
-//         {/* <Projects_spotlight /> */}
-//         <CardCarousel cardData={cardData} />
-//       </div>
+
+// </div>
 
 //     </Layout>
 
@@ -295,9 +283,13 @@
 
 // export default Index;
 
-
-import Home from "./alt_home"
+import Home from './alt_home';
 
 export default function MyHome() {
-  return <Home />
-}
+	return (
+		<>
+			<Home />
+
+		</>
+	);
+}

tsconfig.json

@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "incremental": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve"
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}