Merge branch 'master' of https://github.com/Luckyhv/aniplay

Noname968 · Mar 21, 2024 · cadb97f · cadb97f
2 parents c35eead + cf74ab4
commit cadb97f
Show file tree

Hide file tree

Showing 6 changed files with 10,721 additions and 7,396 deletions.
diff --git a/src/app/anime/watch/[[...watchid]]/page.js b/src/app/anime/watch/[[...watchid]]/page.js
@@ -93,7 +93,8 @@ async function AnimeWatch({ params, searchParams }) {
           {data?.status === 'RELEASING' &&
             <NextAiringDate nextAiringEpisode={data?.nextAiringEpisode} />
           }
-          <DisqusComments
+         <div className="p-1">
+         <DisqusComments
             key={epId}
             post={{
               id: id,
@@ -102,6 +103,7 @@ async function AnimeWatch({ params, searchParams }) {
               name: "aniplayz",
             }}
           />
+         </div>
         </div>
         <div className="h-full lg:flex lg:flex-col md:max-lg:w-full gap-10">
         {/* <div className="rounded-lg hidden lg:block lg:max-w-[280px] xl:max-w-[380px] w-[100%] xl:overflow-y-scroll xl:overflow-x-hidden overflow-hidden scrollbar-hide overflow-y-hidden">
@@ -114,9 +116,9 @@ async function AnimeWatch({ params, searchParams }) {
         {/* <div className="lg:hidden">
         <Animecards data={data?.relations?.edges} cardid="Related Anime"/>
         </div> */}
-        <div className="lg:hidden">
+        {/* <div className="lg:hidden">
         <Animecards data={data?.recommendations?.nodes} cardid={"Recommendations"}/>
-        </div>
+        </div> */}
       </div>
     </>
   );

diff --git a/src/app/globals.css b/src/app/globals.css
@@ -2,21 +2,21 @@
 @tailwind components;
 @tailwind utilities;
 
-@font-face {
+/* @font-face {
     font-family: "28 Days Later";
     src: url('../static-fonts/28 Days Later.ttf');
 }
 
 .aniplay{
     font-family: "28 Days Later";
-}
+} */
 
 #disqus_thread { color-scheme: none; }
-
+/* 
 html {
-    /* scroll-behavior: smooth !important; */
+    scroll-behavior: smooth !important;
     letter-spacing:0.05rem;
-   }
+   } */
 
 ::-webkit-scrollbar {
     width: 6px;

diff --git a/src/app/layout.js b/src/app/layout.js
@@ -1,10 +1,10 @@
-import { Electrolize } from 'next/font/google'
+import { Inter } from 'next/font/google'
 import './globals.css'
 import { NextUiProvider } from "./NextUiProvider";
 // import NextTopLoader from 'nextjs-toploader';
 import Search from '@/components/search/Search'
 import GoToTop from '@/components/GoToTop';
-import localFont from 'next/font/local';
+// import localFont from 'next/font/local';
 import Footer from '@/components/Footer';
 import Script from "next/script";
 import { getAuthSession } from './api/auth/[...nextauth]/route';
@@ -13,7 +13,7 @@ import Changelogs from '../components/Changelogs';
 import FloatingButton from '@/components/FloatingButton';
 import { AuthProvider } from './SessionProvider';
 
-const electrolize = Electrolize({ weight: '400', subsets: ['latin'] })
+const inter = Inter({ subsets: ['latin'] })
 //const myfont = localFont({ src: "../static-fonts/AldotheApache.ttf" })
 
 const APP_NAME = "Aniplay";
@@ -96,7 +96,7 @@ export default async function RootLayout({ children }) {
         <link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png" />
         {/* <script src="https://kit.fontawesome.com/c189d5d7c5.js" crossOrigin="anonymous" async></script> */}
       </head>
-      <body className={electrolize.className}>
+      <body className={inter.className}>
         <AuthProvider session={session}>
           <NextUiProvider>
             {children}

diff --git a/src/components/navbar/Navbar.js b/src/components/navbar/Navbar.js
@@ -111,7 +111,7 @@ function Navbarcomponent({ home = false }) {
                 <div className={styles.logoContainer}>
                     <Link href="/" className={styles.logoLink}>
                         {/* ANIPLAY */}
-                        <Image src='/logo.svg' width={50} height={50} className="w-32 h-20 "/>
+                        <Image src='/logo.svg' width={50} height={50} className="w-32 !h-12 "/>
                     </Link>
                 </div>
                 <div className={styles.navItemsContainer}>

diff --git a/src/styles/Navbar.module.css b/src/styles/Navbar.module.css
@@ -7,7 +7,7 @@
     justify-content: space-between;
     align-items: center;
     color: white;
-    height: 68px;
+    height: 64px;
     padding: 0 6.8%;
     margin: auto;
     background: transparent;
@@ -24,10 +24,10 @@
     justify-content: space-between;
     align-items: center;
     color: white;
-    height: 68px;
+    height: 60px;
     padding: 0 3%;
     margin: auto;
-    background-color: rgba(0, 0, 0, 0.7);
+    background-color: rgba(0, 0, 0, 0.5);
     backdrop-filter: blur(4px);
     position: fixed;
     top: 0;
@@ -58,7 +58,7 @@
 }
 
 .logoLink {
-    font-size: 2.2rem;
+    font-size: 2rem;
     margin: 4px 0 0 0;
     line-height: normal;
     text-decoration: none;