Skip to content

F
fazo
Commit 84aa5e63 authored by Shahzod's avatar Shahzod
Browse files
Options

Fucking project

parent 2b359cb4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 346 deletions
.idea/fazoshop.iml
View file @ 84aa5e63
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" /> <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
<excludeFolder url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" /> <excludeFolder url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/contracts" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/debug" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/debug" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
......
.idea/php.xml
View file @ 84aa5e63
This diff is collapsed.
.idea/workspace.xml
View file @ 84aa5e63
This diff is collapsed.
composer.lock
View file @ 84aa5e63
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9f657ec865f9f65549dde33ed7da0d1f", "content-hash": "9f657ec865f9f65549dde33ed7da0d1f",
...@@ -164,30 +164,28 @@ ...@@ -164,30 +164,28 @@
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "1.1.0", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea" "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea", "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea", "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2" "php": ">=5.3.2"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^6.0", "phpunit/phpunit": "^4.5"
"phpstan/phpstan": "^0.11.8",
"phpunit/phpunit": "^8.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.1.x-dev" "dev-master": "1.0.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -200,14 +198,14 @@ ...@@ -200,14 +198,14 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Roman Borschel", "name": "Roman Borschel",
"email": "roman@code-factory.org" "email": "roman@code-factory.org"
}, },
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Johannes Schmitt", "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com" "email": "schmittjoh@gmail.com"
...@@ -222,7 +220,7 @@ ...@@ -222,7 +220,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2019-07-30T19:33:28+00:00" "time": "2019-06-08T11:03:04+00:00"
}, },
{ {
"name": "dompdf/dompdf", "name": "dompdf/dompdf",
...@@ -829,6 +827,51 @@ ...@@ -829,6 +827,51 @@
], ],
"time": "2018-12-27T15:44:58+00:00" "time": "2018-12-27T15:44:58+00:00"
}, },
{
"name": "kylekatarnls/update-helper",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/kylekatarnls/update-helper.git",
"reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e",
"reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.1.0 || ^2.0.0",
"php": ">=5.3.0"
},
"require-dev": {
"codeclimate/php-test-reporter": "dev-master",
"composer/composer": "2.0.x-dev || ^2.0.0-dev",
"phpunit/phpunit": ">=4.8.35 <6.0"
},
"type": "composer-plugin",
"extra": {
"class": "UpdateHelper\\ComposerPlugin"
},
"autoload": {
"psr-0": {
"UpdateHelper\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kyle",
"email": "kylekatarnls@gmail.com"
}
],
"description": "Update helper",
"time": "2019-07-29T11:03:54+00:00"
},
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.8.35", "version": "v5.8.35",
...@@ -1331,36 +1374,34 @@ ...@@ -1331,36 +1374,34 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.25.2", "version": "1.39.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f" "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4be0c005164249208ce1b5ca633cd57bdd42ff33",
"reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f", "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "kylekatarnls/update-helper": "^1.1",
"php": "^7.1.8 || ^8.0", "php": ">=5.3.9",
"symfony/translation": "^3.4 || ^4.0" "symfony/translation": "~2.6 || ~3.0 || ~4.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0", "composer/composer": "^1.2",
"kylekatarnls/multi-tester": "^1.1", "friendsofphp/php-cs-fixer": "~2",
"phpmd/phpmd": "dev-php-7.1-compatibility", "phpunit/phpunit": "^4.8.35 || ^5.7"
"phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
}, },
"bin": [ "bin": [
"bin/carbon" "bin/upgrade-carbon"
], ],
"type": "library", "type": "library",
"extra": { "extra": {
"update-helper": "Carbon\\Upgrade",
"laravel": { "laravel": {
"providers": [ "providers": [
"Carbon\\Laravel\\ServiceProvider" "Carbon\\Laravel\\ServiceProvider"
...@@ -1369,7 +1410,7 @@ ...@@ -1369,7 +1410,7 @@
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Carbon\\": "src/Carbon/" "": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -1381,20 +1422,16 @@ ...@@ -1381,20 +1422,16 @@
"name": "Brian Nesbitt", "name": "Brian Nesbitt",
"email": "brian@nesbot.com", "email": "brian@nesbot.com",
"homepage": "http://nesbot.com" "homepage": "http://nesbot.com"
},
{
"name": "kylekatarnls",
"homepage": "http://github.com/kylekatarnls"
} }
], ],
"description": "An API extension for DateTime that supports 281 different languages.", "description": "A simple API extension for DateTime.",
"homepage": "http://carbon.nesbot.com", "homepage": "http://carbon.nesbot.com",
"keywords": [ "keywords": [
"date", "date",
"datetime", "datetime",
"time" "time"
], ],
"time": "2019-10-14T14:18:59+00:00" "time": "2019-10-14T05:51:36+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
......
resources/views/main.blade.php
View file @ 84aa5e63
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<h4 style="color: #ffffff">ЗА 5-7 РАБОЧИХ ДНЕЙ</h4> <h4 style="color: #ffffff">ЗА 5-7 РАБОЧИХ ДНЕЙ</h4>
<p>Сомневаетесь? – Ознакомьтесь <p>Сомневаетесь? – Ознакомьтесь
с оценками наших клиентов</p> с оценками наших клиентов</p>
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a> <a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="margin-top: -60px;"> <div class="da-img" style="margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/plane.png" width="420" alt="image02"> <img src="{{ asset('assets') }}/slider/images/plane.png" width="420" alt="image02">
</div> </div>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ <h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4> 1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p> <p>Самые точные расценки и быстрая доставка!</p>
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a> <a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="margin-top: -60px;"> <div class="da-img" style="margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/usa_map.png" width="320" alt="image03"> <img src="{{ asset('assets') }}/slider/images/usa_map.png" width="320" alt="image03">
</div> </div>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ <h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4> 1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p> <p>Самые точные расценки и быстрая доставка!</p>
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a> <a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;"> <div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/00003.jpg" width="350" alt="image03" height="250"> <img src="{{ asset('assets') }}/slider/images/00003.jpg" width="350" alt="image03" height="250">
</div> </div>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ <h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4> 1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p> <p>Самые точные расценки и быстрая доставка!</p>
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a> <a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;"> <div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/thumb.png" width="320" alt="image03"> <img src="{{ asset('assets') }}/slider/images/thumb.png" width="320" alt="image03">
</div> </div>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ <h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4> 1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p> <p>Самые точные расценки и быстрая доставка!</p>
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a> <a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;"> <div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/0001.jpg" width="350" height="250" alt="image03"> <img src="{{ asset('assets') }}/slider/images/0001.jpg" width="350" height="250" alt="image03">
</div> </div>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ <h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4> 1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p> <p>Самые точные расценки и быстрая доставка!</p>
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a> <a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;"> <div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/0004.jpg" width="350" height="250" alt="image03"> <img src="{{ asset('assets') }}/slider/images/0004.jpg" width="350" height="250" alt="image03">
</div> </div>
...@@ -687,7 +687,7 @@ ...@@ -687,7 +687,7 @@
</div>--}} </div>--}}
<div class=" text-center"> <div class=" text-center">
<img src="frontend/images/bg_02.jpg" alt="" style="width: 100%; position: relative "> <img src="frontend/images/city_bg4.jpg" alt="" style="width: 100%; position: relative ">
</div> </div>
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
<div class="col-xs-12 col-sm-6 col-lg-3"> <div class="col-xs-12 col-sm-6 col-lg-3">
<address> <address>
<div class="media"> <div class="media">
<div class="media-left"><span class="icon icon-primary icon-sm fa-phone"></span></div> <div class="media-left"></div>
<div class="media-body"> <div class="media-body">
<p class="h6" style="color: #0B3C5D">Телефоны</p> <p class="h6" style="color: #0B3C5D">Телефоны</p>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
<div class="col-xs-12 col-sm-6 col-lg-3"> <div class="col-xs-12 col-sm-6 col-lg-3">
<address> <address>
<div class="media"> <div class="media">
<div class="media-left"><span class="icon icon-primary icon-sm fa-envelope"></span> <div class="media-left">
</div> </div>
<div class="media-body"> <div class="media-body">
<p class="h6" style="color: #0B3C5D">Email</p><a href="mailto:info@fazoshop.us">info@fazoshop.us</a> <p class="h6" style="color: #0B3C5D">Email</p><a href="mailto:info@fazoshop.us">info@fazoshop.us</a>
......
resources/views/pages/tarifs/index.blade.php
View file @ 84aa5e63
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</td> </td>
<td> <td>
<ul style="text-align: center; margin-bottom: 0px;"> <ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>1 кг = $8</b></h6> <h6 style=""><b>1 кг = $8,5</b></h6>
<h6 style="margin-bottom: 0px;"><b>минимальный вес – 5 кг</b></h6> <h6 style="margin-bottom: 0px;"><b>минимальный вес – 5 кг</b></h6>
{{--<li>После 5кг стоимость за 0.1кг = $0.85 <small>(1кг = $8.5)</small></li> {{--<li>После 5кг стоимость за 0.1кг = $0.85 <small>(1кг = $8.5)</small></li>
......
resources/views/questions.blade.php
View file @ 84aa5e63
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment