diff --git a/.eslintrc.js b/.eslintrc.js index 9fa6060a..237f067a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,9 @@ module.exports = { - extends: 'react-app', + extends: 'next', rules: { 'react/react-in-jsx-scope': 'off', + 'react/display-name': 'off', + 'react-hooks/exhaustive-deps': 'off', 'jsx-a11y/anchor-is-valid': 'off', }, } diff --git a/package.json b/package.json index 15cd6d1e..ef9edc20 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,9 @@ "build": "next build", "start": "next start", "export": "next build && next export", - "format": "prettier {src,remark}/**/*.{css,js,mdx} --write" + "format": "prettier {src,remark}/**/*.{css,js,mdx} --write", + "lint": "next lint", + "clean": "rimraf .next" }, "browserslist": [ "> 1%" @@ -56,6 +58,7 @@ "react-dom": "^17.0.2", "react-intersection-observer": "^8.33.0", "redent": "^3.0.0", + "sharp": "^0.29.3", "simple-functional-loader": "^1.2.1", "tailwindcss": "^2.2.19", "tinytime": "^0.2.6", @@ -64,18 +67,16 @@ "devDependencies": { "@babel/core": "^7.16.0", "@types/react": "^17.0.37", - "@typescript-eslint/eslint-plugin": "2.34.0", - "@typescript-eslint/parser": "2.34.0", - "babel-eslint": "10.x", - "eslint": "6.x", - "eslint-config-react-app": "^5.2.1", - "eslint-plugin-flowtype": "4.x", - "eslint-plugin-import": "2.x", - "eslint-plugin-jsx-a11y": "6.x", - "eslint-plugin-react": "7.x", - "eslint-plugin-react-hooks": "2.x", + "@typescript-eslint/eslint-plugin": "5.6.0", + "@typescript-eslint/parser": "5.6.0", + "babel-eslint": "10.1.0", + "eslint": "7.32.0", + "eslint-config-next": "^12.0.7", + "eslint-config-react-app": "^6.0.0", + "eslint-plugin-flowtype": "8.0.3", + "eslint-plugin-import": "2.25.3", "prettier": "^2.5.1", "typescript": "^4.5.3", "webpack": "^5.65.0" } -} \ No newline at end of file +} diff --git a/src/components/Testimonials.js b/src/components/Testimonials.js index 6ffa7d6a..a0517ecd 100644 --- a/src/components/Testimonials.js +++ b/src/components/Testimonials.js @@ -1,5 +1,6 @@ import { gradients } from '@/utils/gradients' import { animate, motion, useMotionValue, useTransform } from 'framer-motion' +import Image from 'next/image' import { useEffect, useState } from 'react' import { useInView } from 'react-intersection-observer' @@ -121,11 +122,17 @@ function Testimonial({ testimonial, base, index, total }) {
-
- +
diff --git a/src/components/home/Menu.js b/src/components/home/Menu.js index aeaf689d..0d623835 100644 --- a/src/components/home/Menu.js +++ b/src/components/home/Menu.js @@ -1,6 +1,7 @@ import { Menu, Transition } from '@headlessui/react' -import { ChevronDownIcon,MenuIcon } from '@heroicons/react/solid' +import { ChevronDownIcon, MenuIcon } from '@heroicons/react/solid' import { Fragment } from 'react' +import Link from 'next/link' function classNames(...classes) { return classes.filter(Boolean).join(' ') @@ -30,89 +31,95 @@ export default function MenuButton() {
{({ active }) => ( - - Documentation - + + + Documentation + + )} {({ active }) => ( - - About - + + + About + + )} {({ active }) => ( - - Sponsors - + + + Sponsors + + )} {({ active }) => ( - - License - + + + License + + )} {({ active }) => ( - - Change Log - + + + Change Log + + )} {({ active }) => ( - -
- Javaistic on GitHub - - - - GitHub -
- + + +
+ Javaistic on GitHub + + + + GitHub +
+ + )} diff --git a/src/components/home/Newsletter.js b/src/components/home/Newsletter.js index 0cbc02c8..4c4f214c 100644 --- a/src/components/home/Newsletter.js +++ b/src/components/home/Newsletter.js @@ -17,15 +17,15 @@ export function Newsletter() {
- +
- +
- +
diff --git a/src/img/avatars/linus-trovalds.jpg b/src/img/avatars/linus-trovalds.jpg index f1befff2..8e0335ff 100644 Binary files a/src/img/avatars/linus-trovalds.jpg and b/src/img/avatars/linus-trovalds.jpg differ diff --git a/src/img/avatars/martin-fowler.jpg b/src/img/avatars/martin-fowler.jpg index c1d3fffb..759d1be6 100644 Binary files a/src/img/avatars/martin-fowler.jpg and b/src/img/avatars/martin-fowler.jpg differ diff --git a/src/img/uiuxarghya.jpg b/src/img/uiuxarghya.jpg new file mode 100644 index 00000000..846e994b Binary files /dev/null and b/src/img/uiuxarghya.jpg differ diff --git a/src/img/uiuxarghya.png b/src/img/uiuxarghya.png deleted file mode 100644 index e6500b75..00000000 Binary files a/src/img/uiuxarghya.png and /dev/null differ diff --git a/src/pages/brand.js b/src/pages/brand.js index 4261eb2f..1792bb32 100644 --- a/src/pages/brand.js +++ b/src/pages/brand.js @@ -33,18 +33,18 @@ export default function Brand() {

Main Logo: Javaistic Main Logo

-
+
- +
- + SVG - + PNG @@ -54,18 +54,18 @@ export default function Brand() {

Alternate Logo: Javaistic Alternate Logo

-
+
- +
- + SVG - + PNG @@ -78,18 +78,18 @@ export default function Brand() {

Logo Black: Javaistic Black Logo

-
+
- +
- + SVG - + PNG @@ -99,21 +99,22 @@ export default function Brand() {

Logo White: Javaistic White Logo

- - - - + + + + + +
- + SVG - + PNG diff --git a/src/pages/docs/index.js b/src/pages/docs/index.js index 28489f84..92816ab2 100644 --- a/src/pages/docs/index.js +++ b/src/pages/docs/index.js @@ -50,12 +50,13 @@ export default function DocsLandingPage() {

Start coding right now or go through Java code.

- - Start coding - + + + Start coding + +