Merge pull request WebXDAO#444 from s2sharpit/srcDir

using src directory For Improving Code Organization
ArslanYM · Jun 26, 2023 · a0582e2 · a0582e2
2 parents 034157b + 3c927bf
commit a0582e2
Show file tree

Hide file tree

Showing 47 changed files with 18 additions and 15 deletions.
diff --git a/app/blogs/page.tsx → src/app/blogs/page.tsx b/app/blogs/page.tsx → src/app/blogs/page.tsx
diff --git a/app/contributors/page.tsx → src/app/contributors/page.tsx b/app/contributors/page.tsx → src/app/contributors/page.tsx
diff --git a/app/layout.tsx → src/app/layout.tsx b/app/layout.tsx → src/app/layout.tsx
diff --git a/app/not-found.tsx → src/app/not-found.tsx b/app/not-found.tsx → src/app/not-found.tsx
diff --git a/app/page.tsx → src/app/page.tsx b/app/page.tsx → src/app/page.tsx
diff --git a/app/projects/page.tsx → src/app/projects/page.tsx b/app/projects/page.tsx → src/app/projects/page.tsx
diff --git a/app/teams/page.tsx → src/app/teams/page.tsx b/app/teams/page.tsx → src/app/teams/page.tsx
@@ -10,7 +10,7 @@ export default async function Teams() {
       <Head>
         <title>Teams | WebXDAO</title>
       </Head>
-      <section className="py-8 w-full overflow-hidden">
+      <section className="w-full overflow-hidden py-8">
         <div className="container mx-auto flex max-w-5xl flex-row flex-wrap justify-around lg:flex-nowrap ">
           <h1
             className={cn(
@@ -30,21 +30,21 @@ export default async function Teams() {
             <line x1="0" y1="0" x2="1000" y2="0" strokeWidth="2" className="stroke-black dark:stroke-white"/>
           </svg>
         </div>
-        <div className="mt-6 flex justify-center text-lg font-light leading-tight text-black dark:text-white md:text-xl ml-4 mr-1 lg:text-left sm:text-center ">
+        <div className="ml-4 mr-1 mt-6 flex justify-center text-lg font-light leading-tight text-black dark:text-white sm:text-center md:text-xl lg:text-left ">
         As online collaborators with a strong commitment to Open Source contributions.<br></br>
         We have come together to establish WebX DAO.
         </div>
       </section>
 
-      <div className="container mx-auto justify-center gap-10 lg:flex md:grid grid-cols-2 sm:block ">
+      <div className="container mx-auto grid-cols-2 justify-center gap-10 sm:block md:grid lg:flex ">
       <TeamCard Name="Vincent Villafuerte" position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>
       <TeamCard Name="Shubham Kukreti  " position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>
       <TeamCard Name="Ritvik Shukla" position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>
       <TeamCard Name="Maxime Kubik" position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>
       </div>
-      <h1 className="text-center mt-10 font-bold">WebX Guild Maintainers and Moderators</h1>
-      <h1 className="text-center mt-5">The essential role of our community projects &apos; maintainers and moderators is to ensure the <br/>proper functioning of our codebase and foster a welcoming and engaged community.</h1>
-      <div className="container mx-auto justify-center gap-10 mt-10 mb-10 lg:flex md:grid grid-cols-2 sm:block">
+      <h1 className="mt-10 text-center font-bold">WebX Guild Maintainers and Moderators</h1>
+      <h1 className="mt-5 text-center">The essential role of our community projects &apos; maintainers and moderators is to ensure the <br/>proper functioning of our codebase and foster a welcoming and engaged community.</h1>
+      <div className="container mx-auto my-10 grid-cols-2 justify-center gap-10 sm:block md:grid lg:flex">
       <TeamCard Name="David Leal" position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>
       <TeamCard Name="Krish Gupta" position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>
       <TeamCard Name="Abhinav MV" position="WebX Guild Core" github_url="" linkedin_url="" twitter_url=""/>

diff --git a/components/ContributorCard.tsx → src/components/ContributorCard.tsx b/components/ContributorCard.tsx → src/components/ContributorCard.tsx
diff --git a/components/Footer.tsx → src/components/Footer.tsx b/components/Footer.tsx → src/components/Footer.tsx
diff --git a/components/ProjectCard.tsx → src/components/ProjectCard.tsx b/components/ProjectCard.tsx → src/components/ProjectCard.tsx
diff --git a/components/TeamCard.tsx → src/components/TeamCard.tsx b/components/TeamCard.tsx → src/components/TeamCard.tsx
@@ -17,10 +17,10 @@ const TeamCard = ({
   }) => {
   return (
     <div>
-        <div className="border-2 border-black my-5 mx-auto" style={{backgroundColor: "white" , width: "150px", height:"150px" ,borderRadius: "50%"}}></div>
-        <h1 className="text-center my-1">{Name}</h1>
+        <div className="mx-auto my-5 border-2 border-black" style={{backgroundColor: "white" , width: "150px", height:"150px" ,borderRadius: "50%"}}></div>
+        <h1 className="my-1 text-center">{Name}</h1>
         <h2 className="my-1 text-center">{position}</h2>
-        <div className="flex gap-4 px-5 my-6 place-content-center">
+        <div className="my-6 flex place-content-center gap-4 px-5">
         <Link href={github_url} target="_blank">
                 <Icons.gitHub
                   className="cursor-pointer transition duration-500 hover:scale-150 hover:fill-blue-800"

diff --git a/components/cursor-hoverster.tsx → src/components/cursor-hoverster.tsx b/components/cursor-hoverster.tsx → src/components/cursor-hoverster.tsx
diff --git a/components/icons.tsx → src/components/icons.tsx b/components/icons.tsx → src/components/icons.tsx
diff --git a/components/landing/Blurbs.tsx → src/components/landing/Blurbs.tsx b/components/landing/Blurbs.tsx → src/components/landing/Blurbs.tsx
diff --git a/components/landing/Main.tsx → src/components/landing/Main.tsx b/components/landing/Main.tsx → src/components/landing/Main.tsx
diff --git a/components/landing/Partners.tsx → src/components/landing/Partners.tsx b/components/landing/Partners.tsx → src/components/landing/Partners.tsx
diff --git a/components/layout.tsx → src/components/layout.tsx b/components/layout.tsx → src/components/layout.tsx
diff --git a/components/main-nav.tsx → src/components/main-nav.tsx b/components/main-nav.tsx → src/components/main-nav.tsx
diff --git a/components/site-header.tsx → src/components/site-header.tsx b/components/site-header.tsx → src/components/site-header.tsx
diff --git a/components/star.tsx → src/components/star.tsx b/components/star.tsx → src/components/star.tsx
diff --git a/components/tailwind-indicator.tsx → src/components/tailwind-indicator.tsx b/components/tailwind-indicator.tsx → src/components/tailwind-indicator.tsx
diff --git a/components/theme-provider.tsx → src/components/theme-provider.tsx b/components/theme-provider.tsx → src/components/theme-provider.tsx
diff --git a/components/theme-toggle.tsx → src/components/theme-toggle.tsx b/components/theme-toggle.tsx → src/components/theme-toggle.tsx
diff --git a/components/ui/TopButton.css → src/components/ui/TopButton.css b/components/ui/TopButton.css → src/components/ui/TopButton.css
diff --git a/components/ui/TopButton.tsx → src/components/ui/TopButton.tsx b/components/ui/TopButton.tsx → src/components/ui/TopButton.tsx
diff --git a/components/ui/button.tsx → src/components/ui/button.tsx b/components/ui/button.tsx → src/components/ui/button.tsx
diff --git a/components/v1/Global/Blogs.jsx → src/components/v1/Global/Blogs.jsx b/components/v1/Global/Blogs.jsx → src/components/v1/Global/Blogs.jsx
diff --git a/components/v1/Global/Footer.js → src/components/v1/Global/Footer.js b/components/v1/Global/Footer.js → src/components/v1/Global/Footer.js
diff --git a/components/v1/Global/Navbar.js → src/components/v1/Global/Navbar.js b/components/v1/Global/Navbar.js → src/components/v1/Global/Navbar.js
diff --git a/components/v1/Home/AboutSection.js → src/components/v1/Home/AboutSection.js b/components/v1/Home/AboutSection.js → src/components/v1/Home/AboutSection.js
diff --git a/components/v1/Home/DeveloperPath.jsx → src/components/v1/Home/DeveloperPath.jsx b/components/v1/Home/DeveloperPath.jsx → src/components/v1/Home/DeveloperPath.jsx
diff --git a/components/v1/Home/DevprotocolBrands.jsx → src/components/v1/Home/DevprotocolBrands.jsx b/components/v1/Home/DevprotocolBrands.jsx → src/components/v1/Home/DevprotocolBrands.jsx
diff --git a/...s/v1/Home/HeroSection/CallToActionHero.js → ...s/v1/Home/HeroSection/CallToActionHero.js b/...s/v1/Home/HeroSection/CallToActionHero.js → ...s/v1/Home/HeroSection/CallToActionHero.js
diff --git a/...s/v1/Home/HeroSection/ContributeButton.js → ...s/v1/Home/HeroSection/ContributeButton.js b/...s/v1/Home/HeroSection/ContributeButton.js → ...s/v1/Home/HeroSection/ContributeButton.js
diff --git a/...ents/v1/Home/HeroSection/DiscordButton.js → ...ents/v1/Home/HeroSection/DiscordButton.js b/...ents/v1/Home/HeroSection/DiscordButton.js → ...ents/v1/Home/HeroSection/DiscordButton.js
diff --git a/components/v1/Home/HeroSection/Hero.js → src/components/v1/Home/HeroSection/Hero.js b/components/v1/Home/HeroSection/Hero.js → src/components/v1/Home/HeroSection/Hero.js
diff --git a/components/v1/Home/HeroSection/Hero2.js → src/components/v1/Home/HeroSection/Hero2.js b/components/v1/Home/HeroSection/Hero2.js → src/components/v1/Home/HeroSection/Hero2.js
diff --git a/components/v1/Home/Projects.jsx → src/components/v1/Home/Projects.jsx b/components/v1/Home/Projects.jsx → src/components/v1/Home/Projects.jsx
diff --git a/components/v1/Home/Testimonials.jsx → src/components/v1/Home/Testimonials.jsx b/components/v1/Home/Testimonials.jsx → src/components/v1/Home/Testimonials.jsx
diff --git a/components/v1/Projcts/_RepoCard.js → src/components/v1/Projcts/_RepoCard.js b/components/v1/Projcts/_RepoCard.js → src/components/v1/Projcts/_RepoCard.js
diff --git a/config/site.ts → src/config/site.ts b/config/site.ts → src/config/site.ts
diff --git a/lib/fonts.ts → src/lib/fonts.ts b/lib/fonts.ts → src/lib/fonts.ts
@@ -23,12 +23,12 @@ export const fontRoboto = FontRoboto({
 export const fontGilroy = localFont({
   src: [
     {
-      path: '../public/fonts/gilroy/Gilroy-Medium.ttf',
+      path: '../../public/fonts/gilroy/Gilroy-Medium.ttf',
       weight: '500',
       style: 'normal'
     },
     {
-      path: '../public/fonts/gilroy/Gilroy-SemiBold.ttf',
+      path: '../../public/fonts/gilroy/Gilroy-SemiBold.ttf',
       weight: '600',
       style: 'normal'
     }

diff --git a/lib/utils.ts → src/lib/utils.ts b/lib/utils.ts → src/lib/utils.ts
diff --git a/styles/globals.css → src/styles/globals.css b/styles/globals.css → src/styles/globals.css
diff --git a/types/nav.ts → src/types/nav.ts b/types/nav.ts → src/types/nav.ts
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -3,7 +3,10 @@ const { fontFamily } = require("tailwindcss/defaultTheme")
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   darkMode: ["class"],
-  content: ["app/**/*.{ts,tsx}", "components/**/*.{ts,tsx}"],
+  content: [
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
+  ],
   theme: {
     container: {
       center: true,
@@ -14,7 +17,7 @@ module.exports = {
     },
     extend: {
       zIndex: {
-        '999': 999,
+        999: 999,
       },
       colors: {
         border: "hsl(var(--border))",
@@ -76,4 +79,4 @@ module.exports = {
     },
   },
   plugins: [require("tailwindcss-animate")],
-}
+};
diff --git a/tsconfig.json b/tsconfig.json
@@ -15,7 +15,7 @@
     "jsx": "preserve",
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./*"]
+      "@/*": ["./src/*"]
     },
     "plugins": [
       {