Skip to content

Commit b07e3eb

Browse files
authored
Merge pull request #135 from dedis/frontend-admin
Frontend admin
2 parents 9929697 + eb6dd41 commit b07e3eb

19 files changed

+1226
-724
lines changed

web/frontend/src/components/modal/AddAdminUserModal.tsx

-192
This file was deleted.

web/frontend/src/components/modal/RemoveAdminUserModal.tsx

-133
This file was deleted.

web/frontend/src/language/en.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"addCandidate": "Add a candidate",
6161
"addUser": "Add user",
6262
"role": "Role",
63+
"roles": "Roles",
6364
"edit": "Edit",
6465
"nothingToAdd": "There is nothing to add.",
6566
"duplicateCandidate": "This candidate has already been added.",
@@ -215,6 +216,20 @@
215216
"filterByStatus": "Filter by status",
216217
"all": "All",
217218
"resetFilter": "Reset filter",
218-
"showingNOverMOfXResults": "Showing {{n}}/{{m}} of {{x}} results."
219+
"showingNOverMOfXResults": "Showing {{n}}/{{m}} of {{x}} results.",
220+
"addProxy": "Add proxy",
221+
"editProxy": "Edit the proxy address",
222+
"proxy": "Proxy",
223+
"confirmDeleteProxy": "Do confirm deleting this node address",
224+
"nodeDetails": "Add, edit or remove the mapping between a node address and its proxy address.",
225+
"inputNodeProxyError": "Error: the address of the node and the proxy cannot be empty.",
226+
"proxySuccessfullyEdited": "The proxy address was successfully modified !",
227+
"nodeProxySuccessfullyAdded": "The node and proxy addresses were successfully added !",
228+
"proxySuccessfullyDeleted": "The node and proxy addresses were successfully deleted !",
229+
"addNodeProxyError": "An error occurred while trying to add the node and proxy addresses. Error: ",
230+
"editProxyError": "An error occurred while trying to edit the proxy address. Error: ",
231+
"removeProxyError": "An error occurred while trying to remove the node and proxy addresses. Error: ",
232+
"enterNodeProxy": "Please enter the addresses of the node and the proxy",
233+
"invalidProxyError": "Error: the address you entered is not a valid URL."
219234
}
220235
}

web/frontend/src/layout/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
import Login from '../pages/session/Login';
1515
import Home from '../pages/Home';
1616
import About from '../pages/About';
17-
import Admin from '../pages/Admin';
17+
import Admin from 'pages/admin/Admin';
1818
import ElectionIndex from '../pages/election/Index';
1919
import ElectionCreate from '../pages/election/New';
2020
import ElectionResult from '../pages/election/Result';

0 commit comments

Comments
 (0)