Skip to content

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

first commit (10/08/2019//23:38) Icons

parent 39d2ba1f
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 244 deletions
.idea/workspace.xml
View file @ fdd0f146
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/resources/views/pages/terms.blade.php" 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/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.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/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/main.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$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.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" />
...@@ -42,142 +41,38 @@ ...@@ -42,142 +41,38 @@
<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="1258"> <state relative-caret-position="141">
<caret line="93" column="57" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="57" /> <caret line="59" column="13" lean-forward="true" 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="false">
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="731" column="209" selection-start-line="731" selection-start-column="178" selection-end-line="731" selection-end-column="209" />
</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="238">
<caret line="52" column="65" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="478">
<caret line="40" column="32" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="32" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.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="498"> <state relative-caret-position="221">
<caret line="538" column="4" selection-start-line="538" selection-start-column="4" selection-end-line="538" selection-end-column="4" /> <caret line="287" column="124" selection-start-line="287" selection-start-column="124" selection-end-line="287" selection-end-column="124" />
<folding> <folding>
<element signature="e#875#919#0#HTML" expanded="true" /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#1738#1766#0#HTML" expanded="true" />
<element signature="e#2617#2645#0#HTML" expanded="true" />
<element signature="e#2980#3008#0#HTML" expanded="true" />
<element signature="e#3434#3462#0#HTML" expanded="true" />
<element signature="e#4220#4248#0#HTML" expanded="true" />
<element signature="e#8644#8672#0#HTML" expanded="true" />
<element signature="e#9153#9181#0#HTML" expanded="true" />
<element signature="e#9889#9917#0#HTML" expanded="true" />
<element signature="e#10151#10179#0#HTML" expanded="true" />
<element signature="e#10490#10518#0#HTML" expanded="true" />
<element signature="e#10702#10730#0#HTML" expanded="true" />
<element signature="e#11039#11067#0#HTML" expanded="true" />
<element signature="e#11135#11163#0#HTML" expanded="true" />
<element signature="e#11244#11272#0#HTML" expanded="true" />
<element signature="e#11602#11630#0#HTML" expanded="true" />
<element signature="e#12377#12405#0#HTML" expanded="true" />
<element signature="e#13039#13067#0#HTML" expanded="true" />
<element signature="e#13445#13468#0#HTML" expanded="true" />
<element signature="e#13513#13541#0#HTML" expanded="true" />
<element signature="e#14852#14880#0#HTML" expanded="true" />
<element signature="e#15388#15416#0#HTML" expanded="true" />
<element signature="e#15769#15797#0#HTML" expanded="true" />
<element signature="e#16715#16738#0#HTML" expanded="true" />
<element signature="e#16760#16788#0#HTML" expanded="true" />
<element signature="e#18110#18138#0#HTML" expanded="true" />
<element signature="e#18747#18775#0#HTML" expanded="true" />
<element signature="e#18947#18975#0#HTML" expanded="true" />
<element signature="e#19790#19818#0#HTML" expanded="true" />
<element signature="e#20279#20307#0#HTML" expanded="true" />
<element signature="e#20801#20829#0#HTML" expanded="true" />
<element signature="e#21202#21230#0#HTML" expanded="true" />
<element signature="e#21743#21771#0#HTML" expanded="true" />
<element signature="e#22057#22085#0#HTML" expanded="true" />
<element signature="e#22689#22717#0#HTML" expanded="true" />
<element signature="e#23594#23622#0#HTML" expanded="true" />
<element signature="e#24106#24134#0#HTML" expanded="true" />
<element signature="e#24832#24860#0#HTML" expanded="true" />
<element signature="e#25708#25736#0#HTML" expanded="true" />
<element signature="e#26464#26492#0#HTML" expanded="true" />
<element signature="e#26780#26808#0#HTML" expanded="true" />
<element signature="e#27334#27362#0#HTML" expanded="true" />
<element signature="e#31458#31486#0#HTML" expanded="true" />
<element signature="e#31993#32021#0#HTML" expanded="true" />
<element signature="e#32558#32586#0#HTML" expanded="true" />
<element signature="e#32984#33012#0#HTML" expanded="true" />
<element signature="e#33678#33706#0#HTML" expanded="true" />
<element signature="e#33832#33860#0#HTML" expanded="true" />
<element signature="e#33828#33851#0#HTML" />
<element signature="e#34017#34048#0#HTML" expanded="true" />
<element signature="e#35954#35985#0#HTML" expanded="true" />
<element signature="e#36857#36888#0#HTML" expanded="true" />
<element signature="e#38457#38485#0#HTML" expanded="true" />
<element signature="e#38453#38503#0#HTML" />
<element signature="e#38710#38741#0#HTML" expanded="true" />
<element signature="e#52409#52437#0#HTML" expanded="true" />
<element signature="e#52417#58826#0#HTML" />
<element signature="e#52488#52519#0#HTML" expanded="true" />
<element signature="e#64227#69204#0#HTML" />
<element signature="e#66928#66959#0#HTML" expanded="true" />
<element signature="e#69213#69294#0#HTML" />
<element signature="e#69297#69328#0#HTML" expanded="true" />
<element signature="e#73977#74058#0#HTML" />
<element signature="e#74328#74359#0#HTML" expanded="true" />
<element signature="e#75929#76003#0#HTML" />
<element signature="e#75978#76009#0#HTML" expanded="true" />
<element signature="e#77474#77505#0#HTML" expanded="true" />
<element signature="e#77470#77615#0#HTML" />
<element signature="e#81413#81444#0#HTML" expanded="true" />
<element signature="e#86123#86154#0#HTML" expanded="true" />
</folding> </folding>
</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$/resources/views/welcome.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="612"> <state relative-caret-position="-136">
<caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" /> <caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
<folding>
<element signature="e#126#149#0#PHP" expanded="true" />
</folding>
</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/Http/Controllers/ProfileController.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="544"> <state relative-caret-position="646">
<caret line="44" selection-start-line="44" selection-end-line="45" /> <caret line="39" column="54" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -194,7 +89,7 @@ ...@@ -194,7 +89,7 @@
<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="1989"> <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" /> <caret line="117" column="77" selection-start-line="117" selection-start-column="77" selection-end-line="117" selection-end-column="77" />
</state> </state>
</provider> </provider>
...@@ -248,7 +143,6 @@ ...@@ -248,7 +143,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/app/Http/Controllers/Postman/DeclarationController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Postman/PackagesController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/Postman/PackagesController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Postman/UsersController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/Postman/UsersController.php" />
<option value="$PROJECT_DIR$/app/Models/Activity.php" /> <option value="$PROJECT_DIR$/app/Models/Activity.php" />
...@@ -281,7 +175,6 @@ ...@@ -281,7 +175,6 @@
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_onpacking.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_onpacking.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_sent.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_sent.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_delivered.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_delivered.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php" />
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/resources/views/layouts/main.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/main.blade.php" />
...@@ -297,8 +190,10 @@ ...@@ -297,8 +190,10 @@
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" /> <option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
<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/auth/login.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -459,7 +354,7 @@ ...@@ -459,7 +354,7 @@
<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="pages" 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" />
...@@ -467,7 +362,6 @@ ...@@ -467,7 +362,6 @@
<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="pages" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="tarifs" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
...@@ -559,7 +453,9 @@ ...@@ -559,7 +453,9 @@
<workItem from="1569010936046" duration="2075000" /> <workItem from="1569010936046" duration="2075000" />
<workItem from="1569048123758" duration="278000" /> <workItem from="1569048123758" duration="278000" />
<workItem from="1570474579928" duration="2098000" /> <workItem from="1570474579928" duration="2098000" />
<workItem from="1570507468153" duration="6606000" /> <workItem from="1570507468153" duration="11499000" />
<workItem from="1570528599223" duration="146000" />
<workItem from="1570556967457" duration="2707000" />
</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>
...@@ -568,17 +464,24 @@ ...@@ -568,17 +464,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1570475345392</updated> <updated>1570475345392</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL-00002" summary="first commit (10/08/2019//10:56) Terms">
<created>1570514228480</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1570514228480</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="242003000" /> <option name="totallyTimeSpent" value="249749000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14674735" /> <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="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" /> <window_info id="npm" order="3" side_tool="true" />
...@@ -669,7 +572,8 @@ ...@@ -669,7 +572,8 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="first commit (10/07/2019//11/;58)" /> <MESSAGE value="first commit (10/07/2019//11/;58)" />
<option name="LAST_COMMIT_MESSAGE" value="first commit (10/07/2019//11/;58)" /> <MESSAGE value="first commit (10/08/2019//10:56) Terms" />
<option name="LAST_COMMIT_MESSAGE" value="first commit (10/08/2019//10:56) Terms" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -683,10 +587,6 @@ ...@@ -683,10 +587,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://D:/web/coolcarousel (2)/coolcarousel.html" />
<entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.php"> <entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -725,13 +625,6 @@ ...@@ -725,13 +625,6 @@
</state> </state>
</provider> </provider>
</entry> </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/layouts/app2.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/app2.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-882" /> <state relative-caret-position="-882" />
...@@ -904,143 +797,95 @@ ...@@ -904,143 +797,95 @@
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/welcome.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="884">
<caret line="52" column="65" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/terms.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612"> <state relative-caret-position="9095">
<caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" /> <caret line="535" selection-start-line="535" selection-end-line="535" />
<folding>
<element signature="e#126#149#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.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="544"> <state relative-caret-position="141">
<caret line="44" selection-start-line="44" selection-end-line="45" /> <caret line="59" column="13" lean-forward="true" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.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="442"> <state relative-caret-position="53">
<caret line="26" column="108" selection-start-line="26" selection-start-column="108" selection-end-line="26" selection-end-column="108" /> <caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" 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/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1989"> <state relative-caret-position="-136">
<caret line="117" column="77" selection-start-line="117" selection-start-column="77" selection-end-line="117" selection-end-column="77" /> <caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/welcome.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.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="478"> <state relative-caret-position="444">
<caret line="40" column="32" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="32" /> <caret line="40" column="32" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="32" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.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="359">
<caret line="52" column="65" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" /> <caret line="222" column="7" selection-start-line="217" selection-start-column="4" selection-end-line="222" selection-end-column="7" />
<folding>
<element signature="e#126#149#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1258"> <state relative-caret-position="427">
<caret line="93" column="57" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="57" /> <caret line="44" selection-start-line="44" selection-end-line="45" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/main.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="430"> <state relative-caret-position="646">
<caret line="731" column="209" selection-start-line="731" selection-start-column="178" selection-end-line="731" selection-end-column="209" /> <caret line="39" column="54" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.blade.php"> <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="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>
<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="498"> <state relative-caret-position="221">
<caret line="538" column="4" selection-start-line="538" selection-start-column="4" selection-end-line="538" selection-end-column="4" /> <caret line="287" column="124" selection-start-line="287" selection-start-column="124" selection-end-line="287" selection-end-column="124" />
<folding> <folding>
<element signature="e#875#919#0#HTML" expanded="true" /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#1738#1766#0#HTML" expanded="true" />
<element signature="e#2617#2645#0#HTML" expanded="true" />
<element signature="e#2980#3008#0#HTML" expanded="true" />
<element signature="e#3434#3462#0#HTML" expanded="true" />
<element signature="e#4220#4248#0#HTML" expanded="true" />
<element signature="e#8644#8672#0#HTML" expanded="true" />
<element signature="e#9153#9181#0#HTML" expanded="true" />
<element signature="e#9889#9917#0#HTML" expanded="true" />
<element signature="e#10151#10179#0#HTML" expanded="true" />
<element signature="e#10490#10518#0#HTML" expanded="true" />
<element signature="e#10702#10730#0#HTML" expanded="true" />
<element signature="e#11039#11067#0#HTML" expanded="true" />
<element signature="e#11135#11163#0#HTML" expanded="true" />
<element signature="e#11244#11272#0#HTML" expanded="true" />
<element signature="e#11602#11630#0#HTML" expanded="true" />
<element signature="e#12377#12405#0#HTML" expanded="true" />
<element signature="e#13039#13067#0#HTML" expanded="true" />
<element signature="e#13445#13468#0#HTML" expanded="true" />
<element signature="e#13513#13541#0#HTML" expanded="true" />
<element signature="e#14852#14880#0#HTML" expanded="true" />
<element signature="e#15388#15416#0#HTML" expanded="true" />
<element signature="e#15769#15797#0#HTML" expanded="true" />
<element signature="e#16715#16738#0#HTML" expanded="true" />
<element signature="e#16760#16788#0#HTML" expanded="true" />
<element signature="e#18110#18138#0#HTML" expanded="true" />
<element signature="e#18747#18775#0#HTML" expanded="true" />
<element signature="e#18947#18975#0#HTML" expanded="true" />
<element signature="e#19790#19818#0#HTML" expanded="true" />
<element signature="e#20279#20307#0#HTML" expanded="true" />
<element signature="e#20801#20829#0#HTML" expanded="true" />
<element signature="e#21202#21230#0#HTML" expanded="true" />
<element signature="e#21743#21771#0#HTML" expanded="true" />
<element signature="e#22057#22085#0#HTML" expanded="true" />
<element signature="e#22689#22717#0#HTML" expanded="true" />
<element signature="e#23594#23622#0#HTML" expanded="true" />
<element signature="e#24106#24134#0#HTML" expanded="true" />
<element signature="e#24832#24860#0#HTML" expanded="true" />
<element signature="e#25708#25736#0#HTML" expanded="true" />
<element signature="e#26464#26492#0#HTML" expanded="true" />
<element signature="e#26780#26808#0#HTML" expanded="true" />
<element signature="e#27334#27362#0#HTML" expanded="true" />
<element signature="e#31458#31486#0#HTML" expanded="true" />
<element signature="e#31993#32021#0#HTML" expanded="true" />
<element signature="e#32558#32586#0#HTML" expanded="true" />
<element signature="e#32984#33012#0#HTML" expanded="true" />
<element signature="e#33678#33706#0#HTML" expanded="true" />
<element signature="e#33832#33860#0#HTML" expanded="true" />
<element signature="e#33828#33851#0#HTML" />
<element signature="e#34017#34048#0#HTML" expanded="true" />
<element signature="e#35954#35985#0#HTML" expanded="true" />
<element signature="e#36857#36888#0#HTML" expanded="true" />
<element signature="e#38457#38485#0#HTML" expanded="true" />
<element signature="e#38453#38503#0#HTML" />
<element signature="e#38710#38741#0#HTML" expanded="true" />
<element signature="e#52409#52437#0#HTML" expanded="true" />
<element signature="e#52417#58826#0#HTML" />
<element signature="e#52488#52519#0#HTML" expanded="true" />
<element signature="e#64227#69204#0#HTML" />
<element signature="e#66928#66959#0#HTML" expanded="true" />
<element signature="e#69213#69294#0#HTML" />
<element signature="e#69297#69328#0#HTML" expanded="true" />
<element signature="e#73977#74058#0#HTML" />
<element signature="e#74328#74359#0#HTML" expanded="true" />
<element signature="e#75929#76003#0#HTML" />
<element signature="e#75978#76009#0#HTML" expanded="true" />
<element signature="e#77474#77505#0#HTML" expanded="true" />
<element signature="e#77470#77615#0#HTML" />
<element signature="e#81413#81444#0#HTML" expanded="true" />
<element signature="e#86123#86154#0#HTML" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
app/Http/Controllers/PackagesController.php
View file @ fdd0f146
...@@ -221,6 +221,7 @@ class PackagesController extends Controller ...@@ -221,6 +221,7 @@ class PackagesController extends Controller
* @param $packages * @param $packages
* @return string * @return string
*/ */
private function makeDeclarationJSON(&$packages) : string private function makeDeclarationJSON(&$packages) : string
{ {
$declaration_data = []; $declaration_data = [];
......
resources/views/auth/login.blade.php
View file @ fdd0f146
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<div class="form-group row mb-0"> <div class="form-group row mb-0">
<div class="col-md-8 offset-md-4 mt-4"> <div class="col-md-8 offset-md-4 mt-4">
<span class="text-muted">
Впервые у нас? Впервые у нас?
<span class="text-muted">
<a class="" href="{{ route('register') }}"> <a class="" href="{{ route('register') }}">
Регистрация. Регистрация.
</a> </a>
......
resources/views/main.blade.php
View file @ fdd0f146
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
<div class="row clearleft-custom flow-offset-1 offset-1"> <div class="row clearleft-custom flow-offset-1 offset-1">
<div class="col-xs-12 col-sm-6 col-lg-3"> <div class="col-xs-12 col-sm-6 col-lg-3">
<div class="thumbnail thumbnail-mod-1"><span <div class="thumbnail thumbnail-mod-1"><span
class="icon icon-primary icon-lg icon-mod-1 fa fa-shopping-bag"></span> class="icon icon-primary icon-lg icon-mod-1"><i class="glyphicon glyphicon-shopping-cart"></i></span>
<div class="caption"> <div class="caption">
<h4 style="color: #0B3C5D">Покупаете</h4> <h4 style="color: #0B3C5D">Покупаете</h4>
<p>Покупаете в <p>Покупаете в
......
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