Merge branch 'new' into new

iiitv · Jul 29, 2024 · 27dbd56 · 27dbd56
2 parents 6a22e7f + 9fe3615
commit 27dbd56
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 15 deletions.
diff --git a/public/cc-logo.png b/public/cc-logo.png
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -22,8 +22,8 @@ const fontBody = Inter({
 })
 
 export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
+  title: "Coding Club IIITV",
+  description: "IIITV Coding Club Blog Website",
 };
 
 export default function RootLayout({

diff --git a/src/components/footer.jsx b/src/components/footer.jsx
@@ -25,11 +25,7 @@ function Footer() {
                 <hr className="col-span-1 lg:col-span-12 footer-divider-1"/>
                 <div className="col-span-1 lg:col-span-4">
                     <div className="footer-cc-logo">
-                        <img
-                            className="footer-cc-logo-img "
-                            src="https://avatars.githubusercontent.com/u/9347727?s=200&v=4"
-                            alt="IIITV Logo"
-                        />
+                        <Image className="footer-cc-logo-img " src="/cc-logo.png" width={512} height={512} alt="IIITV Logo"/>
                         <div>
                             <p className="footer-cc-logo-title">Coding Club</p> 
                             <p className="footer-cc-logo-subtitle">Blog Website</p>
@@ -41,7 +37,6 @@ function Footer() {
                         <p>
                             Links
                         </p>
-                        <div className="footer-links-divider"></div>
                         <Link href={homeLink} className={montserratFont.className} prefetch={false}>
                             Home
                         </Link>
@@ -66,7 +61,7 @@ function Footer() {
                             <text className={montserratFont.className}>:  [email protected]</text>
                             </Link>
                             <p>Phone</p>
-                            <text className={montserratFont.className}>:  +98875503111 ,9034534472</text>
+                            <text className={montserratFont.className}>:  +919531852385, +919305066259</text>
                             <p>Address</p>
                             <Link href={addressLink} target="_blank" className={montserratFont.className}>:  c/o Block No. 9, Government Engineering College, Sector 28,
                             Gandhinagar, Gujarat
@@ -92,10 +87,10 @@ function Footer() {
                 <hr className="footer-container-2-divider"></hr>
                 <div className="footer-cc-container">
                     <p>Developed by Coding Club</p>
-                    <img
+                    <Image
                         className="footer-cc-logo-img-2"
-                        src="https://avatars.githubusercontent.com/u/9347727?s=200&v=4"
-                        alt="IIITV Logo"
+                        src="/cc-logo.png"
+                        alt="IIITV Logo" width={512} height={512}
                     />
                 </div>
             </div>

diff --git a/src/components/navbar.jsx b/src/components/navbar.jsx
@@ -2,6 +2,7 @@
 import React, { use, useState } from "react";
 import "@/styles/navbar.css";   
 import Link from "next/link";
+import Image from "next/image";
 
 function Navbar() {
     const [hiddenMenu,setHiddenMenu] = useState(true);
@@ -18,8 +19,9 @@ function Navbar() {
         <>
             <div id="pseudo"></div>
             <div className="navbar">
-                <Link href="/home" className="logo-container" prefetch={false}>
-                    <img className="logo-img"  src="https://avatars.githubusercontent.com/u/9347727?s=200&v=4" alt="IIITV Logo" />
+                <Link href="/" className="logo-container" prefetch={false}>
+                    <Image className="logo-img"  src="/cc-logo.png" alt="IIITV Logo" height={512} width={512}/>
+
                     <p className="logo-title">Coding Club</p>
                 </Link>
                 <div className="menu-container">

diff --git a/src/styles/footer.css b/src/styles/footer.css
@@ -26,6 +26,7 @@
 }
 .footer-cc-logo-img{
     height: 100px;
+    width: 100px;
 }
 .footer-cc-logo-title{
     font-size: 32px;
@@ -137,6 +138,7 @@
 }
 .footer-cc-logo-img-2{
     height: 35px;
+    width: 35px;
 }
 .footer-container-2-divider{
     position: relative;
@@ -161,16 +163,30 @@
     transform: scale(1.0);
 }
 
+/* Links on hover style */
+.footer-contact-container>div>*:hover{
+    text-decoration: underline;
+    color: aquamarine;
+    transition: 0.5s;
+}
+.footer-links-container>*:not(p):hover{
+    text-decoration: underline;
+    color: aquamarine;
+    transition: 0.5s;
+}
+
 /* Tailwind lg responsiveness */
 @media screen and (max-width : 1280px){
     .footer-cc-logo-img{
         height: 70px;
+        width: 70px;
     }
 }
 /* Tailwind less than sm size resposiveness */
 @media screen and (max-width : 640px){
     .footer-cc-logo-img{
         height: 60px;
+        width: 60px;
     }
     .footer-cc-logo-title{
         font-size: 28px;

diff --git a/src/styles/navbar.css b/src/styles/navbar.css
@@ -24,7 +24,10 @@
 	cursor: pointer;
 	transition: transform 0.3s;
 }
-.navbar>*>*:not(.mobile-menu-container):hover{
+.navbar>*>*:not(.mobile-menu-container, .logo-container>*):hover{
+	transform: scale(1.05);
+}
+.mobile-menu-container2>*:hover{
 	transform: scale(1.05);
 }
 .logo-container{
@@ -36,6 +39,7 @@
 
 .logo-img{
 	height: 50px;
+	width: 50px;
 	cursor :pointer;
 }