Merge branch 'development' of github.com:UNICEFECAR/USupport-client-u…

…i into fix/issue_87
UNICEFECAR · Jan 12, 2024 · 0d81296 · 0d81296
2 parents 999fc5b + c049e7b
commit 0d81296
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/USupport-components-library b/USupport-components-library
diff --git a/src/blocks/Page/Page.jsx b/src/blocks/Page/Page.jsx
@@ -307,6 +307,8 @@ export const Page = ({
           initialCountry={selectedCountry}
           hasUnreadNotifications={hasUnreadNotifications}
           renderIn="client"
+          hasThemeButton
+          t={t}
         />
       )}
       <div
@@ -438,6 +440,7 @@ export const Page = ({
         <Footer
           lists={footerLists}
           contactUsText={t("contact_us")}
+          contactUsUrl="/contact-us"
           navigate={navigateTo}
           Link={Link}
           showSocials={false}

diff --git a/src/blocks/Page/locales/en.json b/src/blocks/Page/locales/en.json
@@ -22,5 +22,8 @@
   "password_placeholder": "Password", 
   "password": "Please enter your password to access the site",
   "wrong_password": "Wrong password",
-  "submit": "Submit"
+  "submit": "Submit",
+
+  "dark": "Dark",
+  "light": "Light"
 }
diff --git a/src/blocks/Page/locales/kk.json b/src/blocks/Page/locales/kk.json
@@ -21,5 +21,8 @@
   "password_placeholder": "Құпия сөз",
   "password": "Сайтқа кіру үшін құпия сөзіңізді енгізіңіз",
   "wrong_password": "Құпия сөз дұрыс емес",
-  "submit": "Жіберу"
+  "submit": "Жіберу",
+
+  "dark": "Қараңғы",
+  "light": "Жарық"
 }
diff --git a/src/blocks/Page/locales/ru.json b/src/blocks/Page/locales/ru.json
@@ -21,5 +21,8 @@
   "password_placeholder": "Пароль",
   "password": "Пожалуйста, введите пароль для доступа к сайту",
   "wrong_password": "Неверный пароль",
-  "submit": "Отправить"
+  "submit": "Отправить",
+
+  "dark": "Тёмный",
+  "light": "Светлый"
 }
+15 −2		src/components/footers/Footer/Footer.jsx
+8 −1		src/components/footers/Footer/footer.scss
+39 −3		src/components/navbars/Navbar/Navbar.jsx
+31 −0		src/components/navbars/Navbar/navbar.scss
+4 −0		src/styles/_variables.scss