1
0
forked from s421507/eOSP2
This commit is contained in:
s421507 2020-08-02 19:10:32 +02:00
parent e967762622
commit c277f77f8f
5 changed files with 24 additions and 158 deletions

8
.idea/eOSP3.iml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/../eOSP/.idea/eOSP.iml" filepath="$PROJECT_DIR$/../eOSP/.idea/eOSP.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/eOSP3.iml" filepath="$PROJECT_DIR$/.idea/eOSP3.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View File

@ -2,5 +2,6 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/eOSP2" vcs="Git" />
</component> </component>
</project> </project>

View File

@ -1,51 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="adc1032e-2c5f-4e68-bc22-d140f965f9d5" name="Default Changelist" comment=""> <list default="true" id="cbf98ec0-77c0-422b-85b4-f0d9dbb3b1d9" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/documentOverlayController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/documentOverlayController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/login.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/login.blade.php" 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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="ComposerSettings" doNotAsk="true"> <component name="ComposerSettings">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
<execution> <execution>
<executable /> <executable />
</execution> </execution>
</component> </component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
<item name="MySQL - homestead@127.0.0.1" type="feb32156:DbDataSourceImpl" />
</path>
</expand>
<select />
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="IgnoredFileRootStore"> <component name="PhpWorkspaceProjectConfiguration">
<option name="generatedRoots">
<set>
<option value="C:\Users\czup\PhpstormProjects\eOSP2\.idea" />
</set>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.2">
<include_path> <include_path>
<path value="$PROJECT_DIR$/vendor/monolog/monolog" /> <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/lcobucci/jwt" /> <path value="$PROJECT_DIR$/vendor/lcobucci/jwt" />
@ -151,152 +127,33 @@
<path value="$PROJECT_DIR$/vendor/setasign/fpdi-fpdf" /> <path value="$PROJECT_DIR$/vendor/setasign/fpdi-fpdf" />
</include_path> </include_path>
</component> </component>
<component name="ProjectId" id="1W91DnkrissSXi0FRsBOInYJNVt" /> <component name="ProjectId" id="1fYGfYgzMx5ivxG1B92kGmdiogy" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" /> <option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="DatabaseDriversLRU" value="mysql" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="js.buildTools.grunt.grunt-cli.package" value="" />
<property name="js.buildTools.gulp.gulp_package_dir" value="" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/database/migrations/a" />
<property name="nodejs.jest.jest_package" value="" />
<property name="nodejs.mocha.mocha_node_package_dir" value="" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="database.main" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\czup\PhpstormProjects\eOSP2\app\Common\fonts" />
<recent name="C:\Users\czup\PhpstormProjects\eOSP2\resources\views" />
<recent name="$PROJECT_DIR$/database/migrations" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\czup\PhpstormProjects\eOSP2\database\migrations\a" />
<recent name="C:\Users\czup\PhpstormProjects\eOSP2\app\Common" />
<recent name="C:\Users\czup\PhpstormProjects\eOSP2\public\img\left_menu_icon" />
<recent name="C:\Users\czup\PhpstormProjects\eOSP2\app\Http\Controllers" />
<recent name="C:\Users\czup\PhpstormProjects\eOSP2" />
</key>
</component>
<component name="RunManager">
<configuration name="Unnamed" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="sourceFilePath" value="composer.json" />
</settings>
</deployment>
<method v="2" />
</configuration>
<configuration default="true" type="js.build_tools.grunt">
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
<configuration default="true" type="js.build_tools.gulp">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
<method v="2" />
</configuration>
</component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</component> </component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="adc1032e-2c5f-4e68-bc22-d140f965f9d5" name="Default Changelist" comment="" /> <changelist id="cbf98ec0-77c0-422b-85b4-f0d9dbb3b1d9" name="Default Changelist" comment="" />
<created>1562880822430</created> <created>1596387716447</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1562880822430</updated> <updated>1596387716447</updated>
<workItem from="1562880823859" duration="7000" /> <workItem from="1596387717887" duration="59000" />
<workItem from="1562880905757" duration="737000" /> <workItem from="1596388128573" duration="74000" />
<workItem from="1562881688607" duration="256000" />
<workItem from="1578546881124" duration="357000" />
<workItem from="1578547239701" duration="71154000" />
<workItem from="1579902704711" duration="32414000" />
<workItem from="1582764640549" duration="1792000" />
<workItem from="1583241286680" duration="2723000" />
<workItem from="1583256092210" duration="1716000" />
<workItem from="1583259193503" duration="1024000" />
<workItem from="1583260243594" duration="455000" />
<workItem from="1583260725384" duration="4320000" />
<workItem from="1583291158284" duration="2109000" />
<workItem from="1583293521736" duration="3253000" />
<workItem from="1583481374417" duration="1883000" />
<workItem from="1583491952975" duration="11797000" />
<workItem from="1583814153373" duration="3685000" />
<workItem from="1583818172415" duration="297000" />
<workItem from="1584513032559" duration="4015000" />
<workItem from="1585008405211" duration="2237000" />
<workItem from="1585202168173" duration="6752000" />
<workItem from="1586389118250" duration="3243000" />
<workItem from="1587752993410" duration="614000" />
<workItem from="1591804585624" duration="4930000" />
<workItem from="1591847981434" duration="11876000" />
<workItem from="1592234696135" duration="608000" />
<workItem from="1592243087933" duration="42000" />
<workItem from="1592276510207" duration="28000" />
<workItem from="1592478779386" duration="40397000" />
<workItem from="1593829053562" duration="35796000" />
<workItem from="1595090372365" duration="29297000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="WindowStateProjectService">
<state x="912" y="146" width="424" height="484" key="FileChooserDialogImpl" timestamp="1592276535446">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="912" y="146" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1592276535446" />
<state x="559" y="267" key="NewPhpClassDialog" timestamp="1594782484572">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="559" y="267" key="NewPhpClassDialog/0.0.1536.824@0.0.1536.824" timestamp="1594782484572" />
<state x="519" y="347" key="NewPhpFileDialog" timestamp="1593832676565">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="519" y="347" key="NewPhpFileDialog/0.0.1536.824@0.0.1536.824" timestamp="1593832676565" />
<state x="195" y="58" key="SettingsEditor" timestamp="1595262884399">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="195" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1595262884399" />
<state x="482" y="276" key="com.intellij.ide.util.TipDialog" timestamp="1595090435150">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="482" y="276" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1595090435150" />
<state x="342" y="189" key="run.anything.popup" timestamp="1592234653450">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="342" y="189" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1592234653450" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1593834623262">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1593834623262" />
</component>
</project> </project>

View File

@ -12,7 +12,7 @@
@endif @endif
@if( auth()->check()) @if( auth()->check())
Jesteś już zalogowany. Jesteś już zalogowany. xd
@else @else
<h2>Zaloguj się</h2> <h2>Zaloguj się</h2>