Skip to content

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

New user panel

parent f0ef0c83
Show whitespace changes
Inline Side-by-side
Showing with 329 additions and 195 deletions
.idea/workspace.xml
View file @ 4e1568f5
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment=""> <list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resources/views/layouts/user_new.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$/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" /> <change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -26,10 +29,10 @@ ...@@ -26,10 +29,10 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="css" value="3" /> <entry key="css" value="5" />
<entry key="env" value="1" /> <entry key="env" value="1" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="109" /> <entry key="php" value="111" />
<entry key="png" value="4" /> <entry key="png" value="4" />
<entry key="svg" value="1" /> <entry key="svg" value="1" />
<entry key="woff2" value="1" /> <entry key="woff2" value="1" />
...@@ -37,8 +40,8 @@ ...@@ -37,8 +40,8 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Blade" value="53" /> <entry key="Blade" value="55" />
<entry key="CSS" value="3" /> <entry key="CSS" value="5" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="56" /> <entry key="PHP" value="56" />
<entry key="PLAIN_TEXT" value="2" /> <entry key="PLAIN_TEXT" value="2" />
...@@ -47,15 +50,15 @@ ...@@ -47,15 +50,15 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="css" value="12" /> <entry key="css" value="14" />
<entry key="env" value="15" /> <entry key="env" value="15" />
<entry key="php" value="15454" /> <entry key="php" value="15867" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Blade" value="8800" /> <entry key="Blade" value="9213" />
<entry key="CSS" value="12" /> <entry key="CSS" value="14" />
<entry key="PHP" value="6654" /> <entry key="PHP" value="6654" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
</counts> </counts>
...@@ -63,6 +66,8 @@ ...@@ -63,6 +66,8 @@
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6295302">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
...@@ -94,26 +99,22 @@ ...@@ -94,26 +99,22 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3519"> <state relative-caret-position="3009">
<caret line="207" column="166" selection-start-line="207" selection-start-column="166" selection-end-line="207" selection-end-column="166" /> <caret line="177" column="18" selection-start-line="177" selection-start-column="18" selection-end-line="177" selection-end-column="18" />
</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$/routes/web.php"> <entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="64" column="82" selection-start-line="64" selection-start-column="82" selection-end-line="64" selection-end-column="82" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595"> <state relative-caret-position="23999">
<caret line="35" column="32" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" /> <caret column="95065" selection-start-column="95065" selection-end-column="95065" />
<folding>
<element signature="e#282724#356207#2" expanded="true" />
<element signature="e#441205#442574#2" expanded="true" />
<element signature="e#442729#444094#2" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -139,20 +140,43 @@ ...@@ -139,20 +140,43 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<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="357"> <state relative-caret-position="493">
<caret line="21" selection-start-line="21" selection-end-line="21" /> <caret line="38" column="26" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="94" column="10" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding> <folding>
<marker date="1560339949592" expanded="true" signature="1404:1458" ph="..." /> <element signature="e#4545#4551#0#HTML" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
</split-first>
<split-second>
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="39" column="59" selection-start-line="39" selection-start-column="59" selection-end-line="39" selection-end-column="59" />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>index</find>
<find>adminstyles</find> <find>adminstyles</find>
<find>images</find> <find>images</find>
<find>Dashboard</find> <find>Dashboard</find>
...@@ -182,6 +206,7 @@ ...@@ -182,6 +206,7 @@
<find>pending_packages</find> <find>pending_packages</find>
<find>register</find> <find>register</find>
<find>exists</find> <find>exists</find>
<find>Декларация</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -223,16 +248,17 @@ ...@@ -223,16 +248,17 @@
<option value="$PROJECT_DIR$/resources/views/layouts/admin.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$/resources/views/main.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.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/about.blade.php" />
<option value="$PROJECT_DIR$/resources/views/contacts.blade.php" /> <option value="$PROJECT_DIR$/resources/views/contacts.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" /> <option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/public/css/style.css" />
<option value="$PROJECT_DIR$/public/frontend/css/style.css" />
<option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.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/layouts/user.blade.php" />
</list> </list>
</option> </option>
...@@ -396,6 +422,24 @@ ...@@ -396,6 +422,24 @@
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" /> <item name="config" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="frontend" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="frontend" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
...@@ -497,12 +541,12 @@ ...@@ -497,12 +541,12 @@
<workItem from="1559392286763" duration="1822000" /> <workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" /> <workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" /> <workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="30771000" /> <workItem from="1560092291448" duration="36137000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="104968000" /> <option name="totallyTimeSpent" value="110334000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
...@@ -521,7 +565,7 @@ ...@@ -521,7 +565,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <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="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="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.21702127" /> <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.21702127" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" /> <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="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -529,6 +573,28 @@ ...@@ -529,6 +573,28 @@
<window_info anchor="right" id="Remote Host" order="3" /> <window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" /> <window_info anchor="right" id="Database" order="4" />
</layout> </layout>
<layout-to-restore>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22550336" />
<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" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.21702127" />
<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" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" />
</layout-to-restore>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
...@@ -563,13 +629,6 @@ ...@@ -563,13 +629,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/users/user_list.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="424">
<caret line="52" column="51" lean-forward="true" selection-end-line="57" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/declarations/index.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/admin/declarations/index.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-133"> <state relative-caret-position="-133">
...@@ -726,33 +785,9 @@ ...@@ -726,33 +785,9 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret column="153397" selection-start-column="153392" selection-end-column="153397" />
<folding>
<element signature="e#282780#356263#2" expanded="true" />
<element signature="e#441261#442630#2" expanded="true" />
<element signature="e#442785#444150#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/frontend/fonts/fontawesome-webfont.woff2"> <entry file="file://$PROJECT_DIR$/public/frontend/fonts/fontawesome-webfont.woff2">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret column="96929" selection-start-column="96924" selection-end-column="96929" />
<folding>
<element signature="e#282780#356263#2" expanded="true" />
<element signature="e#441261#442630#2" expanded="true" />
<element signature="e#442785#444150#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="486">
...@@ -872,13 +907,6 @@ ...@@ -872,13 +907,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3519">
<caret line="207" column="166" selection-start-line="207" selection-start-column="166" selection-end-line="207" selection-end-column="166" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.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="-149"> <state relative-caret-position="-149">
...@@ -921,15 +949,53 @@ ...@@ -921,15 +949,53 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php"> <entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="23999">
<caret line="21" selection-start-line="21" selection-end-line="21" /> <caret column="95065" selection-start-column="95065" selection-end-column="95065" />
<folding> <folding>
<marker date="1560339949592" expanded="true" signature="1404:1458" ph="..." /> <element signature="e#282724#356207#2" expanded="true" />
<element signature="e#441205#442574#2" expanded="true" />
<element signature="e#442729#444094#2" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret column="152275" lean-forward="true" selection-start-column="152275" selection-end-column="152275" />
<folding>
<element signature="e#282726#356209#2" expanded="true" />
<element signature="e#441207#442576#2" expanded="true" />
<element signature="e#442731#444096#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3009">
<caret line="177" column="18" selection-start-line="177" selection-start-column="18" selection-end-line="177" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="94" column="10" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding>
<element signature="e#4545#4551#0#HTML" expanded="true" />
</folding>
</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="493">
<caret line="38" column="26" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="26" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
resources/views/addpackage.blade.php
View file @ 4e1568f5
@extends('layouts.user') @extends('layouts.user_new')
@section('content') @section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
</ol>
</section>
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-success bg-white p-5" novalidate> <form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-primary bg-white p-5" novalidate>
{{ csrf_field() }} {{ csrf_field() }}
<h4 class="d-flex justify-content-between align-items-center mb-3"> <h4 class="mb-5">
<span class="text-muted">Регистрация новой входящей посылки</span> <span class="text-muted">Регистрация новой входящей посылки</span>
</h4> </h4>
<div class="row"> <div class="row">
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
<label for="market_link">Ссылка на магазин в США</label> <label for="market_link">Ссылка на магазин в США</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" id="market_link" name="market_link" placeholder="" value="" required> <input type="text" class="form-control" id="market_link" name="market_link" placeholder="" value="" required>
<div class="invalid-feedback"> <div class="invalid-feedback">
Обязательное поле. Обязательное поле.
</div> </div>
</div> </div>
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
<label for="track_number">Трек номер посылки</label> <label for="track_number">Трек номер посылки</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" id="track_number" name="track_number" placeholder="" value="" required> <input type="text" class="form-control" id="track_number" name="track_number" placeholder="" value="" required>
<div class="invalid-feedback"> <div class="invalid-feedback">
Обязательное поле. Обязательное поле.
</div> </div>
...@@ -36,7 +31,7 @@ ...@@ -36,7 +31,7 @@
<div class="mb-3"> <div class="mb-3">
<label for="package_name">Название посылки</label> <label for="package_name">Название посылки</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" name="package_name" id="package_name"> <input type="text" class="form-control" name="package_name" id="package_name">
<div class="invalid-feedback"> <div class="invalid-feedback">
Пожалуйста введите название посылки Пожалуйста введите название посылки
</div> </div>
...@@ -44,19 +39,21 @@ ...@@ -44,19 +39,21 @@
<div class="mb-3"> <div class="mb-3">
<label for="comment">Комментарий к посылке</label> <label for="comment">Комментарий к посылке</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" name="comment" id="comment" > <input type="text" class="form-control" name="comment" id="comment" >
</div>
<div class="mb-3">
<label for="">Декларация посылки</label>
</div> </div>
<br/>
<h4>Декларация посылки</h4>
<table class="table table-hover text-left table-light " id="table_package"> <table class="table table-hover text-left table-light " id="table_package">
<thead class="thead-light"> <thead class="thead-light">
<tr class="d-flex"> <tr class="d-flex">
<th class="col-1 text-center">№</th> <th class="col-1 text-center">№</th>
<th class="col-3">Название товара</th> <th class="col-3">Название товара</th>
<th class="col-2">Количество</th> <th class="col-2">Количество (шт)</th>
<th class="col-2">Цена</th> <th class="col-2">Цена ($)</th>
<th class="col-2">Вес</th> <th class="col-2">Вес (кг)</th>
<th class="col-1">Стоим...</th> <th class="col-1">Стоим...</th>
<th class="col-1"></th> <th class="col-1"></th>
</tr> </tr>
...@@ -65,14 +62,11 @@ ...@@ -65,14 +62,11 @@
<tr class="d-flex"> <tr class="d-flex">
<td class="text-center col-1 counter_number">1</td> <td class="text-center col-1 counter_number">1</td>
<td class="col-3"> <td class="col-3">
<input type="text" name="item_name[]" class="form-input form-control-has-validation form-control-last-child" required /> <input type="text" name="item_name[]" class="form-control form-control-sm" required />
</td> </td>
<td class="col-2"> <td class="col-2">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<div class="input-group-prepend input-group-sm"> <input type="number" name="amount[]" class="form-control form-control-sm count" id="" value="1" required>
<span class="input-group-text">шт</span>
</div>
<input type="number" name="amount[]" class="form-input form-control-has-validation form-control-last-child count" id="" value="1" required>
<div class="invalid-feedback" > <div class="invalid-feedback" >
Укажите количество единиц товара Укажите количество единиц товара
</div> </div>
...@@ -80,10 +74,7 @@ ...@@ -80,10 +74,7 @@
</td> </td>
<td class="col-2"> <td class="col-2">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<div class="input-group-prepend input-group-sm"> <input type="number" name="price[]" class="form-control form-control-sm cost" id="" placeholder="Username" value="2" required>
<span class="input-group-text">$</span>
</div>
<input type="number" name="price[]" class="form-input form-control-has-validation form-control-last-child cost" id="" placeholder="Username" value="2" required>
<div class="invalid-feedback" > <div class="invalid-feedback" >
Укажите стоимость за единицу товара Укажите стоимость за единицу товара
</div> </div>
...@@ -91,10 +82,7 @@ ...@@ -91,10 +82,7 @@
</td> </td>
<td class="col-2"> <td class="col-2">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<div class="input-group-prepend input-group-sm"> <input type="number" step="0.1" name="weight[]" class="form-control form-control-sm" id="username" placeholder="Username" value="0.3" required>
<span class="input-group-text">кг</span>
</div>
<input type="number" step="0.1" name="weight[]" class="form-input form-control-has-validation form-control-last-child" id="username" placeholder="Username" value="0.3" required>
<div class="invalid-feedback" > <div class="invalid-feedback" >
Your username is required. Your username is required.
</div> </div>
...@@ -112,20 +100,13 @@ ...@@ -112,20 +100,13 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<a href="#" class="btn btn-sm btn-primary btn-primary-variant-1 btn-min-width-sm btn-shadow" id="add_new_packet"><strong>+ Добавить посылку</strong></a> <a href="#" class="btn btn-sm btn-primary btn-shadow" id="add_new_packet"><strong>+ Добавить посылку</strong></a>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
Итоговая сумма в декларации: <strong><span class="text-success" id="total_price">$2</span></strong> Итоговая сумма в декларации: <strong><span class="text-success" id="total_price">$2</span></strong>
</div> </div>
</div> </div>
<hr class="mb-4">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="same-address">
<label class="custom-control-label" for="same-address">Сделать фотографию посылки</label>
</div>
<hr class="mb-4">
<button class="btn btn-success btn-lg btn-block" type="submit">Зарегистрировать</button> <button class="btn btn-success btn-lg btn-block" type="submit">Зарегистрировать</button>
</form> </form>
</div> </div>
...@@ -176,14 +157,11 @@ ...@@ -176,14 +157,11 @@
$('#table_package > tbody:last-child').append('<tr class="d-flex">\n' + $('#table_package > tbody:last-child').append('<tr class="d-flex">\n' +
' <td class="text-center col-1 counter_number">' + counter + '</td>\n' + ' <td class="text-center col-1 counter_number">' + counter + '</td>\n' +
' <td class="col-3">\n' + ' <td class="col-3">\n' +
' <input type="text" name="item_name[]" class="form-input form-control-has-validation form-control-last-child" required />\n' + ' <input type="text" name="item_name[]" class="form-control form-control-sm" required />\n' +
' </td>\n' + ' </td>\n' +
' <td class="col-2">\n' + ' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' + ' <div class="input-group input-group-sm">\n' +
' <div class="input-group-prepend input-group-sm">\n' + ' <input type="number" name="amount[]" class="form-control form-control-sm count" id="" value="1" required>\n' +
' <span class="input-group-text">шт</span>\n' +
' </div>\n' +
' <input type="number" name="amount[]" class="form-input form-control-has-validation form-control-last-child count" id="" value="1" required>\n' +
' <div class="invalid-feedback" >\n' + ' <div class="invalid-feedback" >\n' +
' Укажите количество единиц товара\n' + ' Укажите количество единиц товара\n' +
' </div>\n' + ' </div>\n' +
...@@ -191,10 +169,7 @@ ...@@ -191,10 +169,7 @@
' </td>\n' + ' </td>\n' +
' <td class="col-2">\n' + ' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' + ' <div class="input-group input-group-sm">\n' +
' <div class="input-group-prepend input-group-sm">\n' + ' <input type="number" name="price[]" class="form-control form-control-sm cost" id="" placeholder="Username" value="2" required>\n' +
' <span class="input-group-text">$</span>\n' +
' </div>\n' +
' <input type="number" name="price[]" class="form-input form-control-has-validation form-control-last-child cost" id="" placeholder="Username" value="2" required>\n' +
' <div class="invalid-feedback" >\n' + ' <div class="invalid-feedback" >\n' +
' Укажите стоимость за единицу товара\n' + ' Укажите стоимость за единицу товара\n' +
' </div>\n' + ' </div>\n' +
...@@ -202,10 +177,7 @@ ...@@ -202,10 +177,7 @@
' </td>\n' + ' </td>\n' +
' <td class="col-2">\n' + ' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' + ' <div class="input-group input-group-sm">\n' +
' <div class="input-group-prepend input-group-sm">\n' + ' <input type="number" step="0.1" name="weight[]" class="form-control form-control-sm" id="username" placeholder="Username" value="0.3" required>\n' +
' <span class="input-group-text">кг</span>\n' +
' </div>\n' +
' <input type="number" step="0.1" name="weight[]" class="form-input form-control-has-validation form-control-last-child" id="username" placeholder="Username" value="0.3" required>\n' +
' <div class="invalid-feedback" >\n' + ' <div class="invalid-feedback" >\n' +
' Your username is required.\n' + ' Your username is required.\n' +
' </div>\n' + ' </div>\n' +
......
resources/views/layouts/user.blade.php
View file @ 4e1568f5
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<!-- Stylesheets--> <!-- Stylesheets-->
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);"> href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700%7COpen+Sans:400,300);">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="/frontend/css/style.css"> <link rel="stylesheet" href="/frontend/css/style.css">
</head> </head>
......
resources/views/layouts/user_new.blade.php 0 → 100644
View file @ 4e1568f5
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>FazoShop.us</title>
<link rel="canonical" href="https://getbootstrap.com/docs/4.3/examples/pricing/">
<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<style>
body {
background-color: #fbfbfb!important;
}
.bd-placeholder-img {
font-size: 1.125rem;
text-anchor: middle;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
@media (min-width: 768px) {
.bd-placeholder-img-lg {
font-size: 3.5rem;
}
}
</style>
<!-- Custom styles for this template -->
<link href="pricing.css" rel="stylesheet">
</head>
<body>
<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
<h5 class="my-0 mr-md-auto font-weight-normal">Fazoshop</h5>
<nav class="my-2 my-md-0 mr-md-3">
<a class="p-2 text-dark" href="#">На главную</a>
<a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a>
<a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a>
<a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a>
</nav>
<a class="btn btn-outline-primary" href="#">Sign up</a>
</div>
<div class="container">
<div class="row">
<div class="col-12">
@yield('content')
<footer class="pt-4 my-md-5 pt-md-5 border-top">
<div class="row">
<div class="col-12 col-md">
<img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
<small class="d-block mb-3 text-muted">&copy; 2017-2019</small>
</div>
<div class="col-6 col-md">
<h5>Features</h5>
<ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Cool stuff</a></li>
<li><a class="text-muted" href="#">Random feature</a></li>
<li><a class="text-muted" href="#">Team feature</a></li>
<li><a class="text-muted" href="#">Stuff for developers</a></li>
<li><a class="text-muted" href="#">Another one</a></li>
<li><a class="text-muted" href="#">Last time</a></li>
</ul>
</div>
<div class="col-6 col-md">
<h5>Resources</h5>
<ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Resource</a></li>
<li><a class="text-muted" href="#">Resource name</a></li>
<li><a class="text-muted" href="#">Another resource</a></li>
<li><a class="text-muted" href="#">Final resource</a></li>
</ul>
</div>
<div class="col-6 col-md">
<h5>About</h5>
<ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Team</a></li>
<li><a class="text-muted" href="#">Locations</a></li>
<li><a class="text-muted" href="#">Privacy</a></li>
<li><a class="text-muted" href="#">Terms</a></li>
</ul>
</div>
</div>
</footer>
</div>
</div>
</div>
</body>
</html>
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