|
@@ -2,17 +2,8 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/app/Enum/ApiEnum.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" afterDir="false" />
|
|
|
- <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$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/app/Helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Helpers.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/resources/lang/en/auth.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/en/auth.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -37,8 +28,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="336">
|
|
|
- <caret line="16" column="28" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="28" />
|
|
|
+ <state relative-caret-position="357">
|
|
|
+ <caret line="17" column="3" lean-forward="true" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -46,8 +37,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
|
|
+ <state relative-caret-position="399">
|
|
|
+ <caret line="24" column="46" lean-forward="true" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="46" />
|
|
|
<folding>
|
|
|
<element signature="e#139#183#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -58,17 +49,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="208">
|
|
|
- <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="117">
|
|
|
- <caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="145">
|
|
|
+ <caret line="61" column="7" lean-forward="true" selection-start-line="61" selection-start-column="7" selection-end-line="61" selection-end-column="7" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -85,8 +67,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="137">
|
|
|
- <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="340">
|
|
|
+ <caret line="37" column="46" lean-forward="true" selection-start-line="37" selection-start-column="46" selection-end-line="37" selection-end-column="46" />
|
|
|
<folding>
|
|
|
<element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -94,11 +76,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="525">
|
|
|
- <caret line="30" column="24" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="504">
|
|
|
+ <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -186,16 +168,16 @@
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Helpers.php" />
|
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log" />
|
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
|
|
|
<option value="$PROJECT_DIR$/resources/lang/en/auth.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -466,12 +448,12 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1618368322468</updated>
|
|
|
<workItem from="1618368323697" duration="143000" />
|
|
|
- <workItem from="1618368497550" duration="120868000" />
|
|
|
+ <workItem from="1618368497550" duration="122673000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="121011000" />
|
|
|
+ <option name="totallyTimeSpent" value="122816000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -787,92 +769,92 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="525">
|
|
|
- <caret line="30" column="24" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="2996">
|
|
|
+ <caret line="157" column="45" selection-start-line="144" selection-start-column="7" selection-end-line="157" selection-end-column="45" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Validation/ValidationException.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="336">
|
|
|
- <caret line="16" column="28" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="28" />
|
|
|
+ <state relative-caret-position="323">
|
|
|
+ <caret line="71" column="42" selection-start-line="71" selection-start-column="42" selection-end-line="71" selection-end-column="42" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/resources/lang/en/auth.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="137">
|
|
|
- <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
|
|
|
- <folding>
|
|
|
- <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="336">
|
|
|
+ <caret line="16" column="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
|
|
- <folding>
|
|
|
- <element signature="e#139#183#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="-738">
|
|
|
+ <caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2996">
|
|
|
- <caret line="157" column="45" selection-start-line="144" selection-start-column="7" selection-end-line="157" selection-end-column="45" />
|
|
|
- <folding>
|
|
|
- <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="102" column="40" selection-start-line="102" selection-start-column="23" selection-end-line="102" selection-end-column="40" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="208">
|
|
|
- <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="145">
|
|
|
+ <caret line="61" column="7" lean-forward="true" selection-start-line="61" selection-start-column="7" selection-end-line="61" selection-end-column="7" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Validation/ValidationException.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="323">
|
|
|
- <caret line="71" column="42" selection-start-line="71" selection-start-column="42" selection-end-line="71" selection-end-column="42" />
|
|
|
+ <state relative-caret-position="147">
|
|
|
+ <caret line="7" column="46" lean-forward="true" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/resources/lang/en/auth.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="336">
|
|
|
- <caret line="16" column="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="357">
|
|
|
+ <caret line="17" column="3" lean-forward="true" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="168">
|
|
|
- <caret line="8" column="45" lean-forward="true" selection-start-line="8" selection-start-column="45" selection-end-line="8" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="399">
|
|
|
+ <caret line="24" column="46" lean-forward="true" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="46" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#139#183#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="102" column="40" selection-start-line="102" selection-start-column="23" selection-end-line="102" selection-end-column="40" />
|
|
|
+ <state relative-caret-position="340">
|
|
|
+ <caret line="37" column="46" lean-forward="true" selection-start-line="37" selection-start-column="46" selection-end-line="37" selection-end-column="46" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="117">
|
|
|
- <caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="504">
|
|
|
+ <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|