diff --git a/resources/assets/js/components/App.vue b/resources/assets/js/components/App.vue index c204b44..d16dab6 100644 --- a/resources/assets/js/components/App.vue +++ b/resources/assets/js/components/App.vue @@ -39,7 +39,6 @@

{{ $t('landing.footer.subtitle_3') }}

-
{{ $t('landing.footer.terms_service') }} diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue index 06ffd8e..94ec941 100644 --- a/resources/assets/js/pages/auth/login.vue +++ b/resources/assets/js/pages/auth/login.vue @@ -60,6 +60,7 @@ + diff --git a/resources/assets/js/pages/new-welcome.vue b/resources/assets/js/pages/new-welcome.vue deleted file mode 100644 index 82fbfcc..0000000 --- a/resources/assets/js/pages/new-welcome.vue +++ /dev/null @@ -1,347 +0,0 @@ - - - - diff --git a/resources/assets/js/pages/welcome.vue b/resources/assets/js/pages/welcome.vue index 16ab269..6590211 100644 --- a/resources/assets/js/pages/welcome.vue +++ b/resources/assets/js/pages/welcome.vue @@ -287,22 +287,22 @@
-

+

{{ $t('landing.quote_description_1') }}

-

— {{ $t('landing.quote_author_1') }}

+

— {{ $t('landing.quote_author_1') }}

-

+

{{ $t('landing.quote_description_2') }}

-

— {{ $t('landing.quote_author_2') }}

+

— {{ $t('landing.quote_author_2') }}

- Sign up today + {{ $t('landing.sign_up_today') }}
@@ -331,6 +331,7 @@ export default { position: relative; left: 3rem; bottom: 20rem; + max-width: 640px; } .white-subtitle { @@ -652,13 +653,24 @@ export default { margin-bottom: 3rem; } -.red-sec-txt { +.quote-author-p { + color: white; + font-size: 1rem; + max-width: 1200px; + text-align: center; + line-height: 35px; + font-weight: 400; + text-align: justify; +} + +.quote-author-author { color: white; font-size: 1.2rem; max-width: 1200px; text-align: center; line-height: 35px; font-weight: 600; + text-align: end; } .btn-bottom-container { diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js index cdd092a..660cc98 100644 --- a/resources/assets/js/router/routes.js +++ b/resources/assets/js/router/routes.js @@ -50,9 +50,9 @@ export default [ component: require('~/pages/home').default }, { - path: '/new-welcome', - name: 'new-welcome', - component: require('~/pages/new-welcome').default + path: '/get-started', + name: 'get-started', + component: require('~/pages/get-started').default }, { path: '/user-agreement', diff --git a/resources/assets/js/store/permissions.js b/resources/assets/js/store/permissions.js index 836d5f1..0dfb2e5 100644 --- a/resources/assets/js/store/permissions.js +++ b/resources/assets/js/store/permissions.js @@ -4,6 +4,12 @@ export const NS_ADMIN = 'NS Admin' export const NS_EDITOR = 'NS Editor' export const API_USER = 'API User' +// role types ID +export const GDPC_ADMIN_ID = 3 +export const NS_ADMIN_ID = 4 +export const NS_EDITOR_ID = 5 +export const API_USER_ID = 1 + // permission types export const VIEW_BACKEND = 'view-backend' export const USERS_VIEW = 'users-view' diff --git a/resources/assets/sass/elements/_buttons.scss b/resources/assets/sass/elements/_buttons.scss index 1a56830..4a32ad9 100644 --- a/resources/assets/sass/elements/_buttons.scss +++ b/resources/assets/sass/elements/_buttons.scss @@ -51,8 +51,8 @@ .button-go { padding: 0.2rem 1.2rem; - font-size: 20px; - font-weight: 600; + font-size: 1rem; + font-weight: 500; } .btn-primary { diff --git a/resources/lang/en.json b/resources/lang/en.json index 7e3b275..41c9b59 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -396,10 +396,10 @@ "new_welcome": { "title_1": "Welcome to", "red_title": "IFRC", - "title_2": "Safety", - "title_3": "Message Database", + "title_2": "National Society", + "title_3": "Preparedness Messages", "text_header": "Access and share Red Cross Red Crescent safety messages across your platforms.", - "text_header_2": "Follow the #-step guide below..", + "text_header_2": "Follow the 3-step guide below..", "bottom_subtitle": "Contact IFRC", "bottom_text": "Email the IFRC team if you have questions: im@ifrc.org", "bottom_btn": "Contact IFRC", @@ -437,6 +437,19 @@ "header": "Step 3: Share the messages", "text": "Look for the option to download the messages. You can share the set of messages as an image or as a PDF. Download and review to ensure you are sharing the right messages." } + }, + "skip_btn": "Skip this step", + "skip_checkbox": "Don't show this again", + "contact_modal": { + "title": "ROLE REQUEST", + "subtitle": "If you have any questions or need support, please contact us at", + "question_1": "What role are you requesting access to?", + "question_2": "Which National Society do you want to be part of?", + "send": "Send", + "error_role": "Role is required", + "error_society": "National Society is required", + "email_subject": "Role Request for IFRC National Society Preparedness Messages", + "email_body_structure": "I would like to request access to the following role: {role}. I would like to be part of the following National Society: {society}." } }, "upload_modal": { @@ -748,10 +761,10 @@ "learn_more": "Learn more", "watch_video": "Watch video", "example_case": "Example Use Case", - "quote_author_1": " Xavier Castellanos, IFRC Under Secretary General, National Society Development and Operations", - "quote_description_1": "Evidence shows that harmonized, action-oriented safety messages from a trusted source enhances household preparedness. The more channels that share the messages, the more people receive guidance in a time of need and feel confident to act safely. This is a life-saving tool free for you to use to support your communities today.", + "quote_author_1": "Xavier Castellanos, IFRC Under Secretary General, National Society Development and Operations", + "quote_description_1": "❝Evidence shows that harmonized, action-oriented safety messages from a trusted source enhances household preparedness. The more channels that share the messages, the more people receive guidance in a time of need and feel confident to act safely. This is a life-saving tool free for you to use to support your communities today.❞", "quote_author_2": "Fatos Xhengo, Coordinator of Disaster Preparedness and Response Programs, Albanian Red Cross", - "quote_description_2": "At the Albanian Red Cross, we have seen firsthand how reliable early warning messages can help to protect people and save lives. It is important that we collaborate with government partners to ensure communities receive clear and consistent hazard information they can trust. Strengthening this cooperation enhances public confidence and helps people take the right actions to stay safe.", + "quote_description_2": "❝At the Albanian Red Cross, we have seen firsthand how reliable early warning messages can help to protect people and save lives. It is important that we collaborate with government partners to ensure communities receive clear and consistent hazard information they can trust. Strengthening this cooperation enhances public confidence and helps people take the right actions to stay safe.❞", "api": "API", "hurricane": "Include messages with hurricane early warning alerts", "warning_alerts": "warning alerts",