Skip to content

F
fazo
Commit f513acbb authored by Ruslan's avatar Ruslan
Browse files
Options

Merge

parent dcfd0fe8
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 83 deletions
.idea/workspace.xml
View file @ f513acbb
......@@ -3,7 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/user.blade.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/addpackage.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/addpackage.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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -30,7 +32,7 @@
<entry key="css" value="3" />
<entry key="env" value="1" />
<entry key="ico" value="1" />
<entry key="php" value="86" />
<entry key="php" value="89" />
<entry key="png" value="4" />
<entry key="svg" value="1" />
<entry key="woff2" value="1" />
......@@ -38,10 +40,10 @@
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Blade" value="38" />
<entry key="Blade" value="40" />
<entry key="CSS" value="3" />
<entry key="Image" value="5" />
<entry key="PHP" value="48" />
<entry key="PHP" value="49" />
<entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" />
</counts>
......@@ -50,14 +52,14 @@
<counts>
<entry key="css" value="12" />
<entry key="env" value="15" />
<entry key="php" value="14966" />
<entry key="php" value="15130" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Blade" value="8530" />
<entry key="Blade" value="8563" />
<entry key="CSS" value="12" />
<entry key="PHP" value="6436" />
<entry key="PHP" value="6567" />
<entry key="PLAIN_TEXT" value="15" />
</counts>
</usages-collector>
......@@ -68,26 +70,39 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="45" column="52" selection-start-line="45" selection-start-column="48" selection-end-line="45" selection-end-column="52" />
<state relative-caret-position="239">
<caret line="40" column="53" selection-start-line="40" selection-start-column="49" selection-end-line="40" selection-end-column="53" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="85" column="46" selection-start-line="85" selection-start-column="46" selection-end-line="85" selection-end-column="46" />
<state relative-caret-position="509">
<caret line="224" column="25" selection-start-line="224" selection-start-column="25" selection-end-line="224" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-648">
<caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
<state relative-caret-position="18">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="62" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560276372574" expanded="true" signature="1184:1238" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -110,11 +125,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="58" column="134" selection-start-line="58" selection-start-column="134" selection-end-line="58" selection-end-column="134" />
<state relative-caret-position="1116">
<caret line="62" column="63" selection-start-line="62" selection-start-column="63" selection-end-line="62" selection-end-column="63" />
</state>
</provider>
</entry>
......@@ -122,35 +137,26 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="290" column="64" selection-start-line="290" selection-start-column="64" selection-end-line="290" selection-end-column="64" />
<state relative-caret-position="307">
<caret line="258" column="26" selection-start-line="258" selection-start-column="26" selection-end-line="258" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
<state relative-caret-position="324">
<caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
</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="380">
<caret line="371" column="169" selection-start-line="371" selection-start-column="143" selection-end-line="371" selection-end-column="169" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-324">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</state>
</provider>
</entry>
......@@ -179,9 +185,12 @@
<find>.ttf</find>
<find>.woff</find>
<find>/feedback/add</find>
<find>profile</find>
<find>save</find>
<find>fa-pinterest-p</find>
<find>save</find>
<find>address</find>
<find>Адреса</find>
<find>profile</find>
<find>addr</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -196,7 +205,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/resources/views/pages/admin/packages_list.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/admin/address/address_list.blade.php" />
......@@ -222,16 +230,18 @@
<option value="$PROJECT_DIR$/resources/views/pages/admin/feedback/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/admin/feedback/view.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/admin.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" />
<option value="$PROJECT_DIR$/public/frontend/css/style.css" />
<option value="$PROJECT_DIR$/public/css/style.css" />
<option value="$PROJECT_DIR$/resources/views/about.blade.php" />
<option value="$PROJECT_DIR$/resources/views/contacts.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
</list>
</option>
</component>
......@@ -477,18 +487,17 @@
<workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="15875000" />
<workItem from="1560092291448" duration="20869000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="90072000" />
<option name="totallyTimeSpent" value="95066000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24946696" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24946696" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -501,7 +510,7 @@
<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" visible="true" weight="0.20607375" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.20607375" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" />
<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" />
......@@ -543,15 +552,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/favicon-32x32.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/favicon-16x16.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/favicon.ico">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf/config/dompdf.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1944" />
......@@ -832,59 +832,84 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="45" column="52" selection-start-line="45" selection-start-column="48" selection-end-line="45" selection-end-column="52" />
<state relative-caret-position="-324">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1098">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1116">
<caret line="62" column="63" selection-start-line="62" selection-start-column="63" selection-end-line="62" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="290" column="64" selection-start-line="290" selection-start-column="64" selection-end-line="290" selection-end-column="64" />
<state relative-caret-position="307">
<caret line="258" column="26" selection-start-line="258" selection-start-column="26" selection-end-line="258" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-324">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
<state relative-caret-position="324">
<caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
<state relative-caret-position="239">
<caret line="40" column="53" selection-start-line="40" selection-start-column="49" selection-end-line="40" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-648">
<caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
<state relative-caret-position="509">
<caret line="224" column="25" selection-start-line="224" selection-start-column="25" selection-end-line="224" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
<state relative-caret-position="432">
<caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1098">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="58" column="134" selection-start-line="58" selection-start-column="134" selection-end-line="58" selection-end-column="134" />
<state relative-caret-position="18">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="62" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560276372574" expanded="true" signature="1184:1238" ph="..." />
</folding>
</state>
</provider>
</entry>
......
app/Http/Controllers/PackagesController.php
View file @ f513acbb
......@@ -224,6 +224,7 @@ class PackagesController extends Controller
{
return view('addpackage');
}
public function index()
{
......
resources/views/addpackage.blade.php
View file @ f513acbb
......@@ -45,14 +45,13 @@
</div>
<div class="col-xs-6 col-sm-3">
<a class="btn btn-primary btn-sm btn-shape-default btn-min-width-sm" href="buttons.html#">Add item</a>
</div>
</div>
<div class="row">
<div class="col-xs-12 section-inset-1">
<div class="table-responsive">
<div class="table-responsive ">
<table class="table table-hover text-left">
<thead>
<tr class="bg-dark">
......
resources/views/layouts/user.blade.php
View file @ f513acbb
......@@ -118,13 +118,12 @@
<ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right">
<li><a href="/">На главную</a></li>
<li><a href="{{ route('package') }}">Посылки</a>
</li>
<li ><a href="{{ route('address') }}">Адреса</a>
<li>
<a href="{{ route('address') }}">Адреса</a>
</li>
<li><a href="/profile">Профиль</a>
<li>
<a href="/profile">Профиль</a>
</li>
</ul>
</div>
......
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