Merge pull request #69 from nossas/hotfix/upgrade-nextjs

fix: remove no longer needed call after upgrade nextjs

.drone.yml

@@ -5,23 +5,23 @@ pipeline:
   test:
     image: node:14-alpine
     environment:
-      - PORT = 3000
+      - PORT=3000
       - REDIS_URL=redis://127.0.0.1:6379
       - ELASTIC_APM_SERVICE_NAME=nossas-org
       - ELASTIC_APM_SERVER_URL=http://localhost:9200
       - ELASTIC_APM_SECRET_TOKEN=1111
       - ELASTIC_APM_ACTIVE=false
     commands:
-      - apk --update add curl 
-      - npm i
-      - npm run build
-      - npm run lint
-      - npm run test
+      - apk --update add curl
+      - yarn
+      - yarn run lint
+      - yarn run test
+      - yarn run build
   publish-staging-build:
     image: plugins/docker
     repo: nossas/nossas-org
     dockerfile: Dockerfile
-    secrets: [ docker_username, docker_password ]
+    secrets: [docker_username, docker_password]
     environment:
       - NEXT_PUBLIC_BONDE_API_GRAPHQL_URL=wss://api-graphql.staging.bonde.org/v1/graphql
       - NEXT_PUBLIC_DONATION_EN_WIDGET_ID=66736
@@ -79,15 +79,15 @@ pipeline:
       - NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
       - NODE_ENV
     dockerfile: Dockerfile
-    secrets: [ docker_username, docker_password ]
+    secrets: [docker_username, docker_password]
     group: builder
     tags:
       - ${DRONE_TAG##v}
       - latest
     when:
       status: success
       event: [tag]
-  
+
   nossas-org-staging-deploy:
     image: peloton/drone-rancher
     url: http://cluster.bonde.org
@@ -96,11 +96,11 @@ pipeline:
     docker_image: nossas/nossas-org:${DRONE_BRANCH/\//-}
     timeout: 360
     confirm: true
-    secrets: [ rancher_access_key, rancher_secret_key ]
+    secrets: [rancher_access_key, rancher_secret_key]
     when:
       status: success
       event: [push]
-  
+
   nossas-org-production-deploy:
     image: peloton/drone-rancher
     url: http://cluster.bonde.org

components/Donation/DonationDrawer.tsx

@@ -32,7 +32,7 @@ const Donation: React.FC<DonationProps> = ({
 }) => {
   const { isOpen, onOpen, onClose } = disclosureOpts;
   const btnRef = React.useRef();
-  const t = (i18nKey: string, _?: any) => i18nKey;
+  // const t = (i18nKey: string, _?: any) => i18nKey;
 
   return (
     <Form>

components/Employee/index.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Box, Stack, Heading, Text, SimpleGrid, Grid } from "@chakra-ui/react";
+import { Box, Stack, Heading, Text, Grid } from "@chakra-ui/react";
 
 import { EmployeeItem } from "./EmployeeItem";
 

components/Form/InputField.tsx

@@ -37,7 +37,7 @@ const InputField: React.FC<InputFieldProps> = ({
   validate,
   ...props
 }) => {
-  const [field, meta, helpers] = useField({ name, validate });
+  const [field, meta] = useField({ name, validate });
   const borderStyles = {
     border: "1px solid",
     borderRadius: 4,

components/Form/SelectField.tsx

@@ -30,7 +30,7 @@ const SelectWidget: React.FC<SelectWidgetProps> = ({
   options: { items, type },
   ...props
 }) => {
-  const [field, meta, helpers] = useField(name);
+  const [field, meta] = useField(name);
 
   let values = {};
   if (type !== "object") items.forEach((v: string) => (values[v] = v));

components/Form/SubmitFormEntry.tsx

@@ -1,7 +1,5 @@
 import React, { useState } from "react";
 import { gql, useMutation } from "@apollo/client";
-import { Text } from "@chakra-ui/react";
-import SuccessPanel from "./SuccessPanel";
 
 const CREATE_FORM_ENTRY_GQL = gql`
   mutation(

components/Navbar/Elements.tsx

@@ -8,6 +8,7 @@ export const Nav = ({ children }) => {
   const [offset, setOffset] = useState(0);
   const [scrollUp, setScrollUp] = useState(true);
 
+  console.log(offset);
   useEffect(() => {
     window.onscroll = () => {
       setOffset((oldOffset) => {

components/Navbar/MenuItemsMobile.tsx

@@ -4,7 +4,6 @@ import {
   AccordionItem,
   AccordionButton,
   AccordionPanel,
-  AccordionIcon,
   Box,
   Link as LinkStyled,
   Stack,

lib/withApollo.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 // import App from 'next/app';
-import Head from "next/head";
 import { ApolloProvider } from "@apollo/react-hooks";
 import createApolloClient from "./apolloClient";
 // import auth0 from './auth0';
@@ -150,9 +149,6 @@ export const withApollo = ({ ssr = true }: any = {}) => (
             // https://www.apollographql.com/docs/react/api/react-apollo.html#graphql-query-data-error
             console.error("Error while running `getDataFromTree`", error);
           }
-          // getDataFromTree does not call componentWillUnmount
-          // head side effect therefore need to be cleared manually
-          Head.rewind();
         }
       }
 

theme/Button.ts

@@ -3,7 +3,7 @@ const _disabled = {
   opacity: "1",
 };
 
-export default {
+const _default = {
   baseStyle: {
     _focus: {
       boxShadow: "none",
@@ -89,3 +89,5 @@ export default {
     variant: "solid",
   },
 };
+
+export default _default;

theme/Heading.ts

@@ -1,4 +1,4 @@
-export default {
+const _default = {
   baseStyle: {
     fontWeight: 200,
   },
@@ -30,3 +30,5 @@ export default {
     size: "lg",
   },
 };
+
+export default _default;

theme/Input.ts

@@ -1,4 +1,4 @@
-export default {
+const _default = {
   variants: {
     outline: {
       field: {
@@ -13,3 +13,5 @@ export default {
     },
   },
 };
+
+export default _default;

theme/Link.ts

@@ -1,4 +1,4 @@
-export default {
+const _default = {
   baseStyle: {
     fontWeight: "bold",
     _focus: {
@@ -47,3 +47,5 @@ export default {
     size: "md",
   },
 };
+
+export default _default;

theme/Menu.ts

@@ -4,7 +4,7 @@ const itemStyle = {
   color: "white !important",
 };
 
-export default {
+const _default = {
   baseStyle: {
     list: {
       bg: "blue.main",
@@ -24,3 +24,5 @@ export default {
     },
   },
 };
+
+export default _default;

theme/Select.ts

@@ -1,4 +1,4 @@
-export default {
+const _default = {
   variants: {
     outline: {
       field: {
@@ -13,3 +13,5 @@ export default {
     },
   },
 };
+
+export default _default;

theme/Text.ts

@@ -1,4 +1,4 @@
-export default {
+const _default = {
   defaultStyles: {
     fontWeight: "normal",
   },
@@ -31,3 +31,5 @@ export default {
     size: "md",
   },
 };
+
+export default _default;

theme/colors.ts

@@ -1,4 +1,4 @@
-export default {
+const _default = {
   black: "#000000",
   white: "#FFFFFF",
   red: "#FF2B4E",
@@ -20,3 +20,5 @@ export default {
     light: "#F10991",
   },
 };
+
+export default _default;