|
@@ -2,8 +2,7 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Mine/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/api.php" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -54,10 +53,10 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/Api/TokenController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/Api/TokenController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="416">
|
|
|
|
|
|
+ <state relative-caret-position="415">
|
|
<caret line="67" column="25" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
|
|
<caret line="67" column="25" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#138#159#0#PHP" expanded="true" />
|
|
<element signature="e#138#159#0#PHP" expanded="true" />
|
|
@@ -89,7 +88,7 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="315">
|
|
<state relative-caret-position="315">
|
|
@@ -98,15 +97,6 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="553">
|
|
|
|
- <caret line="36" column="21" selection-start-line="36" selection-start-column="21" selection-end-line="36" selection-end-column="21" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
</leaf>
|
|
</leaf>
|
|
</component>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
@@ -118,6 +108,7 @@
|
|
<find>findForPassport</find>
|
|
<find>findForPassport</find>
|
|
<find>OAUTH_GRANT_TYPE</find>
|
|
<find>OAUTH_GRANT_TYPE</find>
|
|
<find>create</find>
|
|
<find>create</find>
|
|
|
|
+ <find>:</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -423,11 +414,10 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="13885000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="14178000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
- <editor active="true" />
|
|
|
|
<layout>
|
|
<layout>
|
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17453505" />
|
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17453505" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
@@ -705,46 +695,47 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/auth.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="447">
|
|
|
|
- <caret line="22" column="35" lean-forward="true" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="35" />
|
|
|
|
|
|
+ <state relative-caret-position="304">
|
|
|
|
+ <caret line="39" column="30" selection-start-line="39" selection-start-column="30" selection-end-line="39" selection-end-column="30" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/passport.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="475">
|
|
|
|
- <caret line="58" column="68" selection-start-line="58" selection-start-column="68" selection-end-line="58" selection-end-column="68" />
|
|
|
|
|
|
+ <state relative-caret-position="294">
|
|
|
|
+ <caret line="19" column="2" lean-forward="true" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/config/auth.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="304">
|
|
|
|
- <caret line="39" column="30" selection-start-line="39" selection-start-column="30" selection-end-line="39" selection-end-column="30" />
|
|
|
|
|
|
+ <state relative-caret-position="315">
|
|
|
|
+ <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/config/passport.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="294">
|
|
|
|
- <caret line="19" column="2" lean-forward="true" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
|
|
|
|
|
|
+ <state relative-caret-position="475">
|
|
|
|
+ <caret line="58" column="68" selection-start-line="58" selection-start-column="68" selection-end-line="58" selection-end-column="68" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/Api/TokenController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="416">
|
|
|
|
- <caret line="67" column="25" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#138#159#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="447">
|
|
|
|
+ <caret line="22" column="35" lean-forward="true" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="35" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/routes/api.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="84">
|
|
|
|
+ <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/api.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -753,17 +744,23 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/routes/api.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/Api/TokenController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="84">
|
|
|
|
- <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
|
|
|
|
|
|
+ <state relative-caret-position="415">
|
|
|
|
+ <caret line="67" column="25" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#138#159#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/:">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="315">
|
|
|
|
- <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
|
|
|
|
|
|
+ <state relative-caret-position="147">
|
|
|
|
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|