From 9c4be8dd617866305df4c207e87f60333b8b59d5 Mon Sep 17 00:00:00 2001 From: Arpan Laha Date: Wed, 19 Aug 2020 21:38:59 +0000 Subject: [PATCH 1/2] move google analytics into _app and change all pages to function components --- pages/_app.jsx | 77 +++++++++------------- pages/about.jsx | 42 +++++------- pages/apply/index.jsx | 117 ++++++++++++++------------------- pages/apply/nonprofits.jsx | 80 +++++++++------------- pages/apply/students.jsx | 79 +++++++++------------- pages/design.jsx | 15 ++--- pages/index.jsx | 45 +++++-------- pages/projects/[projectId].jsx | 8 +-- pages/projects/index.jsx | 9 +-- 9 files changed, 184 insertions(+), 288 deletions(-) diff --git a/pages/_app.jsx b/pages/_app.jsx index a9767f4..f5351be 100644 --- a/pages/_app.jsx +++ b/pages/_app.jsx @@ -1,51 +1,34 @@ -import React from "react"; -import App from "next/app"; -import ErrorMessage from "../components/errorMessage"; +import React, { useEffect } from "react"; import { PageTransition } from "next-page-transitions"; +import { initializeGA, logPage } from "../components/Analytics"; -export default class MyApp extends App { - constructor(props) { - super(props); - this.state = { hasError: false }; - } +export default function MyApp({ Component, pageProps }) { + useEffect(() => { + initializeGA(); + logPage(); + }, []); - componentDidCatch(error, errorInfo) { - console.error("Page Error Boundary: ", error); - // This is needed to render errors correctly in development / production - super.componentDidCatch(error, errorInfo); - } - - render() { - const { Component, pageProps } = this.props; - return ( -
- - {this.state.hasError ? ( - - ) : ( - - )} - - -
- ); - } + return ( +
+ + + + +
+ ); } diff --git a/pages/about.jsx b/pages/about.jsx index e17763e..e000ea6 100644 --- a/pages/about.jsx +++ b/pages/about.jsx @@ -6,31 +6,21 @@ import Head from "../components/head"; import Nav from "../components/nav"; import Footer from "../components/footer"; import Team from "../components/about/team"; -import { initializeGA, logPage } from "../components/Analytics"; -class AboutPage extends React.Component { - componentDidMount() { - initializeGA(); - logPage(); - } - - render() { - return ( -
- -
- ); - } +export default function AboutPage() { + return ( +
+ +
+ ); } - -export default AboutPage; diff --git a/pages/apply/index.jsx b/pages/apply/index.jsx index 7b4776a..0141385 100644 --- a/pages/apply/index.jsx +++ b/pages/apply/index.jsx @@ -1,76 +1,61 @@ -import React, { Component } from "react"; +import React from "react"; import GradientBanner from "../../components/gradientBanner"; import ActionButton from "../../components/actionButton"; import Head from "../../components/head"; import Nav from "../../components/nav"; import { Container, Row, Col } from "reactstrap"; import Footer from "../../components/footer"; -import { initializeGA, logPage } from "../../components/Analytics"; -class ApplyPage extends Component { - constructor(props) { - super(props); - this.state = {}; - } +export default function ApplyPage() { + return ( + <> + +