Skip to content
This repository has been archived by the owner on Jan 4, 2025. It is now read-only.

Merge development branch #1

Merged
merged 3 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/GoogleAnalytics.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useEffect } from 'react';

// **Important** Replace this tracking ID by your Analytics code
// Or you can put it into the environment file.
const GA_TRACKING_ID = 'G-0K4K425H17';
const GA_TRACKING_ID = '';

// @ts-ignore
const addPageView = (url) => {
Expand Down Expand Up @@ -51,4 +51,4 @@ const GoogleAnalytics = () => {
);
};

export default GoogleAnalytics;
export default GoogleAnalytics;
13 changes: 7 additions & 6 deletions components/LandingPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useState, useEffect } from "react";
import Link from "next/link";
import PrimaryButton from "./buttons/PrimaryButton";
import SearchInput from "./small-components/SearchInput";

function LandingPage() {
const [hour, setHour] = useState();

Expand Down Expand Up @@ -38,7 +39,7 @@ function LandingPage() {
<div
className={`min-h-screen justify-center relative flex items-center bg-gradient-to-t ${backgroundClass}`}
>
<div class="custom-shape-divider-bottom-1682184498">
<div className="custom-shape-divider-bottom-1682184498">
<svg
data-name="Layer 1"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -48,22 +49,22 @@ function LandingPage() {
<path
d="M0,0V46.29c47.79,22.2,103.59,32.17,158,28,70.36-5.37,136.33-33.31,206.8-37.5C438.64,32.43,512.34,53.67,583,72.05c69.27,18,138.3,24.88,209.4,13.08,36.15-6,69.85-17.84,104.45-29.34C989.49,25,1113-14.29,1200,52.47V0Z"
opacity=".25"
class="shape-fill"
className="shape-fill"
></path>
<path
d="M0,0V15.81C13,36.92,27.64,56.86,47.69,72.05,99.41,111.27,165,111,224.58,91.58c31.15-10.15,60.09-26.07,89.67-39.8,40.92-19,84.73-46,130.83-49.67,36.26-2.85,70.9,9.42,98.6,31.56,31.77,25.39,62.32,62,103.63,73,40.44,10.79,81.35-6.69,119.13-24.28s75.16-39,116.92-43.05c59.73-5.85,113.28,22.88,168.9,38.84,30.2,8.66,59,6.17,87.09-7.5,22.43-10.89,48-26.93,60.65-49.24V0Z"
opacity=".5"
class="shape-fill"
className="shape-fill"
></path>
<path
d="M0,0V5.63C149.93,59,314.09,71.32,475.83,42.57c43-7.64,84.23-20.12,127.61-26.46,59-8.63,112.48,12.24,165.56,35.4C827.93,77.22,886,95.24,951.2,90c86.53-7,172.46-45.71,248.8-84.81V0Z"
class="shape-fill"
className="shape-fill"
></path>
</svg>
</div>
<div className=" px-10 max-w-screen-xl w-full mx-auto relative md:flex items-center space-y-10 justify-between ">
<div className="px-10 max-w-screen-xl w-full mx-auto relative md:flex items-center space-y-10 justify-between ">
<div className=" text-secondary font-semibold">
<h1 className=" text-4xl font-bold">Munchyroll</h1>
<h1 className=" text-4xl font-bold">Munchyroll Development Server</h1>
<h1 className=" text-4xl font-medium text-secondary-light">
Watch HD Anime For Free
</h1>
Expand Down
2 changes: 1 addition & 1 deletion pages/anime/[animeId].js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const getServerSideProps = async (context) => {
const { animeId } = context.query;

const res = await fetch(
`https://munchyroll-api.j21.dev/anime-details/${animeId}`
`https://munchyroll-api.onrender.com/anime-details/${animeId}`
);

const data = await res.json();
Expand Down
6 changes: 3 additions & 3 deletions pages/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import SearchInput from "../components/small-components/SearchInput";
import ReactGA from "react-ga";

export async function getServerSideProps() {
const popularResults = await fetch("https://munchyroll-api.j21.dev/popular");
const moviesResults = await fetch("https://munchyroll-api.j21.dev/anime-movies");
const recentResults = await fetch("https://munchyroll-api.j21.dev/recent-release");
const popularResults = await fetch("https://munchyroll-api.onrender.com/popular");
const moviesResults = await fetch("https://munchyroll-api.onrender.com/anime-movies");
const recentResults = await fetch("https://munchyroll-api.onrender.com/recent-release");

const popular = await popularResults.json();
const movies = await moviesResults.json();
Expand Down
4 changes: 0 additions & 4 deletions pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Head from "next/head";
import Image from "next/image";
import { useEffect } from "react";
import LandingPage from "../components/LandingPage";
import TawkMessengerReact from "@tawk.to/tawk-messenger-react";

import styles from "../styles/Home.module.css";

Expand All @@ -14,9 +13,6 @@ export default function Home() {
});
return (
<div>
<div className="App">
<TawkMessengerReact propertyId="622047bb1ffac05b1d7cb217" widgetId="1ft71gdb9" />
</div>
<Head>
<title>Munchyroll</title>
<meta name="title" content="Munchyroll - Watch HD Anime For Free" />
Expand Down
2 changes: 1 addition & 1 deletion pages/search/[searchId].jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const getServerSideProps = async (context) => {
const { searchId } = context.query;

const res = await fetch(
`https://munchyroll-api.j21.dev/search?keyw=${searchId}`
`https://munchyroll-api.onrender.com/search?keyw=${searchId}`
);

const data = await res.json();
Expand Down
2 changes: 1 addition & 1 deletion pages/watch/[episodeId].js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const getServerSideProps = async (context) => {
const { episodeId } = context.query;

const res = await fetch(
`https://munchyroll-api.j21.dev/vidcdn/watch/${episodeId}`
`https://munchyroll-api.onrender.com/vidcdn/watch/${episodeId}`
);

const data = await res.json();
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import axios from "axios";
const BASEURL = "https://munchyroll-api.j21.dev";
const BASEURL = "https://munchyroll-api.onrender.com";
export const getPopularAnime = async () => {
const { data } = await axios.get(`${BASEURL}/popular`);
return data;
Expand Down
1 change: 0 additions & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ module.exports = {
// h4, h5, h6, p - 16px;
});
}),
require("@tailwindcss/line-clamp"),
],
};