Commit 2ff82659 authored by Shahzod's avatar Shahzod

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	resources/views/main.blade.php
parents e692b855 ce6ae726
......@@ -3,99 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/main.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_files.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_files.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_namespaces.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_namespaces.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/installed.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/doctrine/lexer/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/doctrine/lexer/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/readme.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Carbon.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Carbon.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/af.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/af.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ar.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ar.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/az.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/az.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/bg.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/bg.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/bn.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/bn.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ca.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ca.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/cs.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/cs.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/cy.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/cy.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/da.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/da.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/de.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/de.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/el.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/el.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/en.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/en.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/eo.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/eo.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/es.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/es.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/et.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/et.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/eu.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/eu.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fa.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fa.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fi.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fi.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fo.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fo.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fr.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/fr.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/gl.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/gl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/gu.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/gu.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/he.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/he.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hi.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hi.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hr.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hr.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hu.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hu.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hy.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/hy.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/id.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/id.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/is.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/is.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/it.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/it.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ja.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ja.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ka.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ka.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/kk.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/kk.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/km.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/km.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ko.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ko.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/lt.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/lt.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/lv.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/lv.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/mk.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/mk.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/mn.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/mn.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ms.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ms.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/my.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/my.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ne.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ne.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/nl.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/nl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/no.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/no.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/oc.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/oc.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/pl.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/pl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ps.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ps.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/pt.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/pt.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ro.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ro.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ru.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ru.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sh.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sh.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sk.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sk.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sl.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sq.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sq.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sv.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sv.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sw.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/sw.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/th.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/th.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/tr.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/tr.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/uk.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/uk.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ur.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/ur.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/uz.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/uz.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/vi.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/vi.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/zh.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/zh.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Translator.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/nesbot/carbon/src/Carbon/Translator.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/terms.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/terms.blade.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -123,164 +31,9 @@
<expand />
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-233">
<caret line="59" column="13" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="229" column="68" selection-start-line="229" selection-start-column="68" selection-end-line="229" selection-end-column="68" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#h2#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/css/ship/main.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2329" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="55" column="46" selection-start-line="55" selection-start-column="46" selection-end-line="55" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-136">
<caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="39" column="54" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="26" column="108" selection-start-line="26" selection-start-column="108" selection-end-line="26" selection-end-column="108" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="117" column="77" selection-start-line="117" selection-start-column="77" selection-end-line="117" selection-end-column="77" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>Hello, A</find>
<find>activi</find>
<find>ip</find>
<find>addressUpdate</find>
<find>ОТЗЫВЫ</find>
<find>СВЯЖИТЕСЬ С НАМИ</find>
<find>fontawesome-webfont.eot</find>
<find>.eot</find>
<find>.ttf</find>
<find>.woff</find>
<find>/feedback/add</find>
<find>fa-pinterest-p</find>
<find>save</find>
<find>Адреса</find>
<find>profile</find>
<find>ProfileController@profile</find>
<find>addr</find>
<find>register</find>
<find>exists</find>
<find>sign</find>
<find>Декларация</find>
<find>address</find>
<find>device</find>
<find>pending_packages</find>
<find>packages</find>
<find>/packages</find>
<find>parce</find>
<find>onpa</find>
<find>countPackages</find>
<find>sen</find>
</findStrings>
<replaceStrings>
<replace />
</replaceStrings>
<dirStrings>
<dir>D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\resources\views</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/laravel/framework" />
......@@ -383,63 +136,15 @@
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-7" />
<option name="y" value="2" />
<option name="width" value="1378" />
<option name="height" value="733" />
</component>
<component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/public/assets/slider/images" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
......@@ -452,14 +157,15 @@
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\OSPanel\domains\fazo\public\assets\slider\images" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
......@@ -515,7 +221,7 @@
<workItem from="1569048123758" duration="278000" />
<workItem from="1570474579928" duration="2098000" />
<workItem from="1570507468153" duration="6606000" />
<workItem from="1570540679279" duration="238000" />
<workItem from="1570540679279" duration="4734000" />
</task>
<task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)">
<created>1570475345391</created>
......@@ -524,62 +230,79 @@
<option name="project" value="LOCAL" />
<updated>1570475345392</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="fix bugs">
<created>1570541005139</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1570541005140</updated>
</task>
<task id="LOCAL-00003" summary="fix bugs">
<created>1570562824670</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1570562824670</updated>
</task>
<task id="LOCAL-00004" summary="fix bugs">
<created>1570563008848</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1570563008848</updated>
</task>
<task id="LOCAL-00005" summary="fix bugs">
<created>1570563868670</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1570563868670</updated>
</task>
<task id="LOCAL-00006" summary="fix bugs">
<created>1570564074517</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1570564074517</updated>
</task>
<task id="LOCAL-00007" summary="fix bugs">
<created>1570564194079</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1570564194079</updated>
</task>
<task id="LOCAL-00008" summary="fix bugs">
<created>1570564277879</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1570564277879</updated>
</task>
<task id="LOCAL-00009" summary="fix bugs">
<created>1570564437087</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1570564437087</updated>
</task>
<task id="LOCAL-00010" summary="fix bugs">
<created>1570564534445</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1570564534445</updated>
</task>
<task id="LOCAL-00011" summary="fix bugs">
<created>1570567783874</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1570567783874</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6483000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16717096" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.2831424" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.27659574" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" weight="0.32980332" />
</layout>
<layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21860817" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.2831424" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.27659574" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" weight="0.32980332" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
......@@ -589,12 +312,6 @@
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" />
</State>
</value>
......@@ -617,6 +334,8 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="first commit (10/07/2019//11/;58)" />
<MESSAGE value="fix bugs" />
<option name="LAST_COMMIT_MESSAGE" value="fix bugs" />
......@@ -626,91 +345,10 @@
<breakpoints>
<line-breakpoint enabled="true" type="php">
<url>file://$PROJECT_DIR$/resources/views/pages/terms.blade.php</url>
<line>476</line>
<line>537</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="55" column="46" selection-start-line="55" selection-start-column="46" selection-end-line="55" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2329" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/pluton.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/css/ship/main.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#282724#356207#2" expanded="true" />
<element signature="e#441205#442574#2" expanded="true" />
<element signature="e#442729#444094#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#282726#356209#2" expanded="true" />
<element signature="e#441207#442576#2" expanded="true" />
<element signature="e#442731#444096#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-233">
<caret line="59" column="13" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="229" column="68" selection-start-line="229" selection-start-column="68" selection-end-line="229" selection-end-column="68" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#h2#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
<!DOCTYPE html>
<html class="wide wow-animation" lang="en">
<head>
<head>
<!-- Site Title-->
<title>Fazoshop | Доставка любого вида груза из США во все регионы Узбекистана.</title>
<meta name="format-detection" content="telephone=no">
......@@ -21,7 +21,7 @@
href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);">
<link rel="stylesheet" href="/frontend/css/style.css">
</head>
</head>
<body>
<!-- Page-->
<div class="page text-center">
......@@ -29,10 +29,19 @@
<header class="page-head">
<!-- RD Navbar-->
<div class="rd-navbar-wrap header-minimal">
<nav class="rd-navbar" data-layout="rd-navbar-fixed" data-sm-layout="rd-navbar-fullwidth" data-md-layout="rd-navbar-static" data-lg-layout="rd-navbar-static" data-device-layout="rd-navbar-fixed" data-sm-device-layout="rd-navbar-fixed" data-md-device-layout="rd-navbar-fixed" data-lg-device-layout="rd-navbar-static" data-lg-stick-up-offset="117px" data-sm-stick-up="true" data-md-stick-up="true" data-lg-stick-up="true">
<nav class="rd-navbar" data-layout="rd-navbar-fixed" data-sm-layout="rd-navbar-fullwidth"
data-md-layout="rd-navbar-static" data-lg-layout="rd-navbar-static"
data-device-layout="rd-navbar-fixed" data-sm-device-layout="rd-navbar-fixed"
data-md-device-layout="rd-navbar-fixed" data-lg-device-layout="rd-navbar-static"
data-lg-stick-up-offset="117px" data-sm-stick-up="true" data-md-stick-up="true"
data-lg-stick-up="true">
<div class="rd-navbar-top-panel bg-dark">
<div class="rd-navbar-inner">
<button class="rd-navbar-collapse-toggle" data-rd-navbar-toggle=".list-inline" type="submit"><span></span></button><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#4b68"><span class="__cf_email__" data-cfemail="533a3d353c1337363e3c3f3a3d387d3c2134">[email&#160;protected]</span></a><a class="fa-mobile-phone preffix-2" href="callto:#">1-800-1234-567</a>
<button class="rd-navbar-collapse-toggle" data-rd-navbar-toggle=".list-inline" type="submit">
<span></span></button>
<a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#4b68"><span
class="__cf_email__" data-cfemail="533a3d353c1337363e3c3f3a3d387d3c2134">[email&#160;protected]</span></a><a
class="fa-mobile-phone preffix-2" href="callto:#">1-800-1234-567</a>
<ul class="list-inline pull-right">
<li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="#"></a></li>
......@@ -40,7 +49,10 @@
<li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google-plus" href="#"></a></li>
<li><a class="fa-rss" href="#"></a></li>
<li class="text-left"><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#d1f2"><span class="__cf_email__" data-cfemail="20494e464f6044454d4f4c494e4b0e4f5247">[email&#160;protected]</span></a></li>
<li class="text-left"><a class="fa-envelope-o"
href="../cdn-cgi/l/email-protection.html#d1f2"><span
class="__cf_email__" data-cfemail="20494e464f6044454d4f4c494e4b0e4f5247">[email&#160;protected]</span></a>
</li>
<li class="text-left"><a class="fa-mobile-phone" href="callto:#">1-800-1234-567</a></li>
</ul>
</div>
......@@ -49,7 +61,8 @@
<!-- RD Navbar Panel-->
<div class="rd-navbar-panel">
<!-- RD Navbar Toggle-->
<button class="rd-navbar-toggle" data-rd-navbar-toggle=".rd-navbar-nav-wrap" type="submit"><span></span></button>
<button class="rd-navbar-toggle" data-rd-navbar-toggle=".rd-navbar-nav-wrap" type="submit">
<span></span></button>
<!-- RD Navbar Brand-->
<div class="rd-navbar-brand"><a class="brand-name" href="/"><img src="/assets/img/icon/logo.png"
class="logo_main" alt="">
......@@ -60,26 +73,30 @@
<div class="rd-navbar-nav-wrap">
<!-- RD Navbar Search-->
<div class="rd-navbar-search">
<form class="rd-navbar-search-form" action="https://livedemo00.template-help.com/wt_58899_v2/search.php" method="GET">
<form class="rd-navbar-search-form"
action="https://livedemo00.template-help.com/wt_58899_v2/search.php" method="GET">
<label class="rd-navbar-search-form-input">
<input type="text" name="s" placeholder="Search.." autocomplete="off">
</label>
<button class="rd-navbar-search-form-submit fa-shopping-cart" type="submit"></button>
</form><span class="rd-navbar-live-search-results"></span>
<button class="rd-navbar-search-toggle" data-rd-navbar-toggle=".rd-navbar-search, .rd-navbar-live-search-results" type="submit"></button>
</div><a class="fa-shopping-cart" href="shop-cart.html"><span>10</span></a>
</form>
<span class="rd-navbar-live-search-results"></span>
<button class="rd-navbar-search-toggle"
data-rd-navbar-toggle=".rd-navbar-search, .rd-navbar-live-search-results"
type="submit"></button>
</div>
<a class="fa-shopping-cart" href="#"><span>10</span></a>
<!-- RD Navbar Nav-->
<ul class="rd-navbar-nav">
<li><a href="index.html">На главную</a></li>
<li><a href="{{ route('package') }}">Посылки</a>
</li>
<li class="active"><a href="{{ route('address') }}">Адреса</a>
</li>
<li><a href="/profile">Профиль</a>
</li>
<li class="active"><a href="/" class="nav_link" style="color: #0B3C5D">Главная</a></li>
<li><a href="/about" class="nav_link">О нас</a></li>
<li><a href="{{route('tariffs')}}" class="nav_link">Тарифы </a></li>
<li><a href="/contacts" class="nav_link">Контакты</a></li>
{{--<li><a href="/#">Магазины</a></li>--}}
{{--<li><a href="/#">Тарифы</a></li>--}}
<li style="border: 1px solid #004085;" id="cabinet"><a href="/login" class=""
style="color: #328CC1">Персональный
Кабинет</a></li>
</ul>
</div>
......@@ -99,25 +116,27 @@
<div class="container">
<div class="rd-navbar-brand pull-lg-left">
<a class="brand-name" href="#">
<img src="/assets/img/icon/logo.png" class="logo_main" alt="Fazoshop" style="margin-right: 10px"><span>Fazoshop</span>
<img src="/assets/img/icon/logo.png" class="logo_main" alt="Fazoshop"
style="margin-right: 10px"><span>Fazoshop</span>
</a>
</div>
<ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right">
<li><a href="/">На главную</a></li>
<li><a href="{{ route('package') }}">Посылки</a>
</li>
<li>
<a href="{{ route('address') }}">Адреса</a>
</li>
<li>
<a href="/profile">Профиль</a>
</li>
<li class="active"><a href="/" class="nav_link" style="color: #0B3C5D">Главная</a></li>
<li><a href="/about" class="nav_link">О нас</a></li>
<li><a href="{{route('tariffs')}}" class="nav_link">Тарифы </a></li>
<li><a href="/contacts" class="nav_link">Контакты</a></li>
{{--<li><a href="/#">Магазины</a></li>--}}
{{--<li><a href="/#">Тарифы</a></li>--}}
{{-- <li style="border: 1px solid #004085;" id="cabinet"><a href="/login" class=""--}}
{{-- style="color: #328CC1">Персональный--}}
{{-- Кабинет</a></li>--}}
</ul>
</div>
</section>
<section class="copyright well5" style="background-color: #0B3C5D;">
<div class="container">
<p class="pull-sm-left">&#169; <span id="copyright-year"></span> All Rights Reserved <a href="terms.html">Terms of Use and Privacy Policy</a></p>
<p class="pull-sm-left">&#169; <span id="copyright-year"></span> All Rights Reserved <a
href="/terms">Terms of Use and Privacy Policy</a></p>
<ul class="list-inline pull-sm-right offset-3">
<li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="#"></a></li>
......
......@@ -58,7 +58,7 @@
<strong>Fazoshop</strong>
</a>
<nav class="my-2 my-md-0 mr-md-3 top-menu">
<a class="p-2 text-dark" href="#">На главную</a>
<a class="p-2 text-dark" href="/main">На главную</a>
<a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a>
<a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a>
<a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a>
......@@ -95,8 +95,8 @@
<div class="container">
<div class="row">
<div class="col-12 col-md">
<img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
<small class="d-block mb-3 text-muted">&copy; 2017-2019</small>
<img class="mb-2" src="{{ url('/assets/img/icon/logo.png') }}" alt="" width="24" height="24">
<small class="d-block mb-3 text-muted">&copy; 2019</small>
</div>
<div class="col-6 col-md">
<h5>Клиентам</h5>
......
......@@ -147,94 +147,91 @@
<div id="home">
<!-- Start cSlider -->
<div id="da-slider" class="da-slider" style="background-image: url('{{asset('assets')}}/slider/images/bg_01.jpg')">
<div id="da-slider" class="da-slider" style="background-image: url('{{asset('assets')}}/slider/images/icons.png')">
<div class="triangle" ></div>
<!-- mask elemet use for masking background image -->
{{--<div class="mask" style="background-color: #328CC1;"></div>--}}
{{--<div class="mask" style="background-color: #5DC3EC;"></div>--}}
<div class="mask" style="background-color: #2ABEF9;"></div>
<div class="mask" style="background-color: #328CC1;"></div>
<!-- All slides centred in container element -->
<div class="container" >
<!-- Start first slide -->
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 class="fittext2" style="color: #ffffff">ВОСПОЛЬЗУЙТЕСЬ
ВИДЕО <br> УРОКОМ И ПРОСТО<br>
НАСЛАЖДАЙТЕСЬ ПОКУПКАМИ</h2>
{{-- <p style="color: #ffffff">НАСЛАЖДАЙТЕСЬ ПОКУПКАМИ</p>--}}
ВИДЕО <br> УРОКОМ И ПРОСТО</h2>
<p style="color: #ffffff">НАСЛАЖДАЙТЕСЬ ПОКУПКАМИ</p>
<a href="#" 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">
<img src="{{ asset('assets') }}/slider/images/tv5.png" alt="image01" width="320">
</div>
</div>
<!-- End first slide -->
<!-- Start second slide -->
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 style="color: #ffffff">МЫ ДОСТАВЛЯЕМ
ТОВАРЫ ИЗ США</h2>
<h4 style="color: #ffffff">ЗА 5-7 РАБОЧИХ ДНЕЙ</h4>
<p>Сомневаетесь? – Ознакомьтесь
с оценками наших клиентов</p>
<a href="#" 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">
<img src="{{ asset('assets') }}/slider/images/plane.png" width="420" alt="image02">
</div>
</div>
<!-- End second slide -->
<!-- Start third slide -->
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 style="color: #ffffff">
Доставка товаров из США</h2>
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="#" 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">
<img src="{{ asset('assets') }}/slider/images/usa_map.png" width="320" alt="image03">
</div>
</div>
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 style="color: #ffffff">
Доставка товаров из США</h2>
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="#" 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;">
<img src="{{ asset('assets') }}/slider/images/00003.jpg" width="350" alt="image03" height="250">
</div>
</div>
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 style="color: #ffffff">
Доставка товаров из США</h2>
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="#" 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;">
<img src="{{ asset('assets') }}/slider/images/thumb.png" width="320" alt="image03">
</div>
</div>
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 style="color: #ffffff">
Доставка товаров из США</h2>
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="#" 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;">
<img src="{{ asset('assets') }}/slider/images/0001.jpg" width="350" height="250" alt="image03">
</div>
</div>
<div class="da-slide" style="margin-top: 60px;">
<div class="da-slide">
<h2 style="color: #ffffff">
Доставка товаров из США</h2>
<h4 style="color: #ffffff">ВСЕГО $8 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="#" 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;">
<img src="{{ asset('assets') }}/slider/images/0004.jpg" width="350" height="250" alt="image03">
</div>
</div>
......@@ -566,23 +563,10 @@
data-xs-stage-padding="15">
<div class="owl-item"><a href="#"><img src="frontend/images/1.jpg" alt=""></a><a href="#"><img
src="frontend/images/2.png" alt=""></a></div>
<div class="owl-item"><a href="#">
<img src="frontend/images/3.png" alt=""></a>
<a href="#">
<img src="frontend/images/4.jpg" alt="">
</a>
</div>
<div class="owl-item">
<a href="#">
<img src="frontend/images/5.png" alt=""></a>
<a href="#">
<img src="frontend/images/6.png" alt="">
</a>
<a href="#">
<img src="frontend/images/7.jpg" alt="">
</a>
</div>
<div class="owl-item"><a href="#"><img src="frontend/images/3.png" alt=""></a><a href="#"><img
src="frontend/images/4.jpg" alt=""></a></div>
<div class="owl-item"><a href="#"><img src="frontend/images/5.png" alt=""></a><a href="#"><img
src="frontend/images/6.png" alt=""></a></div>
</div>
</div>
</div>
......@@ -732,10 +716,10 @@
</div>
<ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right">
<li><a href="/" style="color: #ffffff;">На главную</a></li>
<li><a href="{{ route('package') }}" style="color: #ffffff;">Посылки</a>
<li><a href="#" style="color: #ffffff;">Посылки</a>
</li>
<li>
<a href="{{ route('address') }}" style="color: #ffffff;">Адреса</a>
<a href="#" style="color: #ffffff;">Адреса</a>
</li>
<li>
<a href="/profile" style="color: #ffffff;">Профиль</a>
......
@extends('layouts.app')
@extends('layouts.user')
@section('page-title', 'Мои посылки')
@section('content')
......
@extends('layouts.app')
@section('page-title', 'Мои посылки')
@extends('layouts.user')
@section('page-title', 'Terms')
@section('content')
<section class="section section-inset-1">
<div class="container">
<h2 class="text-center" style="color: #004085;">PRIVACY NOTICE AND PRIVACY POLICY</h2>
<hr>
<br><br><br>
<div class="">
<h4 style="text-align: center; color: #004085;">Terms of Use and Privacy Policy</h4><br>
<h6>
All services provided by Fazoshop.us are governed under our Terms and Conditions, and are subject to change at any time. These Terms and Conditions apply to a standard routed export transaction, when Member purchase products in the United States from merchants acting as the U.S. Principal Party in Interest, as defined by the United States Foreign Trade Regulations. Part VIII, below, provides additional
terms when Members engage in a direct export transaction as the U.S. Principal Party in Interest.
</h6>
</div>
<h4 class="my-4" style="color: #004085;">PRIVACY NOTICE AND PRIVACY POLICY</h4>
<p style="font-size: 18px; text-align: justify"><span class="text-danger">*</span> This Privacy Policy describes the ways that FazoShop.us collects, uses, protects, transfers, and discloses information that you provide to us, that we collect, or that we receive through our website, located at www.FazoShop.us (the "Website"). This Privacy Policy also describes the measures we take to safeguard the Personal information (defined below) you provide to us. In addition, we tell you how you can ask us to (i) access or change the Personal information we maintain about you, (ii) withdraw consent you previously provided to us, (iii) refrain from sending you certain communications, and (iv) answer questions you may
have about our privacy practices. This Privacy Policy was last updated on October 6, 2019.</p>
......@@ -537,6 +532,9 @@
<h4 class="my-4" style="color: #004085;">X. CONFLICT OF LAWS</h4>
<p style="text-align: justify;">This Agreement and all disputes concerning this Agreement shall be governed by the applicable law and the applicable regulations of the United States and by the applicable regulations of any agency of the United States, without applying conflict of law principles that would result in applying any state law or state regulation other than those of New York State. The parties, in all disputes between them, consent and submit to the exclusive jurisdiction and the exclusive venue of the United States courts and the parties waive all claims that such jurisdiction and venue is improper or inconvenient. In all lawsuits to enforce or interpret this Agreement, the parties waive all rights to a jury trial, and in such actions the prevailing party shall recover from the other party the prevailing party's costs and expenses, including the prevailing party's attorneys, experts and consultants. Notwithstanding the foregoing jurisdiction, and venue restrictions, the party in whose favor a judgment with respect to this agreement is entered shall be entitled to enforce that judgment in any jurisdiction in any venue.</p>
</div>
</section>
......
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