From f7b089c3c4363094d77e64913211c5c990ee50f3 Mon Sep 17 00:00:00 2001
From: slaveeks <chernyshev2001@icloud.com>
Date: Tue, 13 Sep 2022 15:25:01 +0300
Subject: [PATCH 1/4] Changed contact input type to text, changed label for
 contact form, added contact form to join for authorized users

---
 www/application/views/templates/blocks/form-join.php | 12 +++++-------
 www/application/views/templates/join/index-en.php    |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/www/application/views/templates/blocks/form-join.php b/www/application/views/templates/blocks/form-join.php
index 0a59a780..16069791 100644
--- a/www/application/views/templates/blocks/form-join.php
+++ b/www/application/views/templates/blocks/form-join.php
@@ -5,7 +5,7 @@
 
         <? if (!empty($error)): ?>
             <div class="join-page__error">
-                Enter an email, so we can message you.
+                Enter an email or telegram, so we can message you.
             </div>
         <? endif ?>
 
@@ -20,14 +20,12 @@
                         Your name
                     </label>
                     <input class="input" type="text" name="name" id="name" value="<?= HTML::chars(Arr::get($_POST, 'name')) ?>" required>
-
-                    <label for="js-email">
-                        Contact email
-                    </label>
-                    <input class="input" type="email" name="email" id="js-email" autocomplete="off" required>
                 </div>
             <? endif ?>
-
+            <label for="js-email">
+                Contact email or telegram
+            </label>
+            <input class="input" type="text" name="email" id="js-email" autocomplete="off" required>
             <label for="skills">Tell us about your skills</label>
             <textarea class="input" name="skills" id="skills" rows="5" required=""><?= Arr::get($_POST, 'skills') ?></textarea>
 
diff --git a/www/application/views/templates/join/index-en.php b/www/application/views/templates/join/index-en.php
index 72662e87..5d6ee80d 100644
--- a/www/application/views/templates/join/index-en.php
+++ b/www/application/views/templates/join/index-en.php
@@ -77,7 +77,7 @@
             The key factor is your enthusiasm. In exchange, you will get a huge amount of experience, new skills, interesting and hard projects, an opportunity to take part in creating and launching world market products.
         </p>
         <p>
-            To apply, enter email, so we can contact you, and fill a little form. Also, please write where are you from.
+            To apply, enter email or telegram, so we can contact you, and fill a little form. Also, please write where are you from.
         </p>
         <!--
         <section class="join-component join-component--compact">

From 058878072def71927bbf873997f37de9fd166b80 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:32:59 +0000
Subject: [PATCH 2/4] Build frontend

---
 www/public/build/release.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/public/build/release.json b/www/public/build/release.json
index b69711c1..0875a377 100644
--- a/www/public/build/release.json
+++ b/www/public/build/release.json
@@ -1 +1 @@
-{"release":"223d8eb43073a38b4278","date":1653936684460}
\ No newline at end of file
+{"release":"223d8eb43073a38b4278","date":1663072374504}
\ No newline at end of file

From 2598e8be9052c76d5cda58e579bd7d2369e41c45 Mon Sep 17 00:00:00 2001
From: slaveeks <chernyshev2001@icloud.com>
Date: Tue, 13 Sep 2022 16:16:57 +0300
Subject: [PATCH 3/4] Changed join telegram notification, not using codex.so
 profile

---
 www/application/classes/Controller/Pages.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/www/application/classes/Controller/Pages.php b/www/application/classes/Controller/Pages.php
index fb97c0bd..a9bfa2a1 100644
--- a/www/application/classes/Controller/Pages.php
+++ b/www/application/classes/Controller/Pages.php
@@ -120,20 +120,12 @@ public function action_process_join_form()
         $this->view['success'] = $this->methods->saveJoinRequest($fields);
 
         if ($this->view['success']) {
-            /**
-             * If user is registered then show link to the profile
-             * otherwise show email and mailto link
-             */
-            if ($this->user->id) {
-                $name = $this->user->name;
-                $id = $this->user->id;
-                $host = Arr::get($_SERVER, 'HTTP_HOST');
-
-                $link = "{$host}/user/{$id}";
-                $footer = "👤 [$link]($link)";
-            } else {
-                $footer = "✉️ {$email}";
-            }
+            $name = $this->user->name;
+            $id = $this->user->id;
+            $host = Arr::get($_SERVER, 'HTTP_HOST');
+
+            $link = "{$host}/user/{$id}";
+            $footer = "✉️ {$email}";
 
             $text = "🦄 {$name} wants to join the team\n" .
                     "\n" .

From e67e9ab62c6bb46b09d28406a98279192b2d1d8a Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:18:34 +0000
Subject: [PATCH 4/4] Build frontend

---
 www/public/build/release.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/public/build/release.json b/www/public/build/release.json
index 0875a377..1bc0825f 100644
--- a/www/public/build/release.json
+++ b/www/public/build/release.json
@@ -1 +1 @@
-{"release":"223d8eb43073a38b4278","date":1663072374504}
\ No newline at end of file
+{"release":"223d8eb43073a38b4278","date":1663075110008}
\ No newline at end of file