-
Notifications
You must be signed in to change notification settings - Fork 7
trying to debug the cd4t multi commit before merging it in the baseline #395
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
338 commits
Select commit
Hold shift + click to select a range
e4285ce
refactor: remove dead code
PascalinDe dd70671
Fix French lexicon
dragonleman f632702
fix: updated local_forms script w/ current data format
PascalinDe 97b98be
tests: add German translations
PascalinDe eef4e35
Merge pull request #61 from c4dt/fix_tests
ineiti 4434db3
Correctly create new keys
ineiti ca91ba8
Décrypt* -> Déchiffr*
dragonleman ea49694
Merge pull request #63 from c4dt/fix-fr-language-syntaxes
PascalinDe 7f8c477
Merge pull request #51 from c4dt/316
PascalinDe e702098
Merge pull request #64 from c4dt/fix_scripts
ineiti db280d3
Homogeinization of acronyms
dragonleman 9fb741e
Merge pull request #65 from c4dt/fix-languages-homogeneization-acronyms
dragonleman 23d1ad5
test: install and initialize Playwright
PascalinDe b85f7d8
test: add initalizing i18next
PascalinDe 7cb3d62
test: add login/logout utils
PascalinDe 260175d
fix: add missing import
PascalinDe 24c8f2f
test: add navigation bar tests for authenticated/admin users
PascalinDe a3f146a
fix: remove duplicate logo
PascalinDe 16a75f3
test: start each test at 'About' page
PascalinDe b114a4c
test: added test for link to form list
PascalinDe c718085
docs: added README for automated tests
PascalinDe c8023cc
fix: do not include SCIPER_ADMIN in filename as it might be different…
PascalinDe bf17a92
fix: clean up Playwright config
PascalinDe 96ce8a5
fix: use fixed admin sciper for mocks
PascalinDe d75b181
fix: add missing API mock
PascalinDe 715edbf
docs: updated README w/ installation instructions and required enviro…
PascalinDe a4b412d
WIP: fix log in/log out mocks
PascalinDe df1111e
fix: fix log in/log out helper functions
PascalinDe 0e6c079
docs: add mandatory FRONT_END_URL value to READMEs
PascalinDe b50a584
test: clean up authentication mocks
PascalinDe 8db9f9e
test: clean up HAR file management and authentication mocking
PascalinDe 990cb43
test: add authentication UI tests
PascalinDe 75f5bdd
docs: add updating HAR files to README
PascalinDe a46a0fb
fix: apply code review suggestions
PascalinDe a51d8a9
test: do not test WebKit
PascalinDe 9f6222b
test: use hard-coded baseURL instead of local configuration
PascalinDe a7fe8fb
test: apply review suggestions
PascalinDe bc582d3
fix: re-add accidentally removed mockPersonalInfo in setUp function
PascalinDe b251113
fix: use regexp for local configuration
PascalinDe 707f2d6
docs: fix npm command in README
PascalinDe e9b84b7
docs: fix npx command
PascalinDe 6cfb410
Merge pull request #67 from c4dt/playwright
PascalinDe 8314d64
test: add missing skip instructions
PascalinDe 444d787
Merge pull request #74 from c4dt/playwright
PascalinDe 7200375
fix: remove duplicate hidden element
PascalinDe 976e908
test: move updating mocks toggle to setUp
PascalinDe fab2989
test: add testid to footer
PascalinDe 9f396ec
feat: render copyright notice in footer internationalisable
PascalinDe 7ab1f0d
feat: remove unused proxy configuration element
PascalinDe 83f4eee
feat: internationalise build/software information and add tests
PascalinDe fbc6666
Merge pull request #75 from c4dt/69
PascalinDe 945821c
refactor: rename file
PascalinDe 84c7bfc
Revert "test: move updating mocks toggle to setUp"
PascalinDe 7a27a9f
docs: remove deprecated comments
PascalinDe 90c78a6
test: add api/config/proxy mock
PascalinDe ff8f696
test: add missing await on test result
PascalinDe 844943b
feat: add linting to tests
PascalinDe 20646e2
fix: fix linter
PascalinDe fddc36b
test: add missing skip instructions to footer tests
PascalinDe 2369d9c
refactor: use 'strict' mode when compiling tests
PascalinDe 0863d1d
Merge pull request #76 from c4dt/playwright
PascalinDe 59eb6d3
test: add evoting API mock
PascalinDe 055c2f3
test: add /form/index route tests for navbar/footer
PascalinDe be17e64
fix: fix misleading page numbering and add pagination tests
PascalinDe 628cf71
refactor: simplify mocking by removing reliance on HAR files
PascalinDe d6c136a
fix: fix lint
PascalinDe d30dbe2
style: add missing type annotations
PascalinDe a5e99b6
Merge pull request #77 from c4dt/70
PascalinDe b9909be
style: prettify JSON
PascalinDe 6b8a420
test: add form list display tests
PascalinDe f660579
test: do not actually load page to check URL
PascalinDe 7c62d80
test: assert unauthenticated form list views are correct
PascalinDe 96dcb5a
test: fix malformatted test data
PascalinDe 380b157
test: admin cannot vote on same form as non-admin
PascalinDe ee64e2b
test: add form list display tests
PascalinDe 5956f1d
style: fix linting
PascalinDe 1b03a2f
test: apply code review suggestions
PascalinDe d28bec3
test: disable lint to make code more readable
PascalinDe c8339fa
Merge pull request #79 from c4dt/playwright
PascalinDe 1cea2f6
Updating cli tools tests to use new dela
ineiti d59f5e3
Merge pull request #84 from c4dt/update_latest_dela
ineiti da3dd7b
chore: fix missing command in set up script
PascalinDe fda3bcd
Merge pull request #88 from c4dt/docker
PascalinDe 28aad92
fix: make sure the pages are properly loaded
PascalinDe ea18d14
test: add new test data
PascalinDe 97315e3
test: add initial tests for form editing
PascalinDe 345927b
test: move api mocks to separate folders
PascalinDe 56425a2
test: move evoting mocks
PascalinDe 981b74f
test: added 2nd admin user for ownership tests
PascalinDe 6498f8b
test: wait until there's no more network traffic on reload
PascalinDe e4746f0
fix: do not show 'Add voters' button to non-owner
PascalinDe 107a297
Fix the voting-benchmark test
ineiti 9c1f6ed
Rearranging things
ineiti 9b93346
refactor: applied code review
PascalinDe cbbb92c
chore: do not run tests in parallel
PascalinDe 7fcd939
fix: fix array index
PascalinDe 8a55e11
Autogenerating .env
ineiti a2a262a
Merge pull request #89 from c4dt/72
PascalinDe fa9c0d4
Merge pull request #92 from c4dt/autogenerate_env
ineiti 6ada22a
Merge pull request #82 from c4dt/voting_benchmark
ineiti f6045da
Merge pull request #83 from c4dt/refactoring
ineiti 90dd236
refactor: renamed JSON file to be coherent w/ test file
PascalinDe c3e5c9b
fix: 'Cancel' button must only be visible to owner
PascalinDe e6d8fa7
fix: 'Close' button should only be visible to owner
PascalinDe b39748a
fix: 'Combine' button should only be visible to owner
PascalinDe c203ac0
docs: cleaned up README, removed obsolete files and updated .env.example
PascalinDe baa48d9
Merge pull request #93 from c4dt/cleanup
PascalinDe 4f13b54
test: only show 'Delete' button to owner
PascalinDe 6e10918
test: show 'Shuffle' button only to owner
PascalinDe 3287685
fix: show 'Setup' button only to owner
PascalinDe e8c5e82
test: show 'Open' button only to owner
PascalinDe b4adf69
fix: show 'Initialize' button only to owner
PascalinDe 46e991d
fix: show 'Decrypt' button only to owner
PascalinDe 2a4116e
fix: reload page to update local caches when authorizations have changed
PascalinDe 0d353b8
Merge pull request #96 from c4dt/playwright
PascalinDe 4e833be
test: test that buttons are not visible in form states when they are …
PascalinDe adb9a7b
test: clean up test messages
PascalinDe 1bac17b
test: add missing 'Canceled' state
PascalinDe 525aaa8
test: add 'Vote' button test cases
PascalinDe 18e6069
test: add initialization tests
PascalinDe 312a3f9
test: add 'Setup' route calling test
PascalinDe 7a80f95
test: add 'Open' route calling test
PascalinDe 857c1f7
test: add 'Cancel' route calling test
PascalinDe f1784a1
test: refactor button tests and add tests for remaining buttons
PascalinDe 65ed665
test: test adding voters
PascalinDe 9180c8c
test: fix voting test
PascalinDe 184bffa
fix: add missing route mocks
PascalinDe 8a98808
style: fix linting warnings
PascalinDe e3364c7
fix: add missing file
PascalinDe 36b99cf
refactor: apply review suggestions
PascalinDe 36b9486
style: fix linter
PascalinDe aca09c9
Merge pull request #100 from c4dt/72
PascalinDe 1a89820
Fix all go version in the tests on 1.19
ineiti f0fabf1
Merge pull request #116 from c4dt/fix_go_version
ineiti f77be25
Fixing some warnings
ineiti a34cf3a
Don't let non-form-owner add voters
ineiti ed3df34
Running crash tests up to three times
ineiti 9667bff
Merge pull request #115 from c4dt/block_admin_changes
ineiti 424cdff
refactor: move auth tools to separate location at root
PascalinDe d4fb1b3
fix: non-voter user should not be able to see voting screen
PascalinDe 1a32df8
Merge pull request #117 from c4dt/99
PascalinDe b4e3c36
test: add tests for handling minimum/maximum/correct number of votes …
PascalinDe a0abffd
fix: fix test w/ non-unique identifier
PascalinDe 9e6df75
Merge pull request #120 from c4dt/playwright
PascalinDe 4a0b3a6
Merge pull request #119 from c4dt/rerun_crash_tests
ineiti b5ad03e
Merge pull request #118 from c4dt/fix_warnings
ineiti 6e40d7d
style: remove unused JSON file
PascalinDe bb7d2ae
refactor: add another result
PascalinDe 57d0a32
fix: fix result labels
PascalinDe 4a55280
test: add tests individual/grouped results
PascalinDe 801594b
test: add more detailed forms
PascalinDe 18be67e
feat: show total count instead of percentage and order by count
PascalinDe c819e31
Merge pull request #123 from c4dt/45
PascalinDe 889e22b
Putting ballots in separate memory
ineiti 76d53c1
Making tests work
ineiti b9ab490
Comments and error handling
ineiti 5b507f7
Improve speed of docker build
ineiti 9fab649
Add voting script to the backend
ineiti d0c8171
Putting FormFromStore into a single place
ineiti 492dff8
Correctly store and retrieve DKGs
ineiti df648a3
Synching is now done in dela
ineiti 4027d1c
Making tests pass
ineiti d34d817
Merge pull request #121 from c4dt/separate_ballots
ineiti c8744e9
Point to latest c4dt/dela commit
ineiti ae9e179
Merge pull request #132 from c4dt/e2e_fixes
ineiti 29befd9
feat: update smart contract
PascalinDe 4149979
feat: add URL field to choices
PascalinDe 8980696
fix: fix internalisation problems w/ text results
PascalinDe 56676a3
refactor: refactor choice display
PascalinDe 26e0700
style: ran prettier
PascalinDe af1c47a
Merge pull request #133 from c4dt/37
PascalinDe dca5d2c
Following latest dela main and fixing local_forms.sh with new JSON fo…
ineiti 9b166e5
Merge pull request #136 from c4dt/update_dela
ineiti e8be7d9
feat: add EPFL logo w/ link to EPFL homepage
PascalinDe bb5ac07
feat: use Arial font
PascalinDe 125f539
feat: change bg color to EPFL style
PascalinDe eb9a48b
feat: change fg color to EPFL style
PascalinDe 28118ec
feat: add URL to smart contract
PascalinDe 15ab531
feat: add title URL to frontend
PascalinDe 9b1fa5d
feat: use EPFL link style
PascalinDe 0497f33
fix: fix missing Title field when not 'en' language
PascalinDe 4ca033c
fix: fix missing title link
PascalinDe 56fbba5
test: add EPFL logo test
PascalinDe 0063e64
fix: fix missing build stage
PascalinDe 818aeb5
Merge pull request #137 from c4dt/docker
PascalinDe d628971
Merge pull request #135 from c4dt/42
PascalinDe 7e02bb9
fix: fix inverted hyperlink colours
PascalinDe 6a40c80
fix: fix English not displaying by default for Title fields
PascalinDe 54f8d07
Merge pull request #139 from c4dt/frontend
ineiti a0ad98e
fix: fix unhandled update
PascalinDe a384645
fix: fix color scheme
PascalinDe 779ba47
Merge pull request #140 from c4dt/frontend
PascalinDe 3742ba9
Adding benchmark tests
ineiti 7fa61de
feat: add AdditionalInfo field to smart contract
PascalinDe 7d60164
Merge pull request #146 from c4dt/add_speeds
ineiti c4ec900
feat: add AdditionalInfo field to frontend
PascalinDe cffd74b
Merge pull request #147 from c4dt/141
PascalinDe e08107a
adding versions
ineiti 1a93da5
fix: add missing JSON/schema validation
PascalinDe d35ce4c
Merge pull request #149 from c4dt/frontend
PascalinDe f8d78b8
Merge pull request #148 from c4dt/version_display
ineiti c1477bc
Put throw outside of try/catch
ineiti f9d43fe
Merge pull request #150 from c4dt/increase_timeout
ineiti 094e3e9
[fix] when directory is a symlink
multiscan 8dfd2fc
[feat] chunked voter sciper upload
multiscan b9060ec
[doc] explain why we add sendVoters async function
multiscan 5c76450
style: fixed linting
PascalinDe 857299f
feat: add error messages
PascalinDe 7248aa0
feat: add loading animation when adding voters
PascalinDe e648bc2
feat: use translations for error messages
PascalinDe 71e887b
fix: clean-up error handling
PascalinDe 2610d4f
fix: remove outdated comment
PascalinDe 1b90a30
fix: add missing call
PascalinDe ca99a06
style: apply linting
PascalinDe 015e8e2
fix: fix SCIPER verification and add it to adding policy functions
PascalinDe 5f42309
feat: do not link to form management view for non-admin users
PascalinDe 4205520
feat: require authentication as admin to access form management view
PascalinDe 5218665
Merge pull request #158 from c4dt/156
PascalinDe 3f2ed9d
fix: use Number.isNaN
PascalinDe 6f748b2
fix: add missing await statements
PascalinDe 19e40f2
Merge pull request #157 from c4dt/feat_batch_voters
PascalinDe b4f9ff7
Fix French language: at most -> au plus
dragonleman 28ad738
Merge pull request #160 from c4dt/fix-french-language-at-most-au-plus
PascalinDe b56fbc6
Updating scripts
ineiti 0ce24ab
Merge pull request #161 from c4dt/update_scripts
ineiti fb3090e
feat: clarify size computation
PascalinDe c66decd
fix: use length of encoded ID to determine total length of ballot
PascalinDe c122b11
feat: throw error if encoded ballot is longer than maximum ballot siz…
PascalinDe e0003ec
docs: updated documentation on ballot encoding
PascalinDe 5b03fe8
Merge pull request #168 from c4dt/167
PascalinDe e1fbd8f
feat: change default filter on form list to 'Open'
PascalinDe f95d249
Merge pull request #169 from c4dt/change-default-filter
PascalinDe 0cfc407
Only pushing if merge on main
ineiti 572e945
Merge pull request #171 from c4dt/test_docker_build
ineiti 0437042
feat: hide elections on blocklist
PascalinDe 7cd2cf3
refactor: minor code clean-up
PascalinDe db54223
Merge pull request #173 from c4dt/hide-elections
PascalinDe cc596ec
fix: add '-y' flag to make sure apt builds autonomously
PascalinDe 31da190
Merge pull request #180 from c4dt/fix-docker
ineiti d5b6a9e
Moving paths from github.com/c4dt to github.com/dedis
ineiti 4bf8710
@Pierluca's and @jbsv's comments
ineiti 5ca296c
Merge pull request #181 from c4dt/comments_dedis
ineiti 0cfa3ac
Merge pull request #389 from c4dt/main
ineiti 37ad9b7
upgrade to golang 1.23
jbsv 74c9286
change github.com to go.dedis.ch
jbsv 618628c
IgnoreTestCrash for now
jbsv 4205474
upgrade docker github actions tools
jbsv 2d88796
fix some lint warnings
jbsv 796ccd2
update to go 1.23.7 and dependencies
jbsv e60afb1
remove go patch level from github workflow
jbsv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,57 @@ | ||
| module go.dedis.ch/d-voting | ||
|
|
||
| go 1.23 | ||
| go 1.23.0 | ||
|
|
||
| toolchain go1.23.7 | ||
|
|
||
| require ( | ||
| github.com/gorilla/mux v1.8.1 | ||
| github.com/opentracing/opentracing-go v1.2.0 | ||
| github.com/prometheus/client_golang v1.20.5 | ||
| github.com/prometheus/client_golang v1.21.1 | ||
| github.com/rs/zerolog v1.33.0 | ||
| github.com/stretchr/testify v1.10.0 | ||
| github.com/uber/jaeger-client-go v2.30.0+incompatible | ||
| go.dedis.ch/dela v0.1.1-0.20240924124343-79fc1d79d180 | ||
| go.dedis.ch/dela v0.1.0 | ||
| go.dedis.ch/dela-apps v0.0.0-20211201124511-8d285ec1fa45 | ||
| go.dedis.ch/kyber/v3 v3.1.0 | ||
| golang.org/x/net v0.31.0 | ||
| golang.org/x/tools v0.27.0 | ||
| golang.org/x/net v0.37.0 | ||
| golang.org/x/tools v0.31.0 | ||
| golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/golang/protobuf v1.5.4 // indirect | ||
| github.com/klauspost/compress v1.17.11 // indirect | ||
| github.com/kylelemons/godebug v1.1.0 // indirect | ||
| github.com/mattn/go-colorable v0.1.13 // indirect | ||
| github.com/mattn/go-isatty v0.0.20 // indirect | ||
| github.com/mattn/go-isatty v0.0.19 // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/opentracing-contrib/go-grpc v0.1.0 // indirect | ||
| github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/prometheus/client_model v0.6.1 // indirect | ||
| github.com/prometheus/common v0.60.1 // indirect | ||
| github.com/prometheus/common v0.62.0 // indirect | ||
| github.com/prometheus/procfs v0.15.1 // indirect | ||
| github.com/rs/xid v1.6.0 // indirect | ||
| github.com/rs/xid v1.5.0 // indirect | ||
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
| github.com/uber/jaeger-lib v2.4.1+incompatible // indirect | ||
| github.com/urfave/cli/v2 v2.27.5 // indirect | ||
| github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect | ||
| github.com/urfave/cli/v2 v2.27.1 // indirect | ||
| github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect | ||
| go.dedis.ch/fixbuf v1.0.3 // indirect | ||
| go.dedis.ch/protobuf v1.0.11 // indirect | ||
| go.etcd.io/bbolt v1.3.11 // indirect | ||
| go.etcd.io/bbolt v1.3.9 // indirect | ||
| go.uber.org/atomic v1.11.0 // indirect | ||
| golang.org/x/crypto v0.29.0 // indirect | ||
| golang.org/x/mod v0.22.0 // indirect | ||
| golang.org/x/sync v0.9.0 // indirect | ||
| golang.org/x/sys v0.27.0 // indirect | ||
| golang.org/x/text v0.20.0 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect | ||
| google.golang.org/grpc v1.68.0 // indirect | ||
| google.golang.org/protobuf v1.35.2 // indirect | ||
| golang.org/x/crypto v0.36.0 // indirect | ||
| golang.org/x/mod v0.24.0 // indirect | ||
| golang.org/x/sync v0.12.0 // indirect | ||
| golang.org/x/sys v0.31.0 // indirect | ||
| golang.org/x/text v0.23.0 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect | ||
| google.golang.org/grpc v1.63.0 // indirect | ||
| google.golang.org/protobuf v1.36.1 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I usually stick to a minor version like
1.23, as the patch-versions usually bring good and not-breaking changes. So new patch-versions are automatically picked up.