Skip to content

Commit

Permalink
Merge pull request #676 from Giveth/develop
Browse files Browse the repository at this point in the history
Release 2.0.6
  • Loading branch information
MohammadPCh authored May 9, 2022
2 parents 696f9b0 + 8dda267 commit 021d513
Show file tree
Hide file tree
Showing 188 changed files with 1,215 additions and 1,219 deletions.
14 changes: 13 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
{
"plugins": [
"import",
"unused-imports"
],
"extends": [
"next/core-web-vitals",
"plugin:@next/next/recommended",
"plugin:prettier/recommended"
"plugin:prettier/recommended",
],
"rules": {
"react/no-unescaped-entities": "warn",
"import/order": ["error", {
"groups": ["builtin", "external", ["internal", "parent", "sibling"], "index", "object", "type"]
}],
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{ "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
],
"prettier/prettier": [
"error",
{
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "givethdapp",
"version": "2.2.1",
"version": "2.0.6",
"private": true,
"scripts": {
"build": "next build",
Expand Down Expand Up @@ -80,10 +80,11 @@
"eslint-config-next": "^12.0.3",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.27.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-unused-imports": "^2.0.0",
"prettier": "^2.4.1",
"typescript": "4.4.4"
}
Expand Down
2 changes: 1 addition & 1 deletion pages/404.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ErrorsIndex from '@/components/views/Errors/ErrorsIndex';
import React from 'react';
import ErrorsIndex from '@/components/views/Errors/ErrorsIndex';

const Custom404 = () => {
return <ErrorsIndex statusCode='404' />;
Expand Down
4 changes: 2 additions & 2 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useEffect } from 'react';
import Head from 'next/head';
import type { AppProps } from 'next/app';
import { Toaster } from 'react-hot-toast';
import { Web3ReactProvider } from '@web3-react/core';
import { ApolloProvider } from '@apollo/client';
import { ExternalProvider, Web3Provider } from '@ethersproject/providers';
import NProgress from 'nprogress';

import { useRouter } from 'next/router';
import { NftsProvider } from '@/context/positions.context';
import { TokenDistroProvider } from '@/context/tokenDistro.context';
import { SubgraphProvider } from '@/context/subgraph.context';
Expand All @@ -19,7 +19,7 @@ import { HeaderWrapper } from '@/components/Header/HeaderWrapper';
import { FooterWrapper } from '@/components/Footer/FooterWrapper';

import '../styles/globals.css';
import { useRouter } from 'next/router';
import type { AppProps } from 'next/app';

function getLibrary(provider: ExternalProvider) {
return new Web3Provider(provider);
Expand Down
4 changes: 2 additions & 2 deletions pages/_error.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NextErrorComponent from 'next/error';
import ErrorsIndex from '@/components/views/Errors/ErrorsIndex';

import * as Sentry from '@sentry/nextjs';

import ErrorsIndex from '@/components/views/Errors/ErrorsIndex';
import { statusCodes } from '@/lib/constants/constants';

const MyError = ({ statusCode, hasGetInitialPropsRun, err }) => {
Expand Down
2 changes: 1 addition & 1 deletion pages/account.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from 'styled-components';
import { H5 } from '@giveth/ui-design-system';
import UserPublicProfileView from '@/components/views/userPublicProfile/UserPublicProfile.view';
import Head from 'next/head';
import { FC } from 'react';
import UserPublicProfileView from '@/components/views/userPublicProfile/UserPublicProfile.view';
import useUser from '@/context/UserProvider';

const NoUserContainer = styled.div`
Expand Down
8 changes: 7 additions & 1 deletion pages/donate/[slug].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react';
import Head from 'next/head';
import dynamic from 'next/dynamic';

import { captureException } from '@sentry/nextjs';
import { IProjectBySlug } from '@/apollo/types/types';
import { FETCH_PROJECT_BY_SLUG } from '@/apollo/gql/gqlProjects';
import { client } from '@/apollo/apolloClient';
import { IProjectBySlug } from '@/apollo/types/types';
import { ProjectMeta } from '@/lib/meta';

const DonateIndex = dynamic(
Expand Down Expand Up @@ -41,6 +42,11 @@ export async function getServerSideProps(props: { query: { slug: string } }) {
};
} catch (error) {
console.log({ error });
captureException(error, {
tags: {
section: 'Donate SSR',
},
});
return {
redirect: {
destination: '/',
Expand Down
2 changes: 1 addition & 1 deletion pages/maintenance.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import MaintenanceIndex from '@/components/views/Errors/MaintenanceIndex';
import React from 'react';
import MaintenanceIndex from '@/components/views/Errors/MaintenanceIndex';

const Maintenance = () => {
return <MaintenanceIndex />;
Expand Down
2 changes: 1 addition & 1 deletion pages/onboard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import OnboardView from '@/components/views/onboarding/Onboarding.view';
import Head from 'next/head';
import OnboardView from '@/components/views/onboarding/Onboarding.view';

const OnboardingRoute = () => {
return (
Expand Down
6 changes: 6 additions & 0 deletions pages/project/[projectIdSlug]/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { captureException } from '@sentry/nextjs';
import { client } from '@/apollo/apolloClient';
import { FETCH_PROJECT_BY_SLUG } from '@/apollo/gql/gqlProjects';
import { IProject } from '@/apollo/types/types';
Expand Down Expand Up @@ -28,6 +29,11 @@ export async function getServerSideProps(props: {
};
} catch (e) {
console.log({ e });
captureException(e, {
tags: {
section: 'ProjectSSR',
},
});
return {
props: {
project: null,
Expand Down
3 changes: 1 addition & 2 deletions pages/test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Head from 'next/head';
import styled from 'styled-components';
import { gToast, ToastType } from '@/components/toasts';
import { GetServerSideProps } from 'next';
import { countReset } from 'console';
import { gToast, ToastType } from '@/components/toasts';

const TestRoute = () => {
const notify = () =>
Expand Down
2 changes: 1 addition & 1 deletion pages/user/[address].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { GetServerSideProps } from 'next';
import Head from 'next/head';
import { FC } from 'react';
import styled from 'styled-components';
import { Container } from '@/components/Grid';
import { H3 } from '@giveth/ui-design-system';
import { Container } from '@/components/Grid';

import { client } from '@/apollo/apolloClient';
import { GET_USER_BY_ADDRESS } from '@/apollo/gql/gqlUser';
Expand Down
Binary file removed public/images/GIV2.png
Binary file not shown.
1 change: 0 additions & 1 deletion public/images/GIV_menu_token.svg

This file was deleted.

Binary file removed public/images/Giv.png
Binary file not shown.
3 changes: 0 additions & 3 deletions public/images/arrow_left.svg

This file was deleted.

3 changes: 0 additions & 3 deletions public/images/arrow_left_searchbox.svg

This file was deleted.

3 changes: 0 additions & 3 deletions public/images/back.svg

This file was deleted.

Loading

1 comment on commit 021d513

@vercel
Copy link

@vercel vercel bot commented on 021d513 May 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

giveth-dapps-v2 – ./

giveth-dapps-v2-git-main-givethio.vercel.app
www.giveth.io
giveth.io
giveth-dapps-v2-givethio.vercel.app

Please sign in to comment.