From 755126ddb2f1c23447fc170839327d22ee1cb67a Mon Sep 17 00:00:00 2001 From: Carine Dengler Date: Wed, 3 Apr 2024 17:06:38 +0200 Subject: [PATCH] feat: use EPFL style --- web/frontend/src/assets/EPFL_Logo_184X53.svg | 21 ++++++++++++++ .../src/components/buttons/DownloadButton.tsx | 2 +- .../src/components/modal/ConfirmModal.tsx | 2 +- .../src/components/modal/RedirectToModal.tsx | 2 +- web/frontend/src/index.css | 5 ++-- web/frontend/src/index.tsx | 2 +- web/frontend/src/layout/App.css | 2 +- web/frontend/src/layout/ClientError.tsx | 6 ++-- web/frontend/src/layout/Flash.tsx | 6 ++-- web/frontend/src/layout/NavBar.tsx | 28 ++++++++++++------- .../src/layout/components/Profile.tsx | 2 +- .../src/layout/components/WarningModal.tsx | 2 +- web/frontend/src/pages/About.tsx | 4 +-- web/frontend/src/pages/Home.tsx | 7 ++--- web/frontend/src/pages/Loading.tsx | 2 +- web/frontend/src/pages/admin/AdminTable.tsx | 4 +-- web/frontend/src/pages/admin/DKGTable.tsx | 2 +- web/frontend/src/pages/admin/ProxyRow.tsx | 4 +-- .../admin/components/AddAdminUserModal.tsx | 8 +++--- .../pages/admin/components/AddProxyModal.tsx | 2 +- .../src/pages/admin/components/AdminModal.tsx | 2 +- .../pages/admin/components/EditProxyModal.tsx | 2 +- .../admin/components/RemoveAdminUserModal.tsx | 2 +- .../admin/components/RemoveProxyModal.tsx | 2 +- web/frontend/src/pages/ballot/Show.tsx | 4 +-- web/frontend/src/pages/form/GroupedResult.tsx | 2 +- .../src/pages/form/IndividualResult.tsx | 2 +- web/frontend/src/pages/form/Result.tsx | 8 +++--- .../components/ActionButtons/ActionButton.tsx | 2 +- .../components/ActionButtons/ResultButton.tsx | 2 +- .../components/ActionButtons/VoteButton.tsx | 2 +- .../form/components/AddQuestionModal.tsx | 4 +-- .../form/components/ChooseProxyModal.tsx | 8 +++--- .../src/pages/form/components/FormForm.tsx | 4 +-- .../src/pages/form/components/FormRow.tsx | 2 +- .../pages/form/components/FormTableFilter.tsx | 2 +- .../form/components/IndigoSpinnerIcon.tsx | 2 +- .../src/pages/form/components/ProgressBar.tsx | 6 ++-- .../form/components/RemoveElementModal.tsx | 2 +- .../form/components/ResultExplanation.tsx | 2 +- .../pages/form/components/SelectResult.tsx | 2 +- .../pages/form/components/StatusTimeline.tsx | 12 ++++---- .../form/components/SubjectComponent.tsx | 2 +- .../src/pages/form/components/Tabs.tsx | 2 +- .../src/pages/form/components/UploadFile.tsx | 2 +- .../form/components/utils/useChangeAction.tsx | 2 +- 46 files changed, 111 insertions(+), 86 deletions(-) create mode 100644 web/frontend/src/assets/EPFL_Logo_184X53.svg diff --git a/web/frontend/src/assets/EPFL_Logo_184X53.svg b/web/frontend/src/assets/EPFL_Logo_184X53.svg new file mode 100644 index 000000000..f0f2074ae --- /dev/null +++ b/web/frontend/src/assets/EPFL_Logo_184X53.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/web/frontend/src/components/buttons/DownloadButton.tsx b/web/frontend/src/components/buttons/DownloadButton.tsx index 3f9a3ecfa..f60730652 100644 --- a/web/frontend/src/components/buttons/DownloadButton.tsx +++ b/web/frontend/src/components/buttons/DownloadButton.tsx @@ -10,7 +10,7 @@ const DownloadButton: FC = ({ exportData, children }) => { return ( diff --git a/web/frontend/src/index.css b/web/frontend/src/index.css index 36ddaf597..f3b1f1a81 100644 --- a/web/frontend/src/index.css +++ b/web/frontend/src/index.css @@ -4,12 +4,11 @@ body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', - 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; + font-family: Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace; + font-family: Arial, monospace; } diff --git a/web/frontend/src/index.tsx b/web/frontend/src/index.tsx index 112aee30a..dabfc523c 100644 --- a/web/frontend/src/index.tsx +++ b/web/frontend/src/index.tsx @@ -121,7 +121,7 @@ const Loading: FC = () => {
diff --git a/web/frontend/src/layout/App.css b/web/frontend/src/layout/App.css index 587fdfb4b..f2007544f 100644 --- a/web/frontend/src/layout/App.css +++ b/web/frontend/src/layout/App.css @@ -1,5 +1,5 @@ .App { - font-family: sans-serif; + font-family: Arial, sans-serif; color: rgb(71, 71, 71); background-color: white; position: relative; diff --git a/web/frontend/src/layout/ClientError.tsx b/web/frontend/src/layout/ClientError.tsx index 8040f9197..fc4a150fe 100644 --- a/web/frontend/src/layout/ClientError.tsx +++ b/web/frontend/src/layout/ClientError.tsx @@ -20,7 +20,7 @@ export default function ClientError({
-

{statusCode}

+

{statusCode}

@@ -35,7 +35,7 @@ export default function ClientError({ {statusCode === 401 && ( @@ -43,7 +43,7 @@ export default function ClientError({ {statusCode !== 401 && ( + className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-[#ff0000] hover:bg-[#b51f1f] focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#ff0000]"> {t('goHome')} )} diff --git a/web/frontend/src/layout/Flash.tsx b/web/frontend/src/layout/Flash.tsx index 91bd3fd04..18b0f9dad 100644 --- a/web/frontend/src/layout/Flash.tsx +++ b/web/frontend/src/layout/Flash.tsx @@ -17,7 +17,7 @@ const Flash = () => {
{ ); diff --git a/web/frontend/src/layout/components/WarningModal.tsx b/web/frontend/src/layout/components/WarningModal.tsx index 9b0257696..584b72df5 100644 --- a/web/frontend/src/layout/components/WarningModal.tsx +++ b/web/frontend/src/layout/components/WarningModal.tsx @@ -26,7 +26,7 @@ const WarningModal: FC = ({ message, isShown, setIsShown, act
diff --git a/web/frontend/src/pages/About.tsx b/web/frontend/src/pages/About.tsx index eb326e875..c12a78043 100644 --- a/web/frontend/src/pages/About.tsx +++ b/web/frontend/src/pages/About.tsx @@ -8,7 +8,7 @@ const About: FC = () => {
-

+

{t('aboutPlatform')}

@@ -30,7 +30,7 @@ const About: FC = () => {

diff --git a/web/frontend/src/pages/Home.tsx b/web/frontend/src/pages/Home.tsx index 7e53675d2..2fa2c1a31 100644 --- a/web/frontend/src/pages/Home.tsx +++ b/web/frontend/src/pages/Home.tsx @@ -15,11 +15,10 @@ const Home: FC = () => {
- + {t('homeWhatsNew')} - - {t('homeJustShippedVersion')} 1.0.0 + @@ -33,7 +32,7 @@ const Home: FC = () => {
- diff --git a/web/frontend/src/pages/Loading.tsx b/web/frontend/src/pages/Loading.tsx index 7d7894b60..6212b9b16 100644 --- a/web/frontend/src/pages/Loading.tsx +++ b/web/frontend/src/pages/Loading.tsx @@ -8,7 +8,7 @@ const Loading: FC = () => {
diff --git a/web/frontend/src/pages/admin/AdminTable.tsx b/web/frontend/src/pages/admin/AdminTable.tsx index 925f16aed..f1a43ed42 100644 --- a/web/frontend/src/pages/admin/AdminTable.tsx +++ b/web/frontend/src/pages/admin/AdminTable.tsx @@ -92,7 +92,7 @@ const AdminTable: FC = ({ users, setUsers }) => { @@ -124,7 +124,7 @@ const AdminTable: FC = ({ users, setUsers }) => { {user.role}
handleDelete(user.sciper)}> {t('delete')}
diff --git a/web/frontend/src/pages/admin/DKGTable.tsx b/web/frontend/src/pages/admin/DKGTable.tsx index c09fb43fb..dd5bc651e 100644 --- a/web/frontend/src/pages/admin/DKGTable.tsx +++ b/web/frontend/src/pages/admin/DKGTable.tsx @@ -110,7 +110,7 @@ const DKGTable: FC = ({ nodeProxyAddresses, setNodeProxyAddresses diff --git a/web/frontend/src/pages/admin/ProxyRow.tsx b/web/frontend/src/pages/admin/ProxyRow.tsx index 152421203..455621ec2 100644 --- a/web/frontend/src/pages/admin/ProxyRow.tsx +++ b/web/frontend/src/pages/admin/ProxyRow.tsx @@ -36,7 +36,7 @@ const ProxyRow: FC = ({
-
@@ -46,7 +46,7 @@ const ProxyRow: FC = ({ {t('delete')}
-
diff --git a/web/frontend/src/pages/admin/components/AddAdminUserModal.tsx b/web/frontend/src/pages/admin/components/AddAdminUserModal.tsx index 0ad7eb773..0b47dee90 100644 --- a/web/frontend/src/pages/admin/components/AddAdminUserModal.tsx +++ b/web/frontend/src/pages/admin/components/AddAdminUserModal.tsx @@ -90,7 +90,7 @@ const AddAdminUserModal: FC = ({ open, setOpen, handleAd
- + {selectedRole} {selected ? ( - + ) : null} @@ -137,7 +137,7 @@ const AddAdminUserModal: FC = ({ open, setOpen, handleAd const actionButton = (
diff --git a/web/frontend/src/pages/form/GroupedResult.tsx b/web/frontend/src/pages/form/GroupedResult.tsx index cb3015027..aaf9f7b64 100644 --- a/web/frontend/src/pages/form/GroupedResult.tsx +++ b/web/frontend/src/pages/form/GroupedResult.tsx @@ -202,7 +202,7 @@ const GroupedResult: FC = ({ rankResult, selectResult, textR diff --git a/web/frontend/src/pages/form/IndividualResult.tsx b/web/frontend/src/pages/form/IndividualResult.tsx index c130e1ca7..5e5c084e4 100644 --- a/web/frontend/src/pages/form/IndividualResult.tsx +++ b/web/frontend/src/pages/form/IndividualResult.tsx @@ -301,7 +301,7 @@ const IndividualResult: FC = ({ diff --git a/web/frontend/src/pages/form/Result.tsx b/web/frontend/src/pages/form/Result.tsx index 07a6f40cd..3a25d473c 100644 --- a/web/frontend/src/pages/form/Result.tsx +++ b/web/frontend/src/pages/form/Result.tsx @@ -109,8 +109,8 @@ const FormResult: FC = () => { key="grouped" className={({ selected }) => selected - ? 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-white bg-indigo-500 shadow' - : 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-gray-700 hover:bg-indigo-100 hover:text-indigo-500' + ? 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-white bg-[#ff0000] shadow' + : 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-gray-700 hover:bg-[#ff0000] hover:text-[#ff0000]' }> {t('resGroup')} @@ -118,8 +118,8 @@ const FormResult: FC = () => { key="individual" className={({ selected }) => selected - ? 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-white bg-indigo-500 shadow' - : 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-gray-600 hover:bg-indigo-100 hover:text-indigo-500' + ? 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-white bg-[#ff0000] shadow' + : 'w-full focus:ring-0 rounded-lg py-2.5 text-sm font-medium leading-5 text-gray-600 hover:bg-[#ff0000] hover:text-[#ff0000]' }> {t('resIndiv')} diff --git a/web/frontend/src/pages/form/components/ActionButtons/ActionButton.tsx b/web/frontend/src/pages/form/components/ActionButtons/ActionButton.tsx index 2b5dc3b90..788820505 100644 --- a/web/frontend/src/pages/form/components/ActionButtons/ActionButton.tsx +++ b/web/frontend/src/pages/form/components/ActionButtons/ActionButton.tsx @@ -11,7 +11,7 @@ type ActionButtonProps = { const ActionButton: FC = ({ handleClick, ongoing, ongoingText, children }) => { return !ongoing ? ( diff --git a/web/frontend/src/pages/form/components/ActionButtons/ResultButton.tsx b/web/frontend/src/pages/form/components/ActionButtons/ResultButton.tsx index 5ccdccaeb..1db697621 100644 --- a/web/frontend/src/pages/form/components/ActionButtons/ResultButton.tsx +++ b/web/frontend/src/pages/form/components/ActionButtons/ResultButton.tsx @@ -8,7 +8,7 @@ const ResultButton = ({ status, formID }) => { return ( status === Status.ResultAvailable && ( -
+
diff --git a/web/frontend/src/pages/form/components/ActionButtons/VoteButton.tsx b/web/frontend/src/pages/form/components/ActionButtons/VoteButton.tsx index a36afbb64..c2ce6d925 100644 --- a/web/frontend/src/pages/form/components/ActionButtons/VoteButton.tsx +++ b/web/frontend/src/pages/form/components/ActionButtons/VoteButton.tsx @@ -15,7 +15,7 @@ const VoteButton = ({ status, formID }) => { isLogged && (
@@ -274,7 +274,7 @@ const FormForm: FC = () => {
diff --git a/web/frontend/src/pages/form/components/IndigoSpinnerIcon.tsx b/web/frontend/src/pages/form/components/IndigoSpinnerIcon.tsx index b4f1cdecc..1ea90703e 100644 --- a/web/frontend/src/pages/form/components/IndigoSpinnerIcon.tsx +++ b/web/frontend/src/pages/form/components/IndigoSpinnerIcon.tsx @@ -1,7 +1,7 @@ const IndigoSpinnerIcon = () => { return ( diff --git a/web/frontend/src/pages/form/components/ProgressBar.tsx b/web/frontend/src/pages/form/components/ProgressBar.tsx index 4fc8e1790..2eb93f06d 100644 --- a/web/frontend/src/pages/form/components/ProgressBar.tsx +++ b/web/frontend/src/pages/form/components/ProgressBar.tsx @@ -10,9 +10,9 @@ const ProgressBar: FC = ({ isBest, children }) => {
{`${children}%`}
diff --git a/web/frontend/src/pages/form/components/RemoveElementModal.tsx b/web/frontend/src/pages/form/components/RemoveElementModal.tsx index f4540abd7..ca33c6ff7 100644 --- a/web/frontend/src/pages/form/components/RemoveElementModal.tsx +++ b/web/frontend/src/pages/form/components/RemoveElementModal.tsx @@ -83,7 +83,7 @@ const RemoveElementModal: FC = ({ diff --git a/web/frontend/src/pages/form/components/Tabs.tsx b/web/frontend/src/pages/form/components/Tabs.tsx index 594160fe7..468b6de4a 100644 --- a/web/frontend/src/pages/form/components/Tabs.tsx +++ b/web/frontend/src/pages/form/components/Tabs.tsx @@ -20,7 +20,7 @@ const Tabs = ({ currentTab, setCurrentTab }) => { }} className={classNames( name === currentTab - ? 'border-indigo-500 text-indigo-600' + ? 'border-[#ff0000] text-[#ff0000]' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300', 'w-1/4 py-4 px-1 text-center border-b-2 font-medium text-sm' )} diff --git a/web/frontend/src/pages/form/components/UploadFile.tsx b/web/frontend/src/pages/form/components/UploadFile.tsx index 675a8e0f4..e60248645 100644 --- a/web/frontend/src/pages/form/components/UploadFile.tsx +++ b/web/frontend/src/pages/form/components/UploadFile.tsx @@ -55,7 +55,7 @@ const UploadFile = ({ updateForm, setShowModal, setTextModal }) => { onChange={(e) => handleDrop(e.target.files[0])} /> diff --git a/web/frontend/src/pages/form/components/utils/useChangeAction.tsx b/web/frontend/src/pages/form/components/utils/useChangeAction.tsx index 0cbb59dee..aafa83131 100644 --- a/web/frontend/src/pages/form/components/utils/useChangeAction.tsx +++ b/web/frontend/src/pages/form/components/utils/useChangeAction.tsx @@ -399,7 +399,7 @@ const useChangeAction = ( return (
{t('notLoggedInActionText1')} - {t('notLoggedInActionText3')}