Skip to content

Commit

Permalink
Merge pull request #1380 from Giveth/develop
Browse files Browse the repository at this point in the history
Release 2.2.0
  • Loading branch information
MohammadPCh authored Aug 16, 2022
2 parents 15f540d + 1e7ce4e commit 910f714
Show file tree
Hide file tree
Showing 249 changed files with 9,524 additions and 4,497 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"extends": [
"next/core-web-vitals",
"plugin:@next/next/recommended",
"plugin:prettier/recommended",
"plugin:prettier/recommended"
],
"rules": {
"react/no-unescaped-entities": "warn",
Expand Down
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: BUG
labels: bug
assignees: MoeNick

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/user-story.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: User Story
about: 'Smallest unit of work. It''s an end goal, expressed from the software user''s
perspective. '
title: User Story
labels: User Story
assignees: ''

---

**As a [_persona_], I [_want to_], [_so that_].**

Breaking this down:

"As a [persona]": Who are we building this for? We’re not just after a job title, we’re after the persona of the person. Max. Our team should have a shared understanding of who Max is. We’ve hopefully interviewed plenty of Max’s. We understand how that person works, how they think and what they feel. We have empathy for Max.
“Wants to”: Here we’re describing their intent — not the features they use. What is it they’re actually trying to achieve? This statement should be implementation free — if you’re describing any part of the UI and not what the user goal is you're missing the point.
“So that”: how does their immediate desire to do something this fit into their bigger picture? What’s the overall benefit they’re trying to achieve? What is the big problem that needs solving?

For example, user stories might look like:
As Max, I want to invite my friends, so we can enjoy this service together.
As Sascha, I want to organize my work, so I can feel more in control.
As a manager, I want to be able to understand my colleagues progress, so I can better report our sucess and failures.
31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "givethdapp",
"version": "2.1.1",
"version": "2.2.0",
"private": true,
"scripts": {
"build": "next build",
Expand All @@ -10,7 +10,9 @@
"start": "next start"
},
"resolutions": {
"styled-components": "^5"
"styled-components": "^5",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6"
},
"dependencies": {
"@apollo/client": "^3.4.16",
Expand All @@ -22,7 +24,7 @@
"@reduxjs/toolkit": "^1.8.1",
"@sentry/nextjs": "^6.19.3",
"@toruslabs/torus-embed": "^1.20.2",
"@uniswap/v3-sdk": "^3.6.2-optimism-regenesis",
"@uniswap/v3-sdk": "3.9.0",
"@web3-react/core": "^6.1.9",
"@web3-react/injected-connector": "^6.0.7",
"@web3-react/walletconnect-connector": "^6.2.13",
Expand All @@ -34,19 +36,19 @@
"framer-motion": "^6.2.8",
"graphql": "^16.0.1",
"human-standard-token-abi": "^2.0.0",
"lodash.debounce": "^4.0.8",
"lodash.isequal": "^4.5.0",
"next": "^12.1.6",
"next": "^12.2.3",
"nprogress": "^0.2.0",
"quill": "^1.3.7",
"quill-emoji": "^0.2.0",
"quill-image-drop-and-paste": "^1.2.10",
"quill-image-drop-and-paste": "^1.2.11",
"quill-image-resize-module": "^3.0.0",
"quill-magic-url": "4.1.4",
"react": "^18.0.0",
"quill-magic-url": "^4.1.7",
"react": "^18.2.0",
"react-custom-scrollbars": "^4.2.1",
"react-dom": "^18.0.0",
"react-dropzone": "^11.5.3",
"react-datepicker": "^4.8.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.2",
"react-google-maps": "^9.4.5",
"react-hook-form": "^7.32.2",
"react-hot-toast": "^2.1.1",
Expand All @@ -56,22 +58,21 @@
"react-redux": "^8.0.1",
"react-select": "^5.2.1",
"react-share": "^4.4.0",
"sharp": "^0.30.3",
"sharp": "^0.30.5",
"siwe": "^1.1.6",
"styled-components": "^5.3.0",
"unsplash-js": "^7.0.15"
},
"devDependencies": {
"@next/bundle-analyzer": "^12.1.4",
"@types/apollo-upload-client": "^14.1.0",
"@types/axios": "^0.14.0",
"@types/lodash.debounce": "^4.0.6",
"@types/lodash.isequal": "^4.5.5",
"@types/node": "16.11.6",
"@types/nprogress": "^0.2.0",
"@types/react": "17.0.34",
"@types/react": "^18.0.15",
"@types/react-custom-scrollbars": "^4.0.9",
"@types/react-dom": "^17.0.11",
"@types/react-datepicker": "^4.4.1",
"@types/react-dom": "^18.0.6",
"@types/react-html-parser": "^2.0.2",
"@types/react-lottie": "^1.2.6",
"@types/react-modal": "^3.13.1",
Expand Down
7 changes: 4 additions & 3 deletions pages/project/[projectIdSlug]/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { FC } from 'react';
import { client } from '@/apollo/apolloClient';
import { FETCH_PROJECT_BY_SLUG } from '@/apollo/gql/gqlProjects';
import { IProject } from '@/apollo/types/types';

import ProjectIndex from '@/components/views/project/ProjectIndex';
import { IProjectBySlug } from '@/apollo/types/gqlTypes';

const ProjectRoute = (props: { project?: IProject }) => {
return <ProjectIndex project={props.project} />;
const ProjectRoute: FC<IProjectBySlug> = ({ project }) => {
return <ProjectIndex project={project} />;
};

export async function getServerSideProps(props: {
Expand Down
15 changes: 3 additions & 12 deletions pages/user/[address].tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
import { GetServerSideProps } from 'next';
import { FC } from 'react';
import styled from 'styled-components';
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';
import { IUser } from '@/apollo/types/types';
import UserPublicProfileView from '@/components/views/userPublicProfile/UserPublicProfile.view';
import { GeneralMetatags } from '@/components/Metatag';
import { transformGraphQLErrorsToStatusCode } from '@/helpers/requests';
import ErrorsIndex from '@/components/views/Errors/ErrorsIndex';

interface IUserRouteProps {
user?: IUser;
}

const UserRoute: FC<IUserRouteProps> = ({ user }) => {
// When user is not found, GQL doesn't return any error. After backend is fixed, this can be deleted.
if (!user) {
return (
<Container>
<NotFound>User not found</NotFound>
</Container>
);
return <ErrorsIndex statusCode='404' />;
}

return (
Expand All @@ -42,10 +37,6 @@ const UserRoute: FC<IUserRouteProps> = ({ user }) => {
);
};

const NotFound = styled(H3)`
margin: 200px 0;
`;

export const getServerSideProps: GetServerSideProps = async context => {
try {
const { query } = context;
Expand Down
15 changes: 15 additions & 0 deletions pages/verification/[slug]/[token].tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React, { useEffect } from 'react';

import { setShowFooter } from '@/features/general/general.slice';
import EmailVerificationIndex from '@/components/views/verification/EmailVerificationIndex';
import { useAppDispatch } from '@/features/hooks';

export default function Token() {
const dispatch = useAppDispatch();

useEffect(() => {
dispatch(setShowFooter(false));
}, []);

return <EmailVerificationIndex />;
}
25 changes: 25 additions & 0 deletions pages/verification/[slug]/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import Head from 'next/head';
import { useEffect } from 'react';
import VerificationIndex from '@/components/views/verification/VerificationIndex';
import { setShowFooter } from '@/features/general/general.slice';
import { VerificationProvider } from '@/context/verification.context';
import { useAppDispatch } from '@/features/hooks';

const VerificationRoute = () => {
const dispatch = useAppDispatch();

useEffect(() => {
dispatch(setShowFooter(false));
}, []);

return (
<VerificationProvider>
<Head>
<title>Verify a Project | Giveth</title>
</Head>
<VerificationIndex />
</VerificationProvider>
);
};

export default VerificationRoute;
2 changes: 1 addition & 1 deletion public/images/$nice.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

1 comment on commit 910f714

@vercel
Copy link

@vercel vercel bot commented on 910f714 Aug 16, 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 – ./

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

Please sign in to comment.