Skip to content

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

Added feedback on Frontend page

parent 64761c35
Show whitespace changes
Inline Side-by-side
Showing with 390 additions and 335 deletions
.idea/workspace.xml
View file @ 53e2823d
......@@ -2,7 +2,35 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" 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/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/css/app.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/css/app.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/css/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/images/dashboard/circle.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/images/dashboard/circle.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/images/logo-mini.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/images/logo-mini.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/images/logo.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/images/logo.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/js/chart.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/js/chart.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/js/dashboard.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/js/dashboard.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/js/file-upload.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/js/file-upload.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/js/misc.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/js/misc.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/js/off-canvas.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/js/off-canvas.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/css/vendor.bundle.base.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/css/vendor.bundle.base.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.css.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.min.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/css/materialdesignicons.min.css.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/iconfonts/mdi/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/js/vendor.bundle.addons.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/js/vendor.bundle.addons.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/admin/vendors/js/vendor.bundle.base.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/admin/vendors/js/vendor.bundle.base.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/admin.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/admin.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/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/main.blade.php" 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$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -18,10 +46,10 @@
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="4" />
<entry key="project.open.time.0" value="2" />
<entry key="project.open.time.0" value="3" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="4" />
<entry key="project.opened" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
......@@ -29,17 +57,17 @@
<entry key="css" value="1" />
<entry key="env" value="1" />
<entry key="ico" value="1" />
<entry key="php" value="62" />
<entry key="php" value="76" />
<entry key="png" value="4" />
<entry key="svg" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Blade" value="23" />
<entry key="Blade" value="31" />
<entry key="CSS" value="1" />
<entry key="Image" value="5" />
<entry key="PHP" value="39" />
<entry key="PHP" value="45" />
<entry key="PLAIN_TEXT" value="1" />
<entry key="SVG" value="1" />
</counts>
......@@ -48,14 +76,14 @@
<counts>
<entry key="css" value="12" />
<entry key="env" value="15" />
<entry key="php" value="13790" />
<entry key="php" value="14457" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Blade" value="8260" />
<entry key="Blade" value="8385" />
<entry key="CSS" value="12" />
<entry key="PHP" value="5530" />
<entry key="PHP" value="6072" />
<entry key="PLAIN_TEXT" value="15" />
</counts>
</usages-collector>
......@@ -64,103 +92,86 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/ActivitylogController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="39" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state>
</provider>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.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/pages/admin/activity/index.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="680">
<caret line="40" column="35" selection-end-line="55" selection-end-column="11" />
<state relative-caret-position="1314">
<caret line="73" column="10" lean-forward="true" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Models/Feedback.php">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
<state relative-caret-position="504">
<caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1360">
<caret line="89" selection-start-line="89" selection-end-line="89" />
</state>
<state relative-caret-position="-1924" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/AddressController.php">
<entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="3690">
<caret line="205" column="25" lean-forward="true" selection-start-line="205" selection-start-column="25" selection-end-line="205" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/FeedbackController.php">
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state>
<state relative-caret-position="-486" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/feedback/view.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="901">
<caret line="53" column="11" selection-start-line="53" selection-start-column="11" selection-end-line="53" selection-end-column="11" />
<state relative-caret-position="399">
<caret line="390" column="38" lean-forward="true" selection-start-line="390" selection-start-column="38" selection-end-line="390" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<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="69">
<caret line="213" column="16" selection-start-line="213" selection-start-column="16" selection-end-line="230" selection-end-column="22" />
<state relative-caret-position="376">
<caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/feedback/index.blade.php">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="4" selection-start-line="15" selection-start-column="4" selection-end-line="18" selection-end-column="39" />
<state relative-caret-position="342">
<caret line="24" column="32" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
<folding>
<element signature="e#126#150#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Models/Activity.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="e#115#154#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="1263">
<caret line="268" column="1" selection-start-line="268" selection-start-column="1" selection-end-line="268" selection-end-column="1" />
</state>
</provider>
</entry>
......@@ -182,7 +193,13 @@
<find>activi</find>
<find>ip</find>
<find>addressUpdate</find>
<find>ОТЗЫВЫ</find>
<find>СВЯЖИТЕСЬ С НАМИ</find>
<find>/feedback/add</find>
</findStrings>
<dirStrings>
<dir>D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\resources\views</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -213,10 +230,12 @@
<option value="$PROJECT_DIR$/resources/views/pages/admin/activity/index.blade.php" />
<option value="$PROJECT_DIR$/app/Models/Feedback.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Postman/FeedbackController.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<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$/resources/views/main.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" />
</list>
</option>
</component>
......@@ -326,9 +345,9 @@
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="2110" />
<option name="y" value="180" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2127" />
<option name="y" value="152" />
<option name="width" value="1616" />
<option name="height" value="820" />
</component>
......@@ -340,6 +359,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -365,14 +385,6 @@
<item name="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
<item name="Postman" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
......@@ -419,62 +431,7 @@
<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="admin" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="activity" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="address" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="declarations" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="feedback" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="packages" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="users" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
......@@ -485,7 +442,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -525,17 +481,18 @@
<workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="6994000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="74197000" />
<option name="totallyTimeSpent" value="81191000" />
</component>
<component name="ToolWindowManager">
<frame x="2110" y="180" width="1616" height="820" extended-state="0" />
<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.29691517" />
<window_info active="true" 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" />
......@@ -548,7 +505,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.27656478" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.20585048" />
<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" />
......@@ -590,52 +547,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<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/pages/admin/packages_list.blade.php" />
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/address/address_list.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</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="449">
<caret line="268" column="1" selection-start-line="268" selection-start-column="1" selection-end-line="268" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/home.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-178">
<caret line="86" selection-start-line="86" selection-end-line="86" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/packages/packages_list.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="15" column="21" lean-forward="true" selection-end-line="59" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
......@@ -664,13 +575,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="710">
<caret line="94" selection-start-line="94" selection-end-line="94" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="685">
......@@ -716,13 +620,6 @@
<state relative-caret-position="-1296" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3425">
<caret line="205" column="25" lean-forward="true" selection-start-line="205" selection-start-column="25" selection-end-line="205" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/admin/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
......@@ -797,9 +694,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="81" column="46" lean-forward="true" selection-start-line="81" selection-start-column="46" selection-end-line="81" selection-end-column="46" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -807,9 +701,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="55" column="89" selection-start-line="55" selection-start-column="89" selection-end-line="55" selection-end-column="89" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -844,10 +735,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/AddressController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1360">
<caret line="89" selection-start-line="89" selection-end-line="89" />
<state relative-caret-position="51">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -885,20 +779,93 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/AddressController.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="-2271">
<caret line="94" column="107" selection-start-line="94" selection-start-column="107" selection-end-line="94" selection-end-column="107" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-326">
<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/layouts/app2.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-810" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1314">
<caret line="73" column="10" lean-forward="true" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
</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="-1924" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3690">
<caret line="205" column="25" lean-forward="true" selection-start-line="205" selection-start-column="25" selection-end-line="205" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="213" column="16" selection-start-line="213" selection-start-column="16" selection-end-line="230" selection-end-column="22" />
<state relative-caret-position="-486" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1263">
<caret line="268" column="1" selection-start-line="268" selection-start-column="1" selection-end-line="268" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="376">
<caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
</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="399">
<caret line="390" column="38" lean-forward="true" selection-start-line="390" selection-start-column="38" selection-end-line="390" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="24" column="32" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
<folding>
<element signature="e#126#150#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
app/Http/Controllers/FeedbackController.php 0 → 100644
View file @ 53e2823d
<?php
/**
* Created by PhpStorm.
* User: RSkaldin
* Date: 6/10/2019
* Time: 7:39 PM
*/
namespace App\Http\Controllers;
use App\Models\Feedback;
use Illuminate\Http\Request;
class FeedbackController extends Controller
{
/**
* Соз
* @param Request $request
* @return \Illuminate\Http\RedirectResponse
*/
public function addGuest(Request $request)
{
try {
$feedback = new Feedback();
$feedback->name = $request->input('name').' '.$request->input('last-name');
$feedback->email = $request->input('email');
$feedback->phone = $request->input('phone');
$feedback->body = $request->input('message');
$feedback->title = 'Гость: '.$feedback->name;
$feedback->ip = $request->ip();
$feedback->save();
} catch (\Exception $ex) {
return redirect()->back()->with('flash_error', 'Ошибка отправки сообщения.');
}
return redirect()->back()->with('flash_success', 'Сообщение отправлено успешно.');
}
}
\ No newline at end of file
app/Http/Controllers/PackagesController.php
View file @ 53e2823d
......@@ -224,4 +224,11 @@ class PackagesController extends Controller
{
return view('addpackage');
}
public function index()
{
$units = Package::where('user_id', '=', Auth::user()->id);
return view('pages.parcels.index', compact('units'));
}
}
app/Http/Controllers/ProfileController.php
View file @ 53e2823d
......@@ -264,6 +264,14 @@ class ProfileController extends Controller
}
public function profile()
{
return view('profile');
return view('pages.profile.user');
}
public function save(Request $request)
{
$user = User::find(Auth::user()->id);
$user->update($request->all());
return redirect()->back();
}
}
\ No newline at end of file
app/Http/Middleware/RedirectIfAuthenticated.php
View file @ 53e2823d
......@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/home');
return redirect('/profile');
}
return $next($request);
......
resources/views/layouts/admin.blade.php
View file @ 53e2823d
......@@ -80,7 +80,7 @@
<div class="preview-item-content d-flex align-items-start flex-column justify-content-center">
<h6 class="preview-subject ellipsis mb-1 font-weight-normal">{{ $item->title }}</h6>
<p class="text-gray mb-0">
{{ $item->created_at }}
{{ $item->created_at->diffForHumans() }}
</p>
</div>
</a>
......@@ -92,8 +92,7 @@
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link count-indicator dropdown-toggle" id="notificationDropdown" href="#"
data-toggle="dropdown">
<a class="nav-link count-indicator dropdown-toggle" id="notificationDropdown" href="#" data-toggle="dropdown">
<i class="mdi mdi-bell-outline"></i>
<span class="count-symbol bg-danger"></span>
</a>
......
resources/views/layouts/user.blade.php
View file @ 53e2823d
......@@ -34,12 +34,12 @@
<div class="rd-navbar-inner">
<button class="rd-navbar-collapse-toggle" data-rd-navbar-toggle=".list-inline" type="submit"><span></span></button><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#4b68"><span class="__cf_email__" data-cfemail="533a3d353c1337363e3c3f3a3d387d3c2134">[email&#160;protected]</span></a><a class="fa-mobile-phone preffix-2" href="callto:#">1-800-1234-567</a>
<ul class="list-inline pull-right">
<li><a class="fa-facebook" href="header-minimal.html#"></a></li>
<li><a class="fa-twitter" href="header-minimal.html#"></a></li>
<li><a class="fa-pinterest-p" href="header-minimal.html#"></a></li>
<li><a class="fa-vimeo" href="header-minimal.html#"></a></li>
<li><a class="fa-google-plus" href="header-minimal.html#"></a></li>
<li><a class="fa-rss" href="header-minimal.html#"></a></li>
<li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="#"></a></li>
<li><a class="fa-pinterest-p" href="#"></a></li>
<li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google-plus" href="#"></a></li>
<li><a class="fa-rss" href="#"></a></li>
<li class="text-left"><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#d1f2"><span class="__cf_email__" data-cfemail="20494e464f6044454d4f4c494e4b0e4f5247">[email&#160;protected]</span></a></li>
<li class="text-left"><a class="fa-mobile-phone" href="callto:#">1-800-1234-567</a></li>
</ul>
......@@ -66,17 +66,17 @@
<button class="rd-navbar-search-form-submit fa-shopping-cart" type="submit"></button>
</form><span class="rd-navbar-live-search-results"></span>
<button class="rd-navbar-search-toggle" data-rd-navbar-toggle=".rd-navbar-search, .rd-navbar-live-search-results" type="submit"></button>
</div><a class="fa-shopping-cart" href="shop-cart.html"><span>10</span></a>
</div><a class="fa-shopping-cart" href=""><span>10</span></a>
<!-- RD Navbar Nav-->
<ul class="rd-navbar-nav">
<li><a href="index.html">На главную</a></li>
<li><a href="header-minimal.html#">Посылки</a>
<li><a href="/">На главную</a></li>
<li><a href="{{ route('package') }}">Посылки</a>
</li>
<li class="active"><a href="header-minimal.html#">Адреса</a>
<li class="active"><a href="{{ route('address') }}">Адреса</a>
</li>
<li><a href="header-minimal.html#">Профиль</a>
<li><a href="/profile">Профиль</a>
</li>
......@@ -98,14 +98,14 @@
<div class="rd-navbar-brand pull-lg-left"><a class="brand-name" href="index.html"><img src="/assets/img/icon/logo.png"
class="logo_main" alt=""><span>Fazoshop</span></a></div>
<ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right">
<li><a href="index.html">На главную</a></li>
<li><a href="header-minimal.html#">Посылки</a>
<li><a href="/">На главную</a></li>
<li><a href="{{ route('package') }}">Посылки</a>
</li>
<li ><a href="header-minimal.html#">Адреса</a>
<li ><a href="{{ route('address') }}">Адреса</a>
</li>
<li><a href="header-minimal.html#">Профиль</a>
<li><a href="/profile">Профиль</a>
</li>
</ul>
......@@ -113,14 +113,14 @@
</section>
<section class="copyright bg-darkest well5">
<div class="container">
<p class="pull-sm-left">&#169; <span id="copyright-year"></span> All Rights Reserved <a href="terms.html">Terms of Use and Privacy Policy</a></p>
<p class="pull-sm-left">&#169; <span id="copyright-year"></span> All Rights Reserved <a href="">Terms of Use and Privacy Policy</a></p>
<ul class="list-inline pull-sm-right offset-3">
<li><a class="fa-facebook" href="footer-minimal-dark.html#"></a></li>
<li><a class="fa-twitter" href="footer-minimal-dark.html#"></a></li>
<li><a class="fa-pinterest-p" href="footer-minimal-dark.html#"></a></li>
<li><a class="fa-vimeo" href="footer-minimal-dark.html#"></a></li>
<li><a class="fa-google" href="footer-minimal-dark.html#"></a></li>
<li><a class="fa-rss" href="footer-minimal-dark.html#"></a></li>
<li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="#"></a></li>
<li><a class="fa-pinterest-p" href="#"></a></li>
<li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google" href="#"></a></li>
<li><a class="fa-rss" href="#"></a></li>
</ul>
</div>
</section>
......
resources/views/main.blade.php
View file @ 53e2823d
......@@ -65,9 +65,8 @@
<button class="rd-navbar-toggle" data-rd-navbar-toggle=".rd-navbar-nav-wrap" type="submit">
<span></span></button>
<!-- RD Navbar Brand-->
<div class="rd-navbar-brand"><a class="brand-name" href="/"><img src="/assets/img/icon/logo.png"
class="logo_main" alt="">
</a>
<div class="rd-navbar-brand">
<a class="brand-name" href="/"><img src="/assets/img/icon/logo.png" class="logo_main" alt=""></a>
</div>
</div>
<div class="rd-navbar-nav-wrap">
......@@ -370,43 +369,37 @@
<div class="col-xs-12 col-md-9 col-lg-6 col-md-offset-2 col-lg-offset-3">
<!--p.fw-l.h5.text-transform-none Enter your email address to receive all company news, special offers and other discount information.-->
<!-- RD Mailform-->
<form class="rd-mailform text-left" data-form-output="form-output-global"
data-form-type="forms" method="post"
action="https://livedemo00.template-help.com/wt_58899_v2/bat/rd-mailform.php">
<form class="rd-mailform text-left" data-form-output="form-output-global" data-form-type="forms" method="post" action="{{ url('/feedback/add') }}">
@csrf
<div class="row row-10">
<div class="col-xs-12 col-sm-6">
<div class="form-wrap">
<label class="form-label" for="forms-name">Ваше имя...</label>
<input class="form-input" id="forms-name" type="text" name="name"
data-constraints="@Required">
<input class="form-input" id="forms-name" type="text" name="name" data-constraints="@Required">
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="form-wrap">
<label class="form-label" for="forms-last-name">Ваша фамилия...</label>
<input class="form-input" id="forms-last-name" type="text" name="last-name"
data-constraints="@Required">
<input class="form-input" id="forms-last-name" type="text" name="last-name" data-constraints="@Required">
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="form-wrap">
<label class="form-label" for="forms-email">Ваш e-mail...</label>
<input class="form-input" id="forms-email" type="email" name="email"
data-constraints="@Email @Required">
<input class="form-input" id="forms-email" type="email" name="email" data-constraints="@Email @Required">
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="form-wrap">
<label class="form-label" for="forms-phone">Ваш номер...</label>
<input class="form-input" id="forms-phone" type="text" name="phone"
data-constraints="@Numeric @Required">
<input class="form-input" id="forms-phone" type="text" name="phone" data-constraints="@Numeric @Required">
</div>
</div>
<div class="col-xs-12 col-sm-12">
<div class="form-wrap">
<label class="form-label" for="forms-message">Сообщение:</label>
<textarea class="form-input" id="forms-message" name="message"
data-constraints="@Required"></textarea>
<textarea class="form-input" id="forms-message" name="message" data-constraints="@Required"></textarea>
</div>
</div>
<div class="col-xs-12 text-center">
......
resources/views/pages/parcels/index.blade.php 0 → 100644
View file @ 53e2823d
@extends('layouts.user')
@section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
</ol>
</section>
<section class="section section-inset-1">
<div class="container">
<div class="row">
<div class="col-xs-12 section-inset-1">
<div class="table-responsive">
<table class="table table-hover text-left">
<thead>
<tr class="bg-dark">
<th>Tracking ID</th>
<th>Name</th>
<th>Status</th>
<th>Parcel weight</th>
<th>Total Items</th>
<th>Total Price</th>
<th>Manage</th>
</tr>
</thead>
<tbody>
@foreach($units as $unit)
<tr>
<td>{{ $unit->tracking_number }}</td>
<td><a href="#">{{ $unit->name }}</a></td>
<td><p class="font-secondary h6">{{ $unit->status }}</p>
</td>
<td>{{ $unit->weight }}</td>
<td>
<label>
{{--{{ $unit->items->count() }}--}}
</label>
</form>
</td>
<td>${{ $unit->price }}</td>
<td>
@if($unit->status == 1)
<i class="fa fa-money"></i>
@endif
<i class="fa fa-pencil"></i>
<i class="fa fa-times-circle"></i>
</td>
</tr>
@endforeach
</tr>
</tbody>
</table>
</div>
<!-- RD Mailform-->
<a href="/packages/addr" class="btn btn-primary btn-sm pull-sm-right" >Add Order</a>
</div>
</div>
</div>
</section>
@endsection
resources/views/pages/profile/user.blade.php
View file @ 53e2823d
@extends('layouts.app')
@section('page-title', 'Мои посылки')
@section('content')
<div class="py-5 text-center">
<img class="d-block mx-auto mb-4" src="{{ url('images/ship/man.png') }}" alt="" width="72" height="72">
<h2>Мой профиль</h2>
<p class="lead">Хотите узнать <a href="#" class="link-tag">адреса складов в США</a>, <a href="#" class="link-tag"> пополнить баланс</a>, <a href="#" class="link-tag">редактировать инфо профиля</a>, <a href="#" class="link-tag">посмотреть историю транзакций</a>? Тогда, вам сюда :)</p>
</div>
@extends('layouts.user')
<div class="row">
<div class="col-md-7 mb-4">
<h4 class="d-flex justify-content-between align-items-center mb-3">
<span class="text-muted">Ваши адреса складов в США</span>
</h4>
<div class="card shadow address-envelope" style="background: #f8f9fa">
<div class="card-body bg-white">
{{--<h5 class="card-title" style="color: #004085">New Hampshire</h5>--}}
<p class="card-text">Наш склад находится в <span class="text-success">безналоговом</span> штате, покупая в магазинах США вы платите <span class="text-success">0%</span> налога.</p>
</div>
<ul class="list-group list-group-flush" style="color: #004085">
<li class="list-group-item"><strong>{{ $user->firstname }} {{ $user->lastname }}</strong></li>
<li class="list-group-item">
<strong>
Fazo Cargo LLC<br />
97 Quentin Rd, 1st floor,<br />
Brooklyn, NY 11223
</strong>
@section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">Home</a></li>
<li>Profile
</li>
<li class="list-group-item" style="background: #f8f9fa"><strong>1 (302)11111111</strong></li>
</ul>
</div>
</div>
<div class="col-md-5 mb-4">
<h4 class="d-flex justify-content-between align-items-center mb-3">
<span class="text-muted">Информация профиля</span>
</h4>
<div class="card border-info" style="">
<div class="card-body">
<h5 class="card-title" style="color: #004085">Пополнение счета</h5>
<p class="card-text">
<div class="input-group input-group-sm">
<div class="input-group-prepend input-group-sm">
<span class="input-group-text">$</span>
</div>
<input type="number" class="form-control form-control-sm" id="username" placeholder="Username" value="0">
<div class="input-group-append input-group-sm">
<input type="submit" class="btn btn-success" value="Пополнить" />
</div>
<li class="active">Info</li>
</ol>
</section>
<section class="grid">
<section class="section section-inset-1">
<div class="container">
<h5 class="text-center">Profile</h5>
<hr>
<div class="row offset-5">
<div class="col-xs-4">
<div class="well4 bg-light">
<h5>{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5>
<p class="text-sm-left">97 Quentin Road,</p>
<p class="text-sm-left">ID {{ Auth::user()->id }}-FZ</p>
<p class="text-sm-left">Brooklyn, NY 11234</p>
<p class="text-sm-left">(347) 547-9797</p>
</div>
</div>
<div class="col-xs-6">
<form action="{{ route('profile.save') }}" method="post" >
<div class="row row-10">
<div class="col-xs-12 col-sm-6 right-col">
<div class="form-wrap">
<label class="form-label" for="forms-check-country1">Firstname...</label>
<input class="form-input" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required">
</div>
</p>
</div>
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center h4" style="background: #eee">Ваш счет: <span class="text-success"><strong>$10</strong></span></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Имя <strong>{{ $user->firstname }} {{ $user->lastname }}</strong></li>
<li class="list-group-item d-flex justify-content-between align-items-center">E-mail <strong>{{ $user->email }}</strong></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Телефон <strong>+998{{ $user->phone }}</strong></li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<a href="{{ url('/profile/edit/') }}" class="btn btn-success mr-2">Редактировать профиль</a>
<a href="{{ url('/profile/password/') }}" class="btn btn-outline-secondary">Изменить пароль</a>
</li>
</ul>
<div class="col-xs-12 col-sm-6 left-col">
<div class="form-wrap">
<label class="form-label" for="forms-check-country1">Lastname...</label>
<input class="form-input" id="forms-check-country1" value="{{ Auth::user()->lastname }}" type="text" name="lastname" data-constraints="@Required">
</div>
</div>
<div class="col-xs-12 col-sm-6 right-col">
<div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Email...</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="email" value="{{ Auth::user()->email }}" data-constraints="@Required">
</div>
<div class="row">
<div class="col-md-12">
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Адреса для доставки</a>
</li>
<li class="nav-item">
<a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">История платежей</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
<div class="mt-5">
<a href="{{ url('/profile/address/add') }}" class="btn btn-success mb-3">Добавить новый адрес</a>
{!! view('pages.profile.addresses', ['addresses' => $addresses]) !!}
</div>
<div class="col-xs-12 col-sm-6 left-col">
<div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Phone...</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required">
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<div class="mt-5">
{!! view('pages.profile.transactions') !!}
</div>
</div>
<button class="btn btn-primary btn-xs" >Save</button>
</form>
</div>
</div>
</div>
</section>
</section>
@endsection
routes/web.php
View file @ 53e2823d
......@@ -12,7 +12,7 @@
*/
Route::get('/', function () {
return view('welcome');
return view('main');
});
//
//Auth::routes();
......@@ -35,11 +35,15 @@ Route::get('/about', function () {
Route::get('/contacts', function () {
return view('contacts');
});
Route::post('/feedback/add', 'FeedbackController@addGuest');
Route::get('/packages/pay', 'PackagesController@pay');
Route::get('/packages/addr', 'PackagesController@addr');
Route::get('/profile/address', 'ProfileController@address');
Route::get('/packages', 'PackagesController@index')->name('package');
Route::get('/profile/address', 'ProfileController@address')->name('address');
Route::get('/profile/addaddress', 'ProfileController@addaddress');
Route::get('/profile', 'ProfileController@profile');
Route::post('/profile/save', 'ProfileController@save')->name('profile.save');
Route::get('/packages/list', 'PackagesController@pending_packages');
Route::get('/packages/pending', 'PackagesController@pending_packages');
......
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