![]({"/banner/"+locale+"/helloasso.png"})
+
);
};
diff --git a/src/components/banner/Paypal.jsx b/src/components/banner/Paypal.jsx
new file mode 100644
index 0000000..38b9945
--- /dev/null
+++ b/src/components/banner/Paypal.jsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import i18n from '../../i18n'
+import {withTranslation} from 'react-i18next';
+
+import { faPaypal } from "@fortawesome/free-brands-svg-icons";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+
+
+const Paypal = (props) => {
+ const {t} = props;
+ let localeStringShort=i18n.language.substring(0,2);
+ let localeStringComplete=localeStringShort.toLowerCase()+"_"+localeStringShort.toUpperCase();
+ if(localeStringComplete==="en_EN"){
+ localeStringComplete="en_US";
+ }
+ const pixelLink="https://www.paypal.com/"+localeStringComplete+"/i/scr/pixel.gif";
+
+ return (
+
{t("Thanks for your participation.")}{t("Your participation was recorded with success!")}
-
diff --git a/src/errorCode.js b/src/errorCode.js
index 7299b1a..4d763fa 100644
--- a/src/errorCode.js
+++ b/src/errorCode.js
@@ -1,35 +1,35 @@
-import React from 'react';
+import React from "react";
-export const UNKNOWN_ELECTION_ERROR = 'E1';
-export const ONGOING_ELECTION_ERROR = 'E2';
-export const NO_VOTE_ERROR = 'E3';
-export const ELECTION_NOT_STARTED_ERROR = 'E4';
-export const ELECTION_FINISHED_ERROR = 'E5';
-export const INVITATION_ONLY_ERROR = 'E6';
-export const UNKNOWN_TOKEN_ERROR = 'E7';
-export const USED_TOKEN_ERROR = 'E8';
-export const WRONG_ELECTION_ERROR = 'E9';
+export const UNKNOWN_ELECTION_ERROR = "E1";
+export const ONGOING_ELECTION_ERROR = "E2";
+export const NO_VOTE_ERROR = "E3";
+export const ELECTION_NOT_STARTED_ERROR = "E4";
+export const ELECTION_FINISHED_ERROR = "E5";
+export const INVITATION_ONLY_ERROR = "E6";
+export const UNKNOWN_TOKEN_ERROR = "E7";
+export const USED_TOKEN_ERROR = "E8";
+export const WRONG_ELECTION_ERROR = "E9";
export const redirectError = (errorMsg, history) => {};
export const errorMessage = (error, t) => {
if (error.startsWith(UNKNOWN_ELECTION_ERROR)) {
- return t('Oops... The election is unknown.');
+ return t("Oops... The election is unknown.");
} else if (error.startsWith(ONGOING_ELECTION_ERROR)) {
return t(
- "The election is still going on. You can't access now to the results.",
+ "The election is still going on. You can't access now to the results."
);
} else if (error.startsWith(NO_VOTE_ERROR)) {
- return t('No votes have been recorded yet. Come back later.');
+ return t("No votes have been recorded yet. Come back later.");
} else if (error.startsWith(ELECTION_NOT_STARTED_ERROR)) {
- return t('The election has not started yet.');
+ return t("The election has not started yet.");
} else if (error.startsWith(ELECTION_FINISHED_ERROR)) {
- return t('The election is over. You can\'t vote anymore');
+ return t("The election is over. You can't vote anymore");
} else if (error.startsWith(INVITATION_ONLY_ERROR)) {
- return t('You need a token to vote in this election');
+ return t("You need a token to vote in this election");
} else if (error.startsWith(USED_TOKEN_ERROR)) {
- return t('You seem to have already voted.');
+ return t("You seem to have already voted.");
} else if (error.startsWith(WRONG_ELECTION_ERROR)) {
- return t('The parameters of the election are incorrect.');
+ return t("The parameters of the election are incorrect.");
}
};
diff --git a/src/scss/_app.scss b/src/scss/_app.scss
index 03d3f89..ff7820a 100644
--- a/src/scss/_app.scss
+++ b/src/scss/_app.scss
@@ -47,10 +47,10 @@ main {
background-attachment: fixed;
background-repeat: no-repeat;
background-color: $mv-blue-color;
- min-height: calc(100% - 106px);
+ min-height: calc(100% - 170px);
overflow: auto;
padding-top: 72px;
- padding-bottom: 36px;
+ padding-bottom: 100px;
}
header {
@@ -310,3 +310,23 @@ li.sortable {
.react-multi-email > span[data-placeholder] {
padding: 0.25em !important;
}
+
+
+/** flag selector **/
+.flag-select > button {
+ height:35px;
+}
+
+.flag-select__options{
+ width:65px;
+ text-align:center;
+ background-color: $mv-light-color !important;
+}
+
+.flag-select__options .flag-select__option{
+ padding:0;
+ margin:0;
+}
+.flag-select__options .flag-select__option__icon{
+ top:0;
+}
diff --git a/yarn.lock b/yarn.lock
index 6591b92..78b7b7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -993,6 +993,13 @@
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.28"
+"@fortawesome/free-brands-svg-icons@^5.13.0":
+ version "5.13.0"
+ resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.13.0.tgz#e79de73ba6555055204828dca9c0691e7ce5242b"
+ integrity sha512-/6xXiJFCMEQxqxXbL0FPJpwq5Cv6MRrjsbJEmH/t5vOvB4dILDpnY0f7zZSlA8+TG7jwlt12miF/yZpZkykucA==
+ dependencies:
+ "@fortawesome/fontawesome-common-types" "^0.2.28"
+
"@fortawesome/free-solid-svg-icons@^5.9.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.0.tgz#44d9118668ad96b4fd5c9434a43efc5903525739"
@@ -8921,6 +8928,13 @@ react-flag-icon-css@^1.0.25:
flag-icon-css "^3.2.1"
prop-types "^15.6.2"
+react-flags-select@^1.1.12:
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/react-flags-select/-/react-flags-select-1.1.12.tgz#428b34f928eab875e8e0296046410d30d75cb818"
+ integrity sha512-icWC8pHdfTQTIqpLTgPcd4tFlfgUdiwzUJaSkPMzP6BEMRrh8yAJC55IkgmJV8PIX8qTUrEETZ6+6115hGjR7g==
+ dependencies:
+ prop-types "^15.5.8"
+
react-i18next@^11.3.4:
version "11.3.4"
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.3.4.tgz#355df5fe5133e5e30302d166f529678100ffc968"