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.

Sign up for GitHub

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

Frontend admin #135

Merged
merged 11 commits into from
Jun 7, 2022
Merged

Frontend admin #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
102583d
Add AdminIndex for Admin page
cmsigrist May 24, 2022
f361096
Rename AdminIndex to Admin
cmsigrist May 30, 2022
91f5f11
Merge branch 'frontend-actions' into frontend-admin
cmsigrist May 30, 2022
c139897
Add DKGTable to Admin page
cmsigrist May 30, 2022
a3e9c73
Add modals to add, edit and remove a proxy address
cmsigrist Jun 2, 2022
35668f9
Clean up the modals and pagination on item add and remove
cmsigrist Jun 3, 2022
4a27ccb
Merge main into branch frontend-admin
cmsigrist Jun 3, 2022
18e4690
Add checks for URL inputs in the proxy modals
cmsigrist Jun 3, 2022
9ece555
Add an AdminModal component to remove code duplicate
cmsigrist Jun 3, 2022
fd4da21
Remove useless ref in modal
cmsigrist Jun 3, 2022
eb6dd41
Fix the linting
cmsigrist Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 0 additions & 192 deletions web/frontend/src/components/modal/AddAdminUserModal.tsx
View file
Open in desktop

This file was deleted.

133 changes: 0 additions & 133 deletions web/frontend/src/components/modal/RemoveAdminUserModal.tsx
View file
Open in desktop

This file was deleted.

17 changes: 16 additions & 1 deletion web/frontend/src/language/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"addCandidate": "Add a candidate",
"addUser": "Add user",
"role": "Role",
"roles": "Roles",
"edit": "Edit",
"nothingToAdd": "There is nothing to add.",
"duplicateCandidate": "This candidate has already been added.",
Expand Down Expand Up @@ -214,6 +215,20 @@
"filterByStatus": "Filter by status",
"all": "All",
"resetFilter": "Reset filter",
"showingNOverMOfXResults": "Showing {{n}}/{{m}} of {{x}} results."
"showingNOverMOfXResults": "Showing {{n}}/{{m}} of {{x}} results.",
"addProxy": "Add proxy",
"editProxy": "Edit the proxy address",
"proxy": "Proxy",
"confirmDeleteProxy": "Do confirm deleting this node address",
"nodeDetails": "Add, edit or remove the mapping between a node address and its proxy address.",
"inputNodeProxyError": "Error: the address of the node and the proxy cannot be empty.",
"proxySuccessfullyEdited": "The proxy address was successfully modified !",
"nodeProxySuccessfullyAdded": "The node and proxy addresses were successfully added !",
"proxySuccessfullyDeleted": "The node and proxy addresses were successfully deleted !",
"addNodeProxyError": "An error occurred while trying to add the node and proxy addresses. Error: ",
"editProxyError": "An error occurred while trying to edit the proxy address. Error: ",
"removeProxyError": "An error occurred while trying to remove the node and proxy addresses. Error: ",
"enterNodeProxy": "Please enter the addresses of the node and the proxy",
"invalidProxyError": "Error: the address you entered is not a valid URL."
}
}
2 changes: 1 addition & 1 deletion web/frontend/src/layout/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
import Login from '../pages/session/Login';
import Home from '../pages/Home';
import About from '../pages/About';
import Admin from '../pages/Admin';
import Admin from 'pages/admin/Admin';
import ElectionIndex from '../pages/election/Index';
import ElectionCreate from '../pages/election/New';
import ElectionResult from '../pages/election/Result';
Expand Down
Loading