Skip to content

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

Conculator

parent 0b68d616
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 178 deletions
.idea/workspace.xml
View file @ d1e089c7
...@@ -2,17 +2,11 @@ ...@@ -2,17 +2,11 @@
<project version="4"> <project version="4">
<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/fazoshop.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/fazoshop.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<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$/app/Http/Controllers/Auth/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/login.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/login.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/main.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/layouts/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/main.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.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/questions.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/questions.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" />
...@@ -48,99 +42,44 @@ ...@@ -48,99 +42,44 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="850">
<caret line="59" column="20" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="20" /> <caret line="59" column="20" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="38" column="67" selection-start-line="38" selection-start-column="67" selection-end-line="38" selection-end-column="67" />
<folding>
<element signature="e#2321#2360#0#HTML" expanded="true" />
<element signature="e#2447#2540#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="83" column="39" selection-start-line="83" selection-start-column="39" selection-end-line="83" selection-end-column="39" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/RegisterController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="10" column="6" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266"> <state relative-caret-position="2941">
<caret line="154" selection-start-line="154" selection-end-line="154" /> <caret line="173" column="91" selection-start-line="173" selection-start-column="91" selection-end-line="173" selection-end-column="91" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="466" column="87" selection-start-line="466" selection-start-column="87" selection-end-line="466" selection-end-column="87" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/app.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441"> <state relative-caret-position="544">
<caret line="231" column="57" selection-start-line="231" selection-start-column="57" selection-end-line="231" selection-end-column="57" /> <caret line="32" column="119" selection-start-line="32" selection-start-column="119" selection-end-line="32" selection-end-column="119" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/captcha.php"> <entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="229">
<caret line="25" column="26" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="26" /> <caret line="350" column="49" selection-start-line="350" selection-start-column="49" selection-end-line="350" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php"> <entry file="file://$PROJECT_DIR$/resources/views/questions.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76"> <state relative-caret-position="1547">
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" /> <caret line="91" column="138" selection-start-line="91" selection-start-column="138" selection-end-line="91" selection-end-column="150" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -156,15 +95,15 @@ ...@@ -156,15 +95,15 @@
<list> <list>
<option value="$PROJECT_DIR$/resources/views/pages/terms.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/terms.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/questions.blade.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
<option value="$PROJECT_DIR$/config/app.php" /> <option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/routes/web.php" /> <option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/config/captcha.php" /> <option value="$PROJECT_DIR$/config/captcha.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/main.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php" />
<option value="$PROJECT_DIR$/resources/views/auth/login.blade.php" /> <option value="$PROJECT_DIR$/resources/views/auth/login.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/main.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/questions.blade.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -286,7 +225,6 @@ ...@@ -286,7 +225,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -314,25 +252,32 @@ ...@@ -314,25 +252,32 @@
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" /> <item name="public" 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>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
<item name="auth" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
...@@ -343,6 +288,7 @@ ...@@ -343,6 +288,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -447,6 +393,12 @@ ...@@ -447,6 +393,12 @@
<workItem from="1571472629558" duration="811000" /> <workItem from="1571472629558" duration="811000" />
<workItem from="1571503292519" duration="3539000" /> <workItem from="1571503292519" duration="3539000" />
<workItem from="1571663060071" duration="7663000" /> <workItem from="1571663060071" duration="7663000" />
<workItem from="1571746463353" duration="1468000" />
<workItem from="1571841886697" duration="6168000" />
<workItem from="1571886699361" duration="302000" />
<workItem from="1571903228232" duration="4414000" />
<workItem from="1571936375762" duration="3292000" />
<workItem from="1571993466951" duration="490000" />
</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>
...@@ -588,19 +540,26 @@ ...@@ -588,19 +540,26 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1571664113631</updated> <updated>1571664113631</updated>
</task> </task>
<option name="localTasksCounter" value="21" /> <task id="LOCAL-00021" summary="Captcha">
<created>1571746707740</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1571746707741</updated>
</task>
<option name="localTasksCounter" value="22" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="42298000" /> <option name="totallyTimeSpent" value="58432000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="2" width="1378" height="733" extended-state="0" /> <frame x="-7" y="2" width="1378" height="733" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21168438" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49833333" visible="true" weight="0.1411229" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" sideWeight="0.50166667" side_tool="true" weight="0.21471927" />
<window_info id="npm" order="3" 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="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
...@@ -618,12 +577,12 @@ ...@@ -618,12 +577,12 @@
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.32852808" /> <window_info anchor="right" id="Remote Host" order="3" weight="0.32852808" />
<window_info anchor="right" id="Database" order="4" weight="0.32980332" /> <window_info anchor="right" id="Database" order="4" weight="0.32852808" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21860817" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49833333" visible="true" weight="0.12746586" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" sideWeight="0.50166667" side_tool="true" weight="0.21471927" />
<window_info id="npm" order="3" 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="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
...@@ -640,8 +599,8 @@ ...@@ -640,8 +599,8 @@
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <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" 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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" /> <window_info anchor="right" id="Remote Host" order="3" weight="0.32852808" />
<window_info anchor="right" id="Database" order="4" weight="0.32980332" /> <window_info anchor="right" id="Database" order="4" weight="0.32852808" />
</layout-to-restore> </layout-to-restore>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -690,7 +649,8 @@ ...@@ -690,7 +649,8 @@
<MESSAGE value="women" /> <MESSAGE value="women" />
<MESSAGE value="Fucking project" /> <MESSAGE value="Fucking project" />
<MESSAGE value="Fucking project утв" /> <MESSAGE value="Fucking project утв" />
<option name="LAST_COMMIT_MESSAGE" value="Fucking project утв" /> <MESSAGE value="Captcha" />
<option name="LAST_COMMIT_MESSAGE" value="Captcha" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -760,28 +720,27 @@ ...@@ -760,28 +720,27 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/questions.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="-663">
<caret line="41" column="309" selection-start-line="41" selection-start-column="309" selection-end-line="41" selection-end-column="309" /> <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding>
<element signature="e#2199#2239#0#HTML" expanded="true" />
<element signature="e#2744#2771#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247"> <state relative-caret-position="-179">
<caret line="466" column="87" selection-start-line="466" selection-start-column="87" selection-end-line="466" selection-end-column="87" /> <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/app.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441"> <state relative-caret-position="663">
<caret line="231" column="57" selection-start-line="231" selection-start-column="57" selection-end-line="231" selection-end-column="57" /> <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -792,76 +751,69 @@ ...@@ -792,76 +751,69 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-663"> <state relative-caret-position="3927">
<caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> <caret line="231" column="57" selection-start-line="231" selection-start-column="57" selection-end-line="231" selection-end-column="57" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> <entry file="file://$PROJECT_DIR$/config/captcha.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-179"> <state relative-caret-position="425">
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" /> <caret line="25" column="26" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="102">
<caret line="59" column="20" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="20" /> <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266"> <state relative-caret-position="301">
<caret line="154" selection-start-line="154" selection-end-line="154" /> <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
<folding>
<element signature="e#2468#2569#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/captcha.php"> <entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="850">
<caret line="25" column="26" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="26" /> <caret line="59" column="20" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76"> <state relative-caret-position="2941">
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" /> <caret line="173" column="91" selection-start-line="173" selection-start-column="91" selection-end-line="173" selection-end-column="91" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348"> <state relative-caret-position="544">
<caret line="83" column="39" selection-start-line="83" selection-start-column="39" selection-end-line="83" selection-end-column="39" /> <caret line="32" column="119" selection-start-line="32" selection-start-column="119" selection-end-line="32" selection-end-column="119" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php"> <entry file="file://$PROJECT_DIR$/resources/views/questions.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="1547">
<caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" /> <caret line="91" column="138" selection-start-line="91" selection-start-column="138" selection-end-line="91" selection-end-column="150" />
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229"> <state relative-caret-position="229">
<caret line="38" column="67" selection-start-line="38" selection-start-column="67" selection-end-line="38" selection-end-column="67" /> <caret line="350" column="49" selection-start-line="350" selection-start-column="49" selection-end-line="350" selection-end-column="49" />
<folding>
<element signature="e#2321#2360#0#HTML" expanded="true" />
<element signature="e#2447#2540#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
resources/views/layouts/main.blade.php
View file @ d1e089c7
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"> <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#2d89ef"> <meta name="msapplication-TileColor" content="#2d89ef">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css">
<!-- Stylesheets--> <!-- Stylesheets-->
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);"> href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);">
...@@ -26,8 +30,11 @@ ...@@ -26,8 +30,11 @@
alt="You are using an outdated browser. For a faster, safer browsing experience, upgrade for free today."></a> alt="You are using an outdated browser. For a faster, safer browsing experience, upgrade for free today."></a>
</div> </div>
<script src="/js/html5shiv.min.js"></script> <script src="/js/html5shiv.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<!-- Page--> <!-- Page-->
<div class="page text-center"> <div class="page text-center">
......
resources/views/layouts/user.blade.php
View file @ d1e089c7
...@@ -20,6 +20,15 @@ ...@@ -20,6 +20,15 @@
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);"> href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);">
<link rel="stylesheet" href="/frontend/css/style.css"> <link rel="stylesheet" href="/frontend/css/style.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"> </script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
</head> </head>
<body> <body>
...@@ -153,8 +162,17 @@ ...@@ -153,8 +162,17 @@
<div class="snackbars" id="form-output-global"></div> <div class="snackbars" id="form-output-global"></div>
<!-- Java script--> <!-- Java script-->
<script>
$("#videolink").magnificPopup({
type: 'inline',
midClick: true
})
</script>
<script src="/frontend/js/core.min.js"></script> <script src="/frontend/js/core.min.js"></script>
<script src="/frontend/js/script.js"></script> <script src="/frontend/js/script.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
@yield('custom_script') @yield('custom_script')
</body> </body>
......
resources/views/main.blade.php
View file @ d1e089c7
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);"> href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);">
<link rel="stylesheet" href="frontend/css/style.css"> <link rel="stylesheet" href="frontend/css/style.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css">
<!--[if lt IE 10]> <!--[if lt IE 10]>
<div style="background: #212121; padding: 10px 0; box-shadow: 3px 3px 5px 0 rgba(0,0,0,.3); clear: both; text-align:center; position: relative; z-index:1;"> <div style="background: #212121; padding: 10px 0; box-shadow: 3px 3px 5px 0 rgba(0,0,0,.3); clear: both; text-align:center; position: relative; z-index:1;">
<a href="http://windows.microsoft.com/en-US/internet-explorer/"><img <a href="http://windows.microsoft.com/en-US/internet-explorer/"><img
...@@ -41,6 +45,9 @@ ...@@ -41,6 +45,9 @@
<link rel="stylesheet" type="text/css" href="{{ asset('assets') }}/slider/css/jquery.bxslider.css" /> <link rel="stylesheet" type="text/css" href="{{ asset('assets') }}/slider/css/jquery.bxslider.css" />
<link rel="stylesheet" type="text/css" href="{{ asset('assets') }}/slider/css/animate.css" /> <link rel="stylesheet" type="text/css" href="{{ asset('assets') }}/slider/css/animate.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
<style type="text/css"> <style type="text/css">
...@@ -62,6 +69,7 @@ ...@@ -62,6 +69,7 @@
</head> </head>
<body> <body>
<!-- Page--> <!-- Page-->
<div class="page text-center"> <div class="page text-center">
<!-- Page Header--> <!-- Page Header-->
<header class="page-head"> <header class="page-head">
...@@ -143,6 +151,11 @@ ...@@ -143,6 +151,11 @@
</header> </header>
<main class="page-content" style=" position: relative; "> <main class="page-content" style=" position: relative; ">
...@@ -249,35 +262,9 @@ ...@@ -249,35 +262,9 @@
</div> </div>
{{-- <div class="container">
<div id="wrapper">
<div id="carousel">
<div>
<img src="{{ asset('assets') }}/img/menu/001.jpg" style="height: 600px;" />
</div>
<div>
<img src="{{ asset('assets') }}/img/menu/002.jpg" style="height: 600px;"/>
</div>
<div>
<img src="{{ asset('assets') }}/img/menu/00003.jpg" style="height: 600px;"/>
</div>
<div>
<img src="{{ asset('assets') }}/img/menu/004.jpg" style="height: 600px;"/>
</div>
<div>
<img src="{{ asset('assets') }}/img/menu/005.jpg" style="height: 600px;"/>
</div>
</div>
<div id="title">
<h3>The Netherlands covered in snow</h3>
<p><a href="http://gigapica.geenstijl.nl/2013/01/the_netherlands_covered_in_sno.html">images from gigapica.geenstijl.nl</a></p>
</div>
<div id="pager"></div>
</div>
</div>--}}
</main> </main>
<!-- Page Content--> <!-- Page Content-->
<main class=""> <main class="">
<section class="section bg-light" style=""> <section class="section bg-light" style="">
...@@ -345,12 +332,12 @@ ...@@ -345,12 +332,12 @@
$1000 </p> $1000 </p>
<div class="calculator"> <div class="calculator">
<div class="form-group weight" data-price="2"> <div class="form-group weight" data-price="2" id="wewr">
<label class="h6" for="weight">Вес (кг)</label> <label class="h6" for="weight">Вес (кг)</label>
<input class="numbers-only" type="text" id="weight"> <input class="numbers-only" onkeyup="oncha()" type="text" id="weight">
</div> </div>
<div class="form-group border-top inset-4 h4"> <div class="form-group border-top inset-4 h4">
<p>ИТОГО:<span id="total">0</span></p> <p>ИТОГО:<span id="total"></span></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -358,9 +345,20 @@ ...@@ -358,9 +345,20 @@
</div> </div>
</div> </div>
</section> </section>
{{-- <div id="" style="background-image: url('{{asset('assets')}}/slider/images/exam_08.jpg');">
<!-- Start cSlider --> <script type="text/javascript">
<div id="da-slider" class="da-slider">--}} function getSum(total, num) {
return total + Math.round(num)* 8.5;
}
function oncha() {
var dataArray = [];
$("#wewr").find('input').each(function() {
dataArray.push(this.value);
document.getElementById("total").innerHTML = dataArray.reduce(getSum, 0);
});
}
</script>
<!-- mask elemet use for masking background image --> <!-- mask elemet use for masking background image -->
<div class="" style=" position: relative ;background-image: url('{{asset('assets')}}/slider/images/exam_08.jpg'); "> <div class="" style=" position: relative ;background-image: url('{{asset('assets')}}/slider/images/exam_08.jpg'); ">
...@@ -483,8 +481,8 @@ ...@@ -483,8 +481,8 @@
<time datetime="2018-12-26">15 мая 2019 г.</time> <time datetime="2018-12-26">15 мая 2019 г.</time>
</div>--}} </div>--}}
<div class="blog-post-body"> <div class="blog-post-body">
<p style="text-align: justify;">Вам теперь будет удобно отправлять посылки в Узбекистан из любого штата Америкию Компания FAZO CARGO INC. предоставляет услугу FREE PICK-UP в 50 штатах Америки. Для более подробной информации обращайтесь в наш офис в Бруклине или звоните по номеру: (347) 547.9797 либо или оставте свои контакты на нашем сайте. <p style="text-align: justify;">Вам теперь будет удобно отправлять посылки в Узбекистан из любого штата Америки. Компания FAZO CARGO INC. предоставляет услугу FREE PICK-UP в 50 штатах Америки. Для более подробной информации обращайтесь в наш офис в Бруклине или звоните по номеру: (347) 547.9797 либо или оставте свои контакты на нашем сайте.
Воспользуйтеси нашими услугами и дарите радость свим близким! Воспользуйтесь нашими услугами и дарите радость свим близким!
.</p> .</p>
</div> </div>
</div> </div>
...@@ -537,7 +535,7 @@ ...@@ -537,7 +535,7 @@
<cite> Aзиза ( Ташкент )</cite> <cite> Aзиза ( Ташкент )</cite>
</p> </p>
<p> <p>
<q>Самая лучшая и быстрая доставка! Очень удобный для пользования вэб-сайт ю Очень рекоммендую Всем! <q>Самая лучшая и быстрая доставка! Очень удобный для пользования вэб-сайт. Очень рекоммендую Всем!
</q> </q>
</p> </p>
</blockquote> </blockquote>
......
resources/views/questions.blade.php
View file @ d1e089c7
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<td><p style="float: left; color: #57606f; "><b>Где я могу получить свою посылку?</b></p></td><br> <td><p style="float: left; color: #57606f; "><b>Где я могу получить свою посылку?</b></p></td><br>
</tr> </tr>
<tr > <tr >
<td><p style="text-align: justify">Мы доставляем Ваши посылки по адресу, указанному Вами при оформлении посылки в пресональном кабинете.</p> </td> <td><p style="text-align: justify">Мы доставляем Ваши посылки по адресу, указанному Вами при оформлении посылки в персональний кабинете.</p> </td>
</tr> </tr>
</table> </table>
......
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