Skip to content

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

10/10/2019//1:20

parent 2ff82659
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 25 deletions
.idea/workspace.xml
View file @ d21e0833
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" /> <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$/resources/views/pages/tarifs/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -31,9 +32,118 @@ ...@@ -31,9 +32,118 @@
<expand /> <expand />
<select /> <select />
</component> </component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="300">
<caret line="234" column="91" selection-start-line="234" selection-start-column="91" selection-end-line="234" selection-end-column="91" />
<folding>
<element signature="n#style#0;n#a#0;n#li#4;n#ul#0;n#div#1;n#div#1;n#nav#0;n#div#0;n#header#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#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#a#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#a#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$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="176" column="91" selection-start-line="176" selection-start-column="91" selection-end-line="176" selection-end-column="91" />
</state>
</provider>
</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" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.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/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="935">
<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="969">
<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="663">
<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="2295">
<caret line="135" column="76" selection-start-line="135" selection-start-column="76" selection-end-line="135" selection-end-column="76" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration"> <component name="PhpWorkspaceProjectConfiguration">
<include_path> <include_path>
<path value="$PROJECT_DIR$/vendor/laravel/framework" /> <path value="$PROJECT_DIR$/vendor/laravel/framework" />
...@@ -136,10 +246,73 @@ ...@@ -136,10 +246,73 @@
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" /> <path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1382" />
<option name="height" value="744" />
</component>
<component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" /> <component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
</component> </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="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" 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="pages" type="462c0819:PsiDirectoryNode" />
<item name="tarifs" 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"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" /> <property name="WebServerToolWindowFactoryState" value="true" />
...@@ -222,6 +395,7 @@ ...@@ -222,6 +395,7 @@
<workItem from="1570474579928" duration="2098000" /> <workItem from="1570474579928" duration="2098000" />
<workItem from="1570507468153" duration="6606000" /> <workItem from="1570507468153" duration="6606000" />
<workItem from="1570540679279" duration="4734000" /> <workItem from="1570540679279" duration="4734000" />
<workItem from="1570641178982" duration="4101000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)"> <task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)">
<created>1570475345391</created> <created>1570475345391</created>
...@@ -303,6 +477,59 @@ ...@@ -303,6 +477,59 @@
<option name="localTasksCounter" value="12" /> <option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6134000" />
</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.13388805" />
<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"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
...@@ -312,6 +539,12 @@ ...@@ -312,6 +539,12 @@
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" /> <option name="COLUMN_ORDER" />
</State> </State>
</value> </value>
...@@ -351,4 +584,93 @@ ...@@ -351,4 +584,93 @@
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager">
<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$/public/css/ship/main.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/style.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<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="935">
<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$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="39" column="54" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
</state>
</provider>
</entry>
<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>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="135" column="76" selection-start-line="135" selection-start-column="76" selection-end-line="135" selection-end-column="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="176" column="91" selection-start-line="176" selection-start-column="91" selection-end-line="176" selection-end-column="91" />
</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="300">
<caret line="234" column="91" selection-start-line="234" selection-start-column="91" selection-end-line="234" selection-end-column="91" />
<folding>
<element signature="n#style#0;n#a#0;n#li#4;n#ul#0;n#div#1;n#div#1;n#nav#0;n#div#0;n#header#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#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#a#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#a#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> </project>
\ No newline at end of file
resources/views/main.blade.php
View file @ d21e0833
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
border: none; border: none;
color: #ffffff; color: #ffffff;
} }
#cabinet a:hover{ #cabinet:hover a{
color: #ffffff; color: #ffffff;
} }
.nav_link{ .nav_link{
...@@ -154,84 +154,85 @@ ...@@ -154,84 +154,85 @@
<!-- All slides centred in container element --> <!-- All slides centred in container element -->
<div class="container" > <div class="container" >
<!-- Start first slide --> <!-- Start first slide -->
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 class="fittext2" style="color: #ffffff">ВОСПОЛЬЗУЙТЕСЬ <h2 class="fittext2" style="color: #ffffff">ВОСПОЛЬЗУЙТЕСЬ
ВИДЕО <br> УРОКОМ И ПРОСТО</h2> ВИДЕО <br> УРОКОМ И ПРОСТО <br>
<p style="color: #ffffff">НАСЛАЖДАЙТЕСЬ ПОКУПКАМИ</p> НАСЛАЖДАЙТЕСЬ ПОКУПКАМИ</h2>
{{-- <p style="color: #ffffff">НАСЛАЖДАЙТЕСЬ ПОКУПКАМИ</p>--}}
<a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">ПОДРОБНЕЕ</a> <a href="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">ПОДРОБНЕЕ</a>
<div class="da-img"> <div class="da-img" style="margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/tv5.png" alt="image01" width="320"> <img src="{{ asset('assets') }}/slider/images/tv5.png" alt="image01" width="320">
</div> </div>
</div> </div>
<!-- End first slide --> <!-- End first slide -->
<!-- Start second slide --> <!-- Start second slide -->
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 style="color: #ffffff">МЫ ДОСТАВЛЯЕМ <h2 style="color: #ffffff">МЫ ДОСТАВЛЯЕМ
ТОВАРЫ ИЗ США</h2> ТОВАРЫ ИЗ США</h2>
<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="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img"> <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>
</div> </div>
<!-- End second slide --> <!-- End second slide -->
<!-- Start third slide --> <!-- Start third slide -->
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 style="color: #ffffff"> <h2 style="color: #ffffff">
Доставка товаров из США</h2> Доставка товаров из США</h2>
<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="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img"> <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>
</div> </div>
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 style="color: #ffffff"> <h2 style="color: #ffffff">
Доставка товаров из США</h2> Доставка товаров из США</h2>
<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="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 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>
</div> </div>
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 style="color: #ffffff"> <h2 style="color: #ffffff">
Доставка товаров из США</h2> Доставка товаров из США</h2>
<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="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 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>
</div> </div>
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 style="color: #ffffff"> <h2 style="color: #ffffff">
Доставка товаров из США</h2> Доставка товаров из США</h2>
<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="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 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>
</div> </div>
<div class="da-slide"> <div class="da-slide" style="margin-top: 60px;">
<h2 style="color: #ffffff"> <h2 style="color: #ffffff">
Доставка товаров из США</h2> Доставка товаров из США</h2>
<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="#" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 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>
</div> </div>
...@@ -289,7 +290,7 @@ ...@@ -289,7 +290,7 @@
<div class="caption"> <div class="caption">
<h4 style="color: #0B3C5D">Покупаете</h4> <h4 style="color: #0B3C5D">Покупаете</h4>
<p>Покупаете в <p>Покупаете в
интернет-магазинах сша интернет-магазинах США
самостоятельно</p> самостоятельно</p>
</div> </div>
</div> </div>
...@@ -563,10 +564,20 @@ ...@@ -563,10 +564,20 @@
data-xs-stage-padding="15"> data-xs-stage-padding="15">
<div class="owl-item"><a href="#"><img src="frontend/images/1.jpg" alt=""></a><a href="#"><img <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> 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 <div class="owl-item">
src="frontend/images/4.jpg" alt=""></a></div> <a href="#"><img src="frontend/images/3.png" alt=""></a>
<div class="owl-item"><a href="#"><img src="frontend/images/5.png" alt=""></a><a href="#"><img <a href="#"><img src="frontend/images/apple.png" alt=""></a>
src="frontend/images/6.png" alt=""></a></div> <a href="#"><img src="frontend/images/sephora.png" alt=""></a>
<a href="#"><img src="frontend/images/4.jpg" alt=""></a>
<a href="#"><img src="frontend/images/bestbuy.png" 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/ulta2.jpg" alt=""></a>
<a href="#"><img src="frontend/images/7.jpg" alt=""></a>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -636,7 +647,7 @@ ...@@ -636,7 +647,7 @@
</div>--}} </div>--}}
<div class=" text-center"> <div class=" text-center">
<img src="frontend/images/city_bg4.png" alt="" style="width: 100%; position: relative "> <img src="frontend/images/bg_02.jpg" alt="" style="width: 100%; position: relative ">
</div> </div>
......
resources/views/pages/tarifs/index.blade.php
View file @ d21e0833
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</td> </td>
<td> <td>
<ul style="text-align: center; margin-bottom: 0px;"> <ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Наши сотрудники готовы оказать услугу по сверке товаров на </span></b></h6> <h6 style=""><b>Наши сотрудники готовы оказать услугу по сверке товаров на </b></h6>
<h6 style="margin-bottom: 0px;"><b>соответствие с Вашим инвойсом за -<span style="color: red"> $10,00 за одну посылку. </span></b></h6> <h6 style="margin-bottom: 0px;"><b>соответствие с Вашим инвойсом за -<span style="color: red"> $10,00 за одну посылку. </span></b></h6>
</ul> </ul>
</td> </td>
......
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