From 6ba1140a9dedd9925840e13d614137d5dbd1a8e2 Mon Sep 17 00:00:00 2001 From: Evgeny Alpeyev Date: Sat, 31 Aug 2024 00:04:25 +0300 Subject: [PATCH 01/14] Remove social net vk & yandex --- README.md | 9 ++++- config/_application-prod.yaml | 2 +- resources/view/login.html | 8 ----- resources/view/unauth/register.html | 8 ----- .../handler/VkOAuth2UserDataHandler.java | 35 ------------------- .../handler/YandexOAuth2UserDataHandler.java | 21 ----------- src/main/resources/application.yaml | 26 +------------- src/main/resources/data4dev/data.sql | 3 +- src/main/resources/db/changelog.sql | 1 - src/test/resources/application-test.yaml | 2 +- src/test/resources/data.sql | 3 +- 11 files changed, 13 insertions(+), 105 deletions(-) delete mode 100644 src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java delete mode 100644 src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java diff --git a/README.md b/README.md index 719b268f5..e75640c6b 100644 --- a/README.md +++ b/README.md @@ -27,4 +27,11 @@ - https://habr.com/ru/articles/259055/ Список выполненных задач: -... \ No newline at end of file +... +1. Удалить социальные сети: vk, yandex. + Удалено два класса в пакете src/main/java/com/javarush/jira/login/internal/sociallogin. + Удалены ссылка в ресурсных файлах html login и rgister. + Удалены записи в файлах data.sql и changelog.sql + Удалены регистрационные данные для полключения к сетям vk и yandex в файле application.yaml +2. Вынести чувствительную информацию в отдельный проперти файл: + \ No newline at end of file diff --git a/config/_application-prod.yaml b/config/_application-prod.yaml index 67fd8b7c2..723cde7ff 100644 --- a/config/_application-prod.yaml +++ b/config/_application-prod.yaml @@ -3,7 +3,7 @@ app: host-url: http://localhost spring: datasource: - url: jdbc:postgresql://localhost:5432/jira + url: jdbc:postgresql://192.168.253.101:5432/jira username: jira password: JiraRush diff --git a/resources/view/login.html b/resources/view/login.html index 8765ca8ff..d49ce5691 100644 --- a/resources/view/login.html +++ b/resources/view/login.html @@ -48,14 +48,6 @@

Sign in

type="button"> - - - - - - diff --git a/resources/view/unauth/register.html b/resources/view/unauth/register.html index 2ba955045..52a892bd3 100644 --- a/resources/view/unauth/register.html +++ b/resources/view/unauth/register.html @@ -77,14 +77,6 @@

Registration

type="button"> - - - - - - diff --git a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java b/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java deleted file mode 100644 index e8e05be05..000000000 --- a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.javarush.jira.login.internal.sociallogin.handler; - -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - -@Component("vk") -public class VkOAuth2UserDataHandler implements OAuth2UserDataHandler { - @Override - public String getFirstName(OAuth2UserData oAuth2UserData) { - return getAttribute(oAuth2UserData, "first_name"); - } - - @Override - public String getLastName(OAuth2UserData oAuth2UserData) { - return getAttribute(oAuth2UserData, "last_name"); - } - - @Override - public String getEmail(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("email"); - } - - private String getAttribute(OAuth2UserData oAuth2UserData, String name) { - List> attributesResponse = oAuth2UserData.getData("response"); - if (attributesResponse != null) { - Map attributes = attributesResponse.get(0); - if (attributes != null) { - return (String) attributes.get(name); - } - } - return null; - } -} diff --git a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java b/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java deleted file mode 100644 index e8ea1ac1d..000000000 --- a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.javarush.jira.login.internal.sociallogin.handler; - -import org.springframework.stereotype.Component; - -@Component("yandex") -public class YandexOAuth2UserDataHandler implements OAuth2UserDataHandler { - @Override - public String getFirstName(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("first_name"); - } - - @Override - public String getLastName(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("last_name"); - } - - @Override - public String getEmail(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("default_email"); - } -} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 7fcba1570..ff86c2b10 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -26,7 +26,7 @@ spring: # https://stackoverflow.com/questions/21257819/what-is-the-difference-between-hibernate-jdbc-fetch-size-and-hibernate-jdbc-batc jdbc.batch_size: 20 datasource: - url: jdbc:postgresql://localhost:5432/jira + url: jdbc:postgresql://192.168.253.101:5432/jira username: jira password: JiraRush @@ -61,20 +61,6 @@ spring: scope: - email - profile - vk: - client-id: 51562377 - client-secret: jNM1YHQy1362Mqs49wUN - client-name: Vkontakte - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" - client-authentication-method: client_secret_post - authorization-grant-type: authorization_code - scope: email - yandex: - client-id: 2f3395214ba84075956b76a34b231985 - client-secret: ed236c501e444a609b0f419e5e88f1e1 - client-name: Yandex - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" - authorization-grant-type: authorization_code gitlab: client-id: b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 client-secret: e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 @@ -83,16 +69,6 @@ spring: authorization-grant-type: authorization_code scope: read_user provider: - vk: - authorization-uri: https://oauth.vk.com/authorize - token-uri: https://oauth.vk.com/access_token - user-info-uri: https://api.vk.com/method/users.get?v=8.1 - user-name-attribute: response - yandex: - authorization-uri: https://oauth.yandex.ru/authorize - token-uri: https://oauth.yandex.ru/token - user-info-uri: https://login.yandex.ru/info - user-name-attribute: login gitlab: authorization-uri: https://gitlab.com/oauth/authorize token-uri: https://gitlab.com/oauth/token diff --git a/src/main/resources/data4dev/data.sql b/src/main/resources/data4dev/data.sql index a7d43cbad..28b494155 100644 --- a/src/main/resources/data4dev/data.sql +++ b/src/main/resources/data4dev/data.sql @@ -54,8 +54,7 @@ values (1, 'skype', 'userSkype'), (1, 'mobile', '+01234567890'), (1, 'website', 'user.com'), (2, 'github', 'adminGitHub'), - (2, 'tg', 'adminTg'), - (2, 'vk', 'adminVk'); + (2, 'tg', 'adminTg'); delete from ATTACHMENT; diff --git a/src/main/resources/db/changelog.sql b/src/main/resources/db/changelog.sql index 68591336d..1595f97d3 100644 --- a/src/main/resources/db/changelog.sql +++ b/src/main/resources/db/changelog.sql @@ -218,7 +218,6 @@ values ('task', 'Task', 2), ('mobile', 'Mobile', 0), ('phone', 'Phone', 0), ('website', 'Website', 0), - ('vk', 'VK', 0), ('linkedin', 'LinkedIn', 0), ('github', 'GitHub', 0), -- PRIORITY diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml index 51137fd06..48ae5a68a 100644 --- a/src/test/resources/application-test.yaml +++ b/src/test/resources/application-test.yaml @@ -3,6 +3,6 @@ spring: init: mode: always datasource: - url: jdbc:postgresql://localhost:5433/jira-test + url: jdbc:postgresql://192.168.253.101:5432/jira-test username: jira password: JiraRush \ No newline at end of file diff --git a/src/test/resources/data.sql b/src/test/resources/data.sql index 5087dbddc..bc26161e4 100644 --- a/src/test/resources/data.sql +++ b/src/test/resources/data.sql @@ -53,8 +53,7 @@ values (1, 'skype', 'userSkype'), (1, 'mobile', '+01234567890'), (1, 'website', 'user.com'), (2, 'github', 'adminGitHub'), - (2, 'tg', 'adminTg'), - (2, 'vk', 'adminVk'); + (2, 'tg', 'adminTg'); insert into PROJECT (code, title, description, type_code, parent_id) From b2472c7d66b08ac377f4f977beffe180cfb2aa2e Mon Sep 17 00:00:00 2001 From: Evgeny Alpeyev Date: Sun, 1 Sep 2024 22:57:05 +0300 Subject: [PATCH 02/14] Move sensivity info into separate file. --- src/main/resources/application.properties | 28 ++++++++++++ src/main/resources/application.yaml | 44 +++++++++---------- .../resources/application-test.properties | 22 ++++++++++ src/test/resources/application-test.yaml | 6 +-- 4 files changed, 75 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/application.properties create mode 100644 src/test/resources/application-test.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 000000000..101e8df2f --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,28 @@ +app.host-url=http://localhost +app.host-port=8080 +test-mail=jira4jr@gmail.com + +datasource.url=jdbc:postgresql://dc1.2e2v.ru:5432/jira +datasource.username=jira +datasource.password=JiraRush + +github.client-id=3d0d8738e65881fff266 +github.client-secret=0f97031ce6178b7dfb67a6af587f37e222a16120 + +google.client-id=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com +google.client-secret=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 + +gitlab.client-id=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 +gitlab.client-secret=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 +gitlab.client-name=GitLab +gitlab.redirect-uri="{baseUrl}/login/oauth2/code/{registrationId}" +gitlab.authorization-grant-type=authorization_code +gitlab.authorization-uri=https://gitlab.com/oauth/authorize +gitlab.token-uri=https://gitlab.com/oauth/token +gitlab.user-info-uri=https://gitlab.com/api/v4/user +gitlab.user-name-attribute=email + +mail.host=smtp.gmail.com +mail.username=jira4jr@gmail.com +mail.password=zdfzsrqvgimldzyj +mail.port=587 diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index ff86c2b10..c9d94b2d6 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,7 +1,7 @@ # https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html app: - host-url: http://localhost:8080 - test-mail: jira4jr@gmail.com + host-url: ${APP_HOST_URL:http://localhost}:${APP_PORT:-8080} # http://localhost:8080 + test-mail: ${SPRING_MAIL_USERNAME} templates-update-cache: 5s mail-sending-props: core-pool-size: 8 @@ -26,9 +26,9 @@ spring: # https://stackoverflow.com/questions/21257819/what-is-the-difference-between-hibernate-jdbc-fetch-size-and-hibernate-jdbc-batc jdbc.batch_size: 20 datasource: - url: jdbc:postgresql://192.168.253.101:5432/jira - username: jira - password: JiraRush + url: ${DATASOURCE_URL:jdbc:postgresql://localhost:5432/jira} + username: ${DATASOURCE_USERNAME} + password: ${DATASOURCE_PASSWORD}$ liquibase: changeLog: "classpath:db/changelog.sql" @@ -51,29 +51,29 @@ spring: client: registration: github: - client-id: 3d0d8738e65881fff266 - client-secret: 0f97031ce6178b7dfb67a6af587f37e222a16120 + client-id: ${GITHUB_CLIENT-ID} + client-secret: ${ITHUB_CLIENT-SECRET} scope: - email google: - client-id: 329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com - client-secret: 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 + client-id: ${GOOGLE_CLIENT-ID} + client-secret: ${GOOGLE_CLIENT-SECRET} scope: - email - profile gitlab: - client-id: b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 - client-secret: e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 - client-name: GitLab - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" - authorization-grant-type: authorization_code + client-id: ${GITLAB_CLIENT-ID} + client-secret: ${GITLAB_CLIENT-SECRET} + client-name: ${GITLAB_CLIENT-NAME} + redirect-uri: ${GITLAB_REDIRECT-URI} + authorization-grant-type: ${GITLAB_AUTHORIZATION-GRANT-TYPE} scope: read_user provider: gitlab: - authorization-uri: https://gitlab.com/oauth/authorize - token-uri: https://gitlab.com/oauth/token - user-info-uri: https://gitlab.com/api/v4/user - user-name-attribute: email + authorization-uri: ${GITLAB_AUTHORIZATION-URI} + token-uri: ${GITLAB_TOKEN-URI} + user-info-uri: ${GITLAB_USER-INFO-URI} + user-name-attribute: ${GITLAB_USER-NAME-ATTRIBUTE} sql: init: @@ -86,10 +86,10 @@ spring: starttls: enable: true auth: true - host: smtp.gmail.com - username: jira4jr@gmail.com - password: zdfzsrqvgimldzyj - port: 587 + host: ${MAIL_HOST} + username: ${MAIL_USERNAME} + password: ${MAIL_PASSWORD} + port: ${MAIL_PORT:587} thymeleaf.check-template-location: false mvc.throw-exception-if-no-handler-found: true diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties new file mode 100644 index 000000000..c48ab6b24 --- /dev/null +++ b/src/test/resources/application-test.properties @@ -0,0 +1,22 @@ +test-mail=jira4jr@gmail.com + +datasource.url=jdbc:postgresql://dc1.2e2v.ru:5432/jira-test +datasource.username=jira +datasource.password=JiraRush + +github.client-id=3d0d8738e65881fff266 +github.client-secret=0f97031ce6178b7dfb67a6af587f37e222a16120 + +google.client-id=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com +google.client-secret=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 + +gitlab.client-id=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 +gitlab.client-secret=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 +gitlab.client-name=GitLab +gitlab.redirect-uri="{baseUrl}/login/oauth2/code/{registrationId}" +gitlab.authorization-grant-type=authorization_code + +mail.host=smtp.gmail.com +mail.username=jira4jr@gmail.com +mail.password=zdfzsrqvgimldzyj +mail.port=587 diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml index 48ae5a68a..8d38d2d12 100644 --- a/src/test/resources/application-test.yaml +++ b/src/test/resources/application-test.yaml @@ -3,6 +3,6 @@ spring: init: mode: always datasource: - url: jdbc:postgresql://192.168.253.101:5432/jira-test - username: jira - password: JiraRush \ No newline at end of file + url: ${DATASOURCE_URL:"jdbc:postgresql://localhost:5433/jira-test"} + username: ${DATASOURCE_USERNAME} + password: ${DATASOURCE_PASSWORD} \ No newline at end of file From fe3d630196a42a9c035a8bf09a753290bf0f3d03 Mon Sep 17 00:00:00 2001 From: Evgeny Alpeyev Date: Mon, 2 Sep 2024 00:29:01 +0300 Subject: [PATCH 03/14] Move sensivity info into separate file. #1 --- src/main/resources/application.properties | 43 ++++++++++--------- .../resources/application-test.properties | 34 +++++++-------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 101e8df2f..52d863f38 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,28 +1,29 @@ app.host-url=http://localhost app.host-port=8080 -test-mail=jira4jr@gmail.com +app.test-mail=jira4jr@gmail.com -datasource.url=jdbc:postgresql://dc1.2e2v.ru:5432/jira -datasource.username=jira -datasource.password=JiraRush +spring.datasource.url=jdbc:postgresql://dc1.2e2v.ru:5432/jira +spring.datasource.username=jira +spring.datasource.password=JiraRush -github.client-id=3d0d8738e65881fff266 -github.client-secret=0f97031ce6178b7dfb67a6af587f37e222a16120 +spring.security.oauth2.client.registration.github.client-id=3d0d8738e65881fff266 +spring.security.oauth2.client.registration.github.client-secret=0f97031ce6178b7dfb67a6af587f37e222a16120 -google.client-id=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com -google.client-secret=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 +spring.security.oauth2.client.registration.google.client-id=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com +spring.security.oauth2.client.registration.google.client-secret=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 -gitlab.client-id=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 -gitlab.client-secret=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 -gitlab.client-name=GitLab -gitlab.redirect-uri="{baseUrl}/login/oauth2/code/{registrationId}" -gitlab.authorization-grant-type=authorization_code -gitlab.authorization-uri=https://gitlab.com/oauth/authorize -gitlab.token-uri=https://gitlab.com/oauth/token -gitlab.user-info-uri=https://gitlab.com/api/v4/user -gitlab.user-name-attribute=email +spring.security.oauth2.client.registration.gitlab.client-id=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 +spring.security.oauth2.client.registration.gitlab.client-secret=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 +spring.security.oauth2.client.registration.gitlab.client-name=GitLab +spring.security.oauth2.client.registration.gitlab.redirect-uri="{baseUrl}/login/oauth2/code/{registrationId}" +spring.security.oauth2.client.registration.gitlab.authorization-grant-type=authorization_code -mail.host=smtp.gmail.com -mail.username=jira4jr@gmail.com -mail.password=zdfzsrqvgimldzyj -mail.port=587 +spring.security.oauth2.client.provider.gitlab.authorization-uri=https://gitlab.com/oauth/authorize +spring.security.oauth2.client.provider.gitlab.token-uri=https://gitlab.com/oauth/token +spring.security.oauth2.client.provider.gitlab.user-info-uri=https://gitlab.com/api/v4/user +spring.security.oauth2.client.provider.gitlab.user-name-attribute=email + +spring.mail.host=smtp.gmail.com +spring.mail.username=jira4jr@gmail.com +spring.mail.password=zdfzsrqvgimldzyj +spring.mail.port=587 diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties index c48ab6b24..14b4e1bf8 100644 --- a/src/test/resources/application-test.properties +++ b/src/test/resources/application-test.properties @@ -1,22 +1,22 @@ -test-mail=jira4jr@gmail.com +app.test-mail=jira4jr@gmail.com -datasource.url=jdbc:postgresql://dc1.2e2v.ru:5432/jira-test -datasource.username=jira -datasource.password=JiraRush +spring.datasource.url=jdbc:postgresql://dc1.2e2v.ru:5432/jira-test +spring.datasource.username=jira +spring.datasource.password=JiraRush -github.client-id=3d0d8738e65881fff266 -github.client-secret=0f97031ce6178b7dfb67a6af587f37e222a16120 +spring.security.oauth2.client.registration.github.client-id=3d0d8738e65881fff266 +spring.security.oauth2.client.registration.github.client-secret=0f97031ce6178b7dfb67a6af587f37e222a16120 -google.client-id=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com -google.client-secret=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 +spring.security.oauth2.client.registration.google.client-id=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com +spring.security.oauth2.client.registration.google.client-secret=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 -gitlab.client-id=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 -gitlab.client-secret=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 -gitlab.client-name=GitLab -gitlab.redirect-uri="{baseUrl}/login/oauth2/code/{registrationId}" -gitlab.authorization-grant-type=authorization_code +spring.security.oauth2.client.registration.gitlab.client-id=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 +spring.security.oauth2.client.registration.gitlab.client-secret=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 +spring.security.oauth2.client.registration.gitlab.client-name=GitLab +spring.security.oauth2.client.registration.gitlab.redirect-uri="{baseUrl}/login/oauth2/code/{registrationId}" +spring.security.oauth2.client.registration.gitlab.authorization-grant-type=authorization_code -mail.host=smtp.gmail.com -mail.username=jira4jr@gmail.com -mail.password=zdfzsrqvgimldzyj -mail.port=587 +spring.mail.host=smtp.gmail.com +spring.mail.username=jira4jr@gmail.com +spring.mail.password=zdfzsrqvgimldzyj +spring.mail.port=587 From 3e71ab163585be80a66053ba3e3a091fe050ba72 Mon Sep 17 00:00:00 2001 From: Evgeny Alpeyev Date: Mon, 2 Sep 2024 02:00:44 +0300 Subject: [PATCH 04/14] Add two localisation lang into mail && index --- resources/mails/email-confirmation.html | 17 +++++++++++------ resources/mails/password-reset.html | 8 ++++---- resources/view/index.html | 5 +++-- resources/view/layout/header.html | 6 ++++++ .../jira/common/internal/config/MvcConfig.java | 18 ++++++++++++++++++ src/main/resources/messages.properties | 7 +++++++ src/main/resources/messages_en.properties | 7 +++++++ src/main/resources/messages_ru.properties | 7 +++++++ 8 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/messages.properties create mode 100644 src/main/resources/messages_en.properties create mode 100644 src/main/resources/messages_ru.properties diff --git a/resources/mails/email-confirmation.html b/resources/mails/email-confirmation.html index 106e6129a..acb0186f7 100644 --- a/resources/mails/email-confirmation.html +++ b/resources/mails/email-confirmation.html @@ -1,13 +1,18 @@ - + - JiraRush - подтверждение почты + + EN + RU + + + -

-

Чтобы завершить настройку учетной записи и начать пользоваться JiraRush, подтвердите, что вы правильно указали вашу - электронную почту.

-Подтвердить почту + +

+

"#{text.mailconfirmation}"

+ \ No newline at end of file diff --git a/resources/mails/password-reset.html b/resources/mails/password-reset.html index b37a49007..f2b86204f 100644 --- a/resources/mails/password-reset.html +++ b/resources/mails/password-reset.html @@ -1,12 +1,12 @@ - + - JiraRush - установить новый пароль + -

-

+

+

Установить пароль \ No newline at end of file diff --git a/resources/view/index.html b/resources/view/index.html index e8656ef96..18cbbdf0e 100644 --- a/resources/view/index.html +++ b/resources/view/index.html @@ -1,10 +1,11 @@ - + -

JiraRush Home page

+ +

diff --git a/resources/view/layout/header.html b/resources/view/layout/header.html index 451f9652d..a306ee754 100644 --- a/resources/view/layout/header.html +++ b/resources/view/layout/header.html @@ -4,10 +4,16 @@
+