diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c966069..4bb9fbf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,21 @@ All notable changes to fhq-server project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [v0.2.43] - 2021-08-28 (2021 August 28) + +### Fixed + +- Fixed page welcome for mobile devices + +### Added + +- Added auto replacment on registration @hotnail.com -> @hotmail.com + +### Security + +- Updated angular to 12.+ +- Updated docker enviroment to debian:11 + ## [v0.2.42] - 2021-06-11 (2021 June 14) ### Changed diff --git a/src.wsjcpp/CMakeLists.txt b/src.wsjcpp/CMakeLists.txt index b308949c..ff2de0c1 100644 --- a/src.wsjcpp/CMakeLists.txt +++ b/src.wsjcpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Automaticly generated by wsjcpp@v0.2.2 cmake_minimum_required(VERSION 3.0) -add_definitions(-DWSJCPP_APP_VERSION="v0.2.42") +add_definitions(-DWSJCPP_APP_VERSION="v0.2.43") add_definitions(-DWSJCPP_APP_NAME="fhq-server") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/unit-tests.wsjcpp/CMakeLists.txt b/unit-tests.wsjcpp/CMakeLists.txt index d2752207..b5090025 100644 --- a/unit-tests.wsjcpp/CMakeLists.txt +++ b/unit-tests.wsjcpp/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) project(unit-tests C CXX) -add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.42") +add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.43") add_definitions(-DWSJCPP_APP_NAME="unit-tests-fhq-server") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -95,7 +95,7 @@ list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/wsjcpp_parse_conf/") list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.cpp") list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.h") -# fhq-server:v0.2.42 +# fhq-server:v0.2.43 list (APPEND WSJCPP_INCLUDE_DIRS "../src") list (APPEND WSJCPP_SOURCES "../src/core/fallen.cpp") list (APPEND WSJCPP_SOURCES "../src/core/fallen.h") diff --git a/web-user/package-lock.json b/web-user/package-lock.json index 6d336a16..caf0dfbc 100644 --- a/web-user/package-lock.json +++ b/web-user/package-lock.json @@ -1,6 +1,6 @@ { "name": "web-user", - "version": "0.2.42", + "version": "0.2.43", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/web-user/package.json b/web-user/package.json index fb0844a2..1926033f 100644 --- a/web-user/package.json +++ b/web-user/package.json @@ -1,6 +1,6 @@ { "name": "web-user", - "version": "0.2.42", + "version": "0.2.43", "repository": { "type": "git", "url": "git://github.com/freehackquest/fhq-server.git" diff --git a/web-user/src/app/pages/welcome/welcome.component.css b/web-user/src/app/pages/welcome/welcome.component.css index d454e213..a22509f8 100644 --- a/web-user/src/app/pages/welcome/welcome.component.css +++ b/web-user/src/app/pages/welcome/welcome.component.css @@ -1,4 +1,48 @@ .welcome-description { margin-left: 10px; -} \ No newline at end of file +} + +.welcome-card-header-main { + justify-content: center; +} + +.welcome-header-image-main { + background-image: url("../../../assets/img/welcome/about.png"); + background-size: 100% 100%; + width: 250px; + height: 120px; + border-radius: 0px; +} + +.welcome-card-content-main-titles { + text-align: center; +} + +.welcome-header-image { + background-image: url("../../../assets/img/welcome/about.png"); + background-size: 100% 100%; + width: 80px; + height: 40px; + border-radius: 0px; +} + +.welcome-list-item { + padding-top: 10px; + padding-bottom: 10px; +} + +.welcome-description { + display: inline-block; +} + +.welcome-item-devider { + display: block; + margin: 0; + border-top-width: 1px; + border-top-style: solid; + position: absolute; + left: 0; + width: 100%; + border-top-color: rgba(0,0,0,.12); +} diff --git a/web-user/src/app/pages/welcome/welcome.component.html b/web-user/src/app/pages/welcome/welcome.component.html index d10fdfbf..c9946dec 100644 --- a/web-user/src/app/pages/welcome/welcome.component.html +++ b/web-user/src/app/pages/welcome/welcome.component.html @@ -1,64 +1,83 @@ - -
- pageWelcome - pageWelcomeAbout + +
- Photo of a project - - - -
pageWelcomeQuestsDescription
- - - - -
pageWelcomeProposalQuestDescription
- - - - -
welcomeWeHaveAPublicChat
- - - - -
welcomeAllEventsOutputHere
- - - - -
welcomeFeedbackDescription
- - - - -
welcomeHelpToProject
- - - - -
welcomeAutomationUssrDescription
- - - - -
welcomeKnowledgeBaseDescription
- - - - -
welcomeUsefulLinksDescription
- - +
+

pageWelcome

+
pageWelcomeAbout
+
+
+
+ +
pageWelcomeQuestsDescription
+
+
+
+ +
pageWelcomeProposalQuestDescription
+
+
+
+ +
welcomeWeHaveAPublicChat
+
+
+
+ +
welcomeAllEventsOutputHere
+
+
+
+ +
welcomeFeedbackDescription
+
+
+
+ +
welcomeHelpToProject
+
+
+
+ +
welcomeAutomationUssrDescription
+
+
+
+ +
welcomeKnowledgeBaseDescription
+
+
+
+ usefulLinks +
welcomeUsefulLinksDescription
+
+
+
+ pageAbout +
+
+
+
+ GitHub +
+
+
+
+ Docker Hub +
+
+
+
+ VKontakte +
+
+
+
+ Telegram +
+
- - - GitHub - Docker - VKontakte -

diff --git a/web-user/src/app/services/email-validator.service.ts b/web-user/src/app/services/email-validator.service.ts index 830e3b0a..5886c40c 100644 --- a/web-user/src/app/services/email-validator.service.ts +++ b/web-user/src/app/services/email-validator.service.ts @@ -23,6 +23,7 @@ export class EmailValidatorService { emailWrongDomains['gmal.com'] = {prop: ["gmail.com"]}; emailWrongDomains['inbox.ry'] = {prop: ["inbox.ru"]}; emailWrongDomains['gamil.com'] = {prop: ["gmail.com"]}; + emailWrongDomains['hotnail.com'] = {prop: ["hotmail.com"]}; const re = /^\w+([\.-]?\w+){1,20}@\w+([\.-]?\w+){1,20}(\.\w{2,3})+$/; let ret = {result: false, error: ""}; diff --git a/wsjcpp.yml b/wsjcpp.yml index d51120fe..f27c3a8b 100644 --- a/wsjcpp.yml +++ b/wsjcpp.yml @@ -3,7 +3,7 @@ cmake_minimum_required: 3.0 cmake_cxx_standard: 11 name: "fhq-server" -version: v0.2.42 +version: v0.2.43 description: "This is an open source platform for competitions of computer security." issues: "https://github.com/freehackquest/fhq-server/issues"