Merge pull request #375 from freehackquest/version-0.2.43

Version 0.2.43
freehackquest · Aug 28, 2021 · 7f90747 · 7f90747
2 parents 4172733 + 68d836f
commit 7f90747
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 64 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 # Automaticly generated by [email protected]
 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
@@ -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
diff --git 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
@@ -1,4 +1,48 @@
 
 .welcome-description {
     margin-left: 10px;
-}
+}
+
+.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
@@ -1,64 +1,83 @@
 <mat-card class="welcome-card">
-  <mat-card-header>
-    <div mat-card-avatar class="welcome-header-image"></div>
-    <mat-card-title l10nTranslate>pageWelcome</mat-card-title>
-    <mat-card-subtitle l10nTranslate>pageWelcomeAbout</mat-card-subtitle>
+  <mat-card-header class="welcome-card-header-main">
+    <div mat-card-avatar class="welcome-header-image-main"></div>
   </mat-card-header>
-  <img mat-card-image src="../../../assets/img/welcome/about.png" alt="Photo of a project">
   <mat-card-content>
-    <mat-list>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/quests" l10nTranslate>quests</button>
-        <div class="welcome-description" l10nTranslate>pageWelcomeQuestsDescription</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/quest-proposal" l10nTranslate>proposalQuest</button>
-        <div class="welcome-description" l10nTranslate>pageWelcomeProposalQuestDescription</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/chat" l10nTranslate>chatPage</button>
-        <div class="welcome-description" l10nTranslate>welcomeWeHaveAPublicChat</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/news" l10nTranslate>news</button>
-        <div class="welcome-description" l10nTranslate>welcomeAllEventsOutputHere</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/feedback" l10nTranslate>newFeedback</button>
-        <div class="welcome-description" l10nTranslate>welcomeFeedbackDescription</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/donate" l10nTranslate>pageDonate</button>
-        <div class="welcome-description" l10nTranslate>welcomeHelpToProject</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/automation-ussr" l10nTranslate>automationUssr</button>
-        <div class="welcome-description" l10nTranslate>welcomeAutomationUssrDescription</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/knowledge-base" l10nTranslate>knowledgeBase</button>
-        <div class="welcome-description" l10nTranslate>welcomeKnowledgeBaseDescription</div>
-      </mat-list-item>
-      <mat-divider></mat-divider>
-      <mat-list-item>
-        <button mat-stroked-button color="primary" routerLink="/useful-links" l10nTranslate>usefulLinks</button>
-        <div class="welcome-description" l10nTranslate>welcomeUsefulLinksDescription</div>
-      </mat-list-item>
-    </mat-list>
+    <div class="welcome-card-content-main-titles">
+      <h3 l10nTranslate>pageWelcome</h3>
+      <div l10nTranslate>pageWelcomeAbout</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/quests" l10nTranslate>quests</button>
+      <div class="welcome-description" l10nTranslate>pageWelcomeQuestsDescription</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/quest-proposal" l10nTranslate>proposalQuest</button>
+      <div class="welcome-description" l10nTranslate>pageWelcomeProposalQuestDescription</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/chat" l10nTranslate>chatPage</button>
+      <div class="welcome-description" l10nTranslate>welcomeWeHaveAPublicChat</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/news" l10nTranslate>news</button>
+      <div class="welcome-description" l10nTranslate>welcomeAllEventsOutputHere</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/feedback" l10nTranslate>newFeedback</button>
+      <div class="welcome-description" l10nTranslate>welcomeFeedbackDescription</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/donate" l10nTranslate>pageDonate</button>
+      <div class="welcome-description" l10nTranslate>welcomeHelpToProject</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/automation-ussr" l10nTranslate>automationUssr</button>
+      <div class="welcome-description" l10nTranslate>welcomeAutomationUssrDescription</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <button mat-stroked-button color="primary" routerLink="/knowledge-base" l10nTranslate>knowledgeBase</button>
+      <div class="welcome-description" l10nTranslate>welcomeKnowledgeBaseDescription</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <a mat-stroked-button color="primary" routerLink="/useful-links" l10nTranslate>usefulLinks</a>
+      <div class="welcome-description" l10nTranslate>welcomeUsefulLinksDescription</div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <a mat-stroked-button color="primary" routerLink="/about" l10nTranslate>pageAbout</a>
+      <div class="welcome-description" l10nTranslate></div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <a mat-stroked-button color="primary" target="_blank" href="https://github.com/freehackquest/fhq-server">GitHub</a>
+      <div class="welcome-description" l10nTranslate></div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <a mat-stroked-button color="primary" target="_blank" href="https://hub.docker.com/r/sea5kg/fhq-server">Docker Hub</a>
+      <div class="welcome-description" l10nTranslate></div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <a mat-stroked-button color="primary" target="_blank" href="https://vk.com/freehackquest">VKontakte</a>
+      <div class="welcome-description" l10nTranslate></div>
+    </div>
+    <div class="welcome-item-devider"></div>
+    <div class="welcome-list-item">
+      <a mat-stroked-button color="primary" target="_blank" href="https://telegram.me/freehackquest">Telegram</a>
+      <div class="welcome-description" l10nTranslate></div>
+    </div>
   </mat-card-content>
-  <mat-card-actions>
-    <button mat-button routerLink="/about" l10nTranslate>pageAbout</button>
-    <a target="_blank" href="https://github.com/freehackquest/fhq-server" mat-button>GitHub</a>
-    <a target="_blank" href="https://hub.docker.com/r/freehackquest/fhq-server" mat-button>Docker</a>
-    <a target="_blank" href="https://vk.com/freehackquest" mat-button>VKontakte</a>
-  </mat-card-actions>
 </mat-card>
 
 <br/><br/>

diff --git 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
@@ -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"