Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024-04 1st sprint staging upgrade #582

Merged
merged 33 commits into from Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5bf3845
Add Gitcoin stamps support (#572)
selankon Mar 8, 2024
7840387
Use specific variable for GPS token
selankon Mar 11, 2024
e1eb257
Implement gitcoin creation preview
selankon Mar 11, 2024
1fdbbb3
Implement gpsWeighted components
selankon Mar 11, 2024
a37d383
Implement non weight predicate
selankon Mar 11, 2024
4451046
Fix predicate for only one stamp
selankon Mar 11, 2024
1da1fc2
Add translations
selankon Mar 12, 2024
285459d
Implement token census max size limit (#584)
selankon Mar 14, 2024
5f7d2f1
Use gitcoin iconURI (#596)
selankon Mar 14, 2024
965ecd6
Fix slider limit
selankon Mar 15, 2024
afdd6f5
Add buttons to set the slider
selankon Mar 15, 2024
8a65abd
Merge pull request #599 from vocdoni/b/fix-census-slider-max-value
marcvelmer Mar 15, 2024
d8ebd90
Fix gitcoin census creation time (#594)
selankon Mar 15, 2024
12e10c9
MD editor default value (#591)
selankon Mar 18, 2024
ce818b3
Delete unused component
selankon Mar 15, 2024
35ad4b3
Fix style override
selankon Mar 15, 2024
380b815
Delete contrast variant
selankon Mar 15, 2024
ca09c0b
Disable sticky on little screens
selankon Mar 21, 2024
46b6a0b
Generate correct predicate for Gitcoin non-weifhted no stamp census
emmdim Mar 19, 2024
bcbe65f
Wallet addresses census visual improvement (#610)
selankon Mar 22, 2024
f16e43c
Minor, ensure address is hex prefixed on org copy button
elboletaire Mar 25, 2024
78edc98
Upgrade @vocdoni/chakra-components to 0.7.15
elboletaire Mar 25, 2024
5ce3514
Get icon based on network name
selankon Mar 22, 2024
3aa72a4
Implement share modal (#615)
selankon Apr 2, 2024
0f90f55
Improve census info (#612)
selankon Apr 2, 2024
41ca279
Gitflow style issues (#618)
selankon Apr 2, 2024
6beb021
Fix share button responsiveness (#625)
selankon Apr 2, 2024
4797d55
Refactor onvote landing (#607)
selankon Apr 2, 2024
9cba3fa
New Landing (for vocdoni.app) (#570)
jpaulet Apr 2, 2024
526d009
PRO plan modal and features (#555)
gerouvi Apr 2, 2024
0988c92
Fixes census3 creation attemts to 100 (#617)
emmdim Apr 2, 2024
d858587
responsive home issues (#632)
gerouvi Apr 3, 2024
05db490
fixed issue, changed repeated emailjs_public_id to email_js_service_id
gerouvi Apr 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
@@ -1,2 +1,2 @@
VOCDONI_ENVIRONMENT=prod
FEATURES='{"faucet":true,"vote":{"anonymous":true,"overwrite":true,"secret":true},"login":["web3","web2"],"census":["spreadsheet","token","web3"],"languages":["en","es","ca"]}'
FEATURES='{"faucet":true,"vote":{"anonymous":true,"overwrite":true,"secret":true,"customization":true},"types":{"single":true,"multi":false,"approval":false,"participatory":false,"borda":false},"login":["web3","web2"],"census":["spreadsheet","token","web3"],"unimplemented_census":[],"voting_type":["single"],"unimplemented_voting_type":[],"languages":["en","es","ca"]}'
2 changes: 2 additions & 0 deletions package.json
Expand Up @@ -6,6 +6,7 @@
"@chakra-ui/anatomy": "^2.1.2",
"@chakra-ui/icons": "^2.0.19",
"@chakra-ui/react": "^2.7.1",
"@emailjs/browser": "^4.1.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@ethersproject/abstract-signer": "^5.7.0",
Expand Down Expand Up @@ -93,6 +94,7 @@
"typescript": "^5.0.2",
"vite": "^4.4.4",
"vite-plugin-html": "^3.2.0",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^4.2.1"
},
"packageManager": "yarn@1.22.19",
Expand Down
Binary file added public/default/assets/agm.avif
Binary file not shown.
Binary file added public/default/assets/barca.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/bellpuig.svg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/berga.svg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,277 changes: 2,277 additions & 0 deletions public/default/assets/bisbal.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/bloock.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/budgeting.avif
Binary file not shown.
Binary file added public/default/assets/coec.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/decidim.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/decidim.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/devices_vocdoni.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/elections.avif
Binary file not shown.
10 changes: 10 additions & 0 deletions public/default/assets/erc.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/default/assets/logo-classic.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/mbl.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/omnium.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/online-survey.avif
Binary file not shown.
Binary file added public/default/assets/online-voting.avif
Binary file not shown.
Binary file added public/default/assets/pc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 101 additions & 0 deletions public/default/assets/pirates.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/software-integration.avif
Binary file not shown.
Binary file added public/default/assets/solutions.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/vocdoni.jpeg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/default/assets/vocdoni_usage.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/default/assets/vocdoniapp.png
Binary file not shown.
Binary file added public/onvote/assets/governance-daoplugins.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/onvote/assets/governance-farcaster.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/onvote/assets/governance-onvote.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/onvote/assets/governance-others.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/components/Editor/Editor.tsx
@@ -1,7 +1,7 @@
import { CodeHighlightNode, CodeNode } from '@lexical/code'
import { AutoLinkNode, LinkNode } from '@lexical/link'
import { ListItemNode, ListNode } from '@lexical/list'
import { TRANSFORMERS } from '@lexical/markdown'
import { $convertFromMarkdownString, TRANSFORMERS } from '@lexical/markdown'
import { OverflowNode } from '@lexical/overflow'
import { CharacterLimitPlugin } from '@lexical/react/LexicalCharacterLimitPlugin'
import LexicalClickableLinkPlugin from '@lexical/react/LexicalClickableLinkPlugin'
Expand Down Expand Up @@ -37,13 +37,15 @@ type EditorProps = {
maxLength?: number
onChange: (value: string) => void
placeholder?: string
defaultValue?: string
}

const Editor = (props: EditorProps) => {
const [isLinkEditMode, setIsLinkEditMode] = useState<boolean>(false)
const [floatingAnchorElem, setFloatingAnchorElem] = useState<HTMLDivElement | null>(null)

const settings = {
editorState: () => $convertFromMarkdownString(props.defaultValue ?? '', TRANSFORMERS),
namespace: '',
// The editor theme
theme: exampleTheme,
Expand Down