Skip to content

Руслан Ибрагимов / yescenter

Go to a project
Commit 3238b888 by Ruha
Options

Клиентские изменения в лендинге

1 parent d97ac680
Pipeline #2629 for 3238b888 skipped in 0 seconds
Inline Side-by-side
Showing 7 changed files with 190 additions and 70 deletions
.idea/workspace.xml
......@@ -4,6 +4,8 @@
<list default="true" id="f27ea491-44a7-4742-b6b4-1d473d258e2e" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/additional.css" afterPath="$PROJECT_DIR$/css/additional.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/style.css" afterPath="$PROJECT_DIR$/css/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/handler.php" afterPath="$PROJECT_DIR$/handler.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/common.js" afterPath="$PROJECT_DIR$/js/common.js" />
</list>
......@@ -27,11 +29,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
<state relative-caret-position="277">
<caret line="34" column="46" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
<folding />
</state>
</provider>
......@@ -40,8 +42,18 @@
<file leaf-file-name="additional.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="193" column="12" selection-start-line="193" selection-start-column="12" selection-end-line="193" selection-end-column="12" />
<state relative-caret-position="716">
<caret line="315" column="0" selection-start-line="315" selection-start-column="0" selection-end-line="315" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="style.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="194" column="30" selection-start-line="194" selection-start-column="30" selection-end-line="194" selection-end-column="30" />
<folding />
</state>
</provider>
......@@ -50,8 +62,8 @@
<file leaf-file-name="common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="145" column="30" selection-start-line="145" selection-start-column="29" selection-end-line="145" selection-end-column="30" />
<state relative-caret-position="650">
<caret line="309" column="0" selection-start-line="309" selection-start-column="0" selection-end-line="309" selection-end-column="0" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
......@@ -59,11 +71,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="handler.php" pinned="false" current-in-tab="false">
<file leaf-file-name="handler.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2760">
<caret line="115" column="102" selection-start-line="115" selection-start-column="102" selection-end-line="115" selection-end-column="102" />
<state relative-caret-position="668">
<caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -84,11 +96,11 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/handler.php" />
<option value="$PROJECT_DIR$/css/style.css" />
<option value="$PROJECT_DIR$/js/common.js" />
<option value="$PROJECT_DIR$/css/additional.css" />
<option value="$PROJECT_DIR$/css/style.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/handler.php" />
</list>
</option>
</component>
......@@ -153,6 +165,20 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="yescenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="yescenter" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
</panes>
......@@ -160,7 +186,7 @@
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="JavaScript.Libraries" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../landing" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
......@@ -211,7 +237,7 @@
<editor active="false" />
<layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26332623" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26865673" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32897604" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
......@@ -250,6 +276,74 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3768">
<caret line="157" column="14" selection-start-line="157" selection-start-column="14" selection-end-line="157" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4632">
<caret line="193" column="12" selection-start-line="193" selection-start-column="12" selection-end-line="193" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2760">
<caret line="115" column="102" selection-start-line="115" selection-start-column="102" selection-end-line="115" selection-end-column="102" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4632">
<caret line="193" column="12" selection-start-line="193" selection-start-column="12" selection-end-line="193" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3480">
<caret line="145" column="30" selection-start-line="145" selection-start-column="29" selection-end-line="145" selection-end-column="30" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2760">
<caret line="115" column="102" selection-start-line="115" selection-start-column="102" selection-end-line="115" selection-end-column="102" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="8" column="60" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
<folding />
......@@ -321,7 +415,7 @@
<state relative-caret-position="48">
<caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
......@@ -365,7 +459,7 @@
<state relative-caret-position="48">
<caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
......@@ -401,49 +495,49 @@
<state relative-caret-position="2005">
<caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/handler.php">
<entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2760">
<caret line="115" column="102" selection-start-line="115" selection-start-column="102" selection-end-line="115" selection-end-column="102" />
<folding />
<state relative-caret-position="650">
<caret line="309" column="0" selection-start-line="309" selection-start-column="0" selection-end-line="309" selection-end-column="0" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/style.css">
<entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="184" column="227" selection-start-line="184" selection-start-column="227" selection-end-line="184" selection-end-column="227" />
<state relative-caret-position="716">
<caret line="315" column="0" selection-start-line="315" selection-start-column="0" selection-end-line="315" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/additional.css">
<entry file="file://$PROJECT_DIR$/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="193" column="12" selection-start-line="193" selection-start-column="12" selection-end-line="193" selection-end-column="12" />
<state relative-caret-position="336">
<caret line="194" column="30" selection-start-line="194" selection-start-column="30" selection-end-line="194" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/common.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="145" column="30" selection-start-line="145" selection-start-column="29" selection-end-line="145" selection-end-column="30" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="277">
<caret line="34" column="46" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
<state relative-caret-position="668">
<caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
<folding />
</state>
</provider>
......
css/additional.css
#overlay {
background: rgba(0, 0, 0, .5);
position: fixed;
......@@ -311,3 +312,4 @@ input.valid {
width: 122px;
}
}
css/style.css
......@@ -188,6 +188,18 @@ body { font-family: PFAgoraSansPro; }
#page { position: relative; overflow: hidden; width: 100%; }
@media only screen and (min-device-width: 1440px) {
#page {
width: 1200px!important;
margin: 0 auto!important;
box-shadow: 0px 10px 30px rgba(0, 0, 0, 0.15)!important;
}
.ct {padding: 0px 54px!important;}
.map-ct1 .form1 {right:50px!important;}
.logo {left:54px!important;}
#header .t1{left:166px!important;}
}
.ct { max-width: 1152px; margin: auto; position: relative; padding: 0 16px; *zoom: 1; }
.ct:after { content: " "; display: table; clear: both; }
......
handler.php
......@@ -2,12 +2,12 @@
## params
$mailTo = 'mind.it@ya.ru';
## fields
$name = isset($_POST['name']) ? $_POST['name'] : null;
$phone = isset($_POST['phone']) ? $_POST['phone'] : null;
$city = isset($_POST['city']) ? $_POST['city'] : null;
$email = isset($_POST['email']) ? $_POST['email'] : null;
$till = isset($_POST['till']) ? $_POST['till'] : null;
$from = isset($_POST['from']) ? $_POST['from'] : null;
$name = isset($_POST['name']) ? $_POST['name'] : null;
$phone = isset($_POST['phone']) ? $_POST['phone'] : null;
$city = isset($_POST['city']) ? $_POST['city'] : null;
$email = isset($_POST['email']) ? $_POST['email'] : null;
$till = isset($_POST['till']) ? $_POST['till'] : null;
$from = isset($_POST['from']) ? $_POST['from'] : null;
## additional fields
$type = isset($_POST['type']) ? $_POST['type'] : null;
switch ($type) {
......@@ -18,17 +18,18 @@ switch ($type) {
break;
case 'order':
$data = ['name' => $name, 'email' => $email, 'city' => $city,];
$data = ['name' => $name, 'email' => $email, 'city' => $city,];
$order = new order($data);
$order->send($data);
break;
default:
echo json_encode(array('type'=>'no_template', 'text'=>'Задайте шаблон обработчика!'));
echo json_encode(array('type' => 'no_template', 'text' => 'Задайте шаблон обработчика!'));
break;
}
class Form{
class Form
{
public static function validate($data, $field = null)
{
......@@ -36,37 +37,39 @@ class Form{
case 'phone':
if (!preg_match("/^(8|\+7) ? ?\(?(\d{3})\)? ?(\d{3})[ -]?(\d{2})[ -]?(\d{2})/", $data))
die(json_encode(array('type'=>'error_phone', 'text'=>'Телефон введен неверно')));
die(json_encode(array('type' => 'error_phone', 'text' => 'Телефон введен неверно')));
return $data;
break;
case 'name':
if (mb_strlen($data) <= 1)
die(json_encode(array('type'=>'error_name', 'text'=>'Вы не ввели имя')));
die(json_encode(array('type' => 'error_name', 'text' => 'Вы не ввели имя')));
return $data;
break;
case 'email':
if (!preg_match("/.+@.+\..+/i", $data))
die(json_encode(array('type'=>'error_email', 'text'=>'Почтовый адрес введен неверно')));
die(json_encode(array('type' => 'error_email', 'text' => 'Почтовый адрес введен неверно')));
return $data;
break;
default:
if (strlen($data) < 2)
die(json_encode(array('type'=>'error', 'text'=>"Поле $field пусто")));
die(json_encode(array('type' => 'error', 'text' => "Поле $field пусто")));
return $data;
}
}
public function send(array $data)
{
}
}
class callback extends Form {
class callback extends Form
{
public $phone;
public $till;
public $from;
function __construct(array $data)
{
$this->phone = Form::validate($data['phone'], 'phone');
......@@ -74,22 +77,24 @@ class callback extends Form {
$this->from = $data['from'];
}
public function send(){
public function send()
{
global $mailTo;
$headers = 'MIME-Version: 1.0' . "\r\n";
$headers = 'MIME-Version: 1.0' . "\r\n";
$headers .= 'Content-type: text/html; charset=utf-8' . "\r\n";
$headers .= 'From: Landing_Page <testmail@test.ru>';
$subject = "Заявка на франшизу";
$message = 'Телефон: '. $this->phone . '<br>';
$message = 'Телефон: ' . $this->phone . '<br>';
$message .= 'Звонить с ' . $this->till . '<br>';
$message .= 'До ' . $this->from . '<br>';
if (mail($mailTo, $subject, $message, $headers)) {
echo json_encode(array('type'=>'success_send', 'text'=>'Ваша заявка успешно отправлена'));
echo json_encode(array('type' => 'success_send', 'text' => 'Ваша заявка успешно отправлена'));
}
}
}
class order extends Form {
class order extends Form
{
public $name;
public $city;
......@@ -103,20 +108,22 @@ class order extends Form {
$this->email = Form::validate($data['email'], 'email');
}
public function send(){
public function send()
{
global $mailTo;
$headers = 'MIME-Version: 1.0' . "\r\n";
$headers = 'MIME-Version: 1.0' . "\r\n";
$headers .= 'Content-type: text/html; charset=utf-8' . "\r\n";
$headers .= 'From: Landing_Page <testmail@test.ru>';
$subject = "Заявка на франшизу";
$message = 'Клиента зовут: '. $this->name . '<br>';
$message = 'Клиента зовут: ' . $this->name . '<br>';
$message .= 'Почтовый ящик: ' . $this->email . '<br>';
$message .= 'Город: ' . $this->city . '<br>';
if (mail($mailTo, $subject, $message, $headers)) {
echo json_encode(array('type'=>'success_send', 'text'=>'Ваша заявка успешно отправлена'));
echo json_encode(array('type' => 'success_send', 'text' => 'Ваша заявка успешно отправлена'));
}
}
}
img/w5.jpg 0 → 100644
img/w5.jpg

296 KB
index.html
......@@ -32,7 +32,7 @@
<div class="ov">
<div><span>18</span><i>филиалов крупной сети <br>языковых школ</i></div>
<div><span>9</span><i>действующих <br>франчайзи</i></div>
<div><span>16</span><i>лет оптыта</i></div>
<div><span>16</span><i>лет<br>оптыта</i></div>
</div>
</div>
</div>
......@@ -162,7 +162,7 @@
<div class="t1">Яркий и узнаваемый бренд</div>
<div class="ov1">
<div class="ll1"><img src="img/w4.jpg" alt=""><span></span></div>
<div class="ll1"><img src="img/w3.jpg" alt=""><span></span></div>
<div class="ll1"><img src="img/w5.jpg" alt=""><span></span></div>
<div class="sl3">
<div>
<div class="ll1"><img src="img/w1.jpg" alt=""><span>Офис-франчайзи в Санкт-Петербурге</span>
......
js/common.js
......@@ -143,12 +143,12 @@ $('.modal-close-xray').click(function () {
closemodal($(this).parents('.modal').attr('id'));
});
function callmodal(id) {
overlay.css({'display':'flex'});
overlay.css({'display': 'flex'});
$('#' + id).removeClass('hidden');
}
function closemodal(id) {
overlay.css({'display':'none'});
overlay.css({'display': 'none'});
$('#' + id).addClass('hidden');
}
......@@ -171,9 +171,9 @@ function time(number, type) {
var d = new Date();
d.setTime(Date.parse(time));
if (type == 'down') {
d=moment(d).add(-30, 'minutes').format('HH:mm');
d = moment(d).add(-30, 'minutes').format('HH:mm');
} else {
d=moment(d).add(30, 'minutes').format('HH:mm');
d = moment(d).add(30, 'minutes').format('HH:mm');
}
return d;
......@@ -243,7 +243,7 @@ $(document).ready(function () {
maxlength: "",
},
email: {
email : " Некорректный адрес",
email: " Некорректный адрес",
required: "Введите email",
minlength: "Введите email",
......@@ -255,7 +255,7 @@ $(document).ready(function () {
$("#callback-form").validate({
rules: {
phone: {
digits:true,
digits: true,
required: true,
minlength: 3,
maxlength: 40
......@@ -297,7 +297,7 @@ $(document).ready(function () {
maxlength: "",
},
email: {
email : "Некорректный адрес",
email: "Некорректный адрес",
required: "Введите email",
minlength: "Введите email"
......@@ -306,3 +306,8 @@ $(document).ready(function () {
})
});
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!