Skip to content

A
awesomelands
Commit f52dd21b by Pavle Opric
Options

implementirane admin funkcije

parent 0f9867f3
Showing with 41 additions and 520 deletions
.idea/compiler.xml
......@@ -15,7 +15,4 @@
<module name="registration-login-spring-boot-security-thymeleaf" options="-parameters" />
</option>
</component>
<component name="TypeScriptCompiler">
<option name="recompileOnChanges" value="true" />
</component>
</project>
\ No newline at end of file
.idea/jpa-buddy.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JpaBuddyIdeaProjectConfig">
<option name="defaultUnitInitialized" value="true" />
<option name="renamerInitialized" value="true" />
</component>
</project>
\ No newline at end of file
.idea/misc.xml
......@@ -11,7 +11,4 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="ProjectType">
<option name="id" value="jpab" />
</component>
</project>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26_[Default_Changelist]/shelved.patch deleted 100644 → 0
Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"ALL\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"6e82c7f1-3949-40e2-bc26-7eb50b36f993\" name=\"Default Changelist\" comment=\"dodata ulogovana verzija\">\r\n <change beforePath=\"$PROJECT_DIR$/.idea/workspace.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/workspace.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/resources/templates/index.html\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/resources/templates/index.html\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/resources/templates/loggedin.html\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/resources/templates/loggedin.html\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/resources/templates/property.html\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/resources/templates/property.html\" afterDir=\"false\" />\r\n </list>\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"HTML File\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"IdeDocumentHistory\">\r\n <option name=\"CHANGED_PATHS\">\r\n <list>\r\n <option value=\"$PROJECT_DIR$/src/main/resources/templates/login.html\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"JpbToolWindowState\">\r\n <option name=\"myId2FirstActivated\">\r\n <map>\r\n <entry key=\"com.haulmont.jpb.jpaInspector\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaPalette\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaStructure\" value=\"true\" />\r\n </map>\r\n </option>\r\n <option name=\"myId2Visible\">\r\n <map>\r\n <entry key=\"com.haulmont.jpb.jpaInspector\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaPalette\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaStructure\" value=\"true\" />\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"MavenProjectNavigator\">\r\n <treeState>\r\n <expand>\r\n <path>\r\n <item name=\"\" type=\"16c1761:MavenProjectsStructure$RootNode\" />\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"9519ce18:MavenProjectsStructure$ProjectNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </treeState>\r\n </component>\r\n <component name=\"ProjectFrameBounds\" extendedState=\"6\">\r\n <option name=\"x\" value=\"10\" />\r\n <option name=\"y\" value=\"20\" />\r\n <option name=\"width\" value=\"1004\" />\r\n <option name=\"height\" value=\"688\" />\r\n </component>\r\n <component name=\"ProjectId\" id=\"2EwILGSPKCVn860rmBDBYR0jn3o\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\">\r\n <ConfirmationsSetting value=\"2\" id=\"Add\" />\r\n </component>\r\n <component name=\"ProjectView\">\r\n <navigator proportions=\"\" version=\"1\">\r\n <foldersAlwaysOnTop value=\"true\" />\r\n </navigator>\r\n <panes>\r\n <pane id=\"Scope\" />\r\n <pane id=\"ProjectPane\">\r\n <subPane>\r\n <expand>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"app\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"app\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"config\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"app\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"model\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"resources\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"resources\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"templates\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </subPane>\r\n </pane>\r\n <pane id=\"PackagesPane\" />\r\n </panes>\r\n </component>\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"ASKED_ADD_EXTERNAL_FILES\": \"true\",\r\n \"DefaultHtmlFileTemplate\": \"HTML File\",\r\n \"RequestMappingsPanelOrder0\": \"0\",\r\n \"RequestMappingsPanelOrder1\": \"1\",\r\n \"RequestMappingsPanelWidth0\": \"75\",\r\n \"RequestMappingsPanelWidth1\": \"75\",\r\n \"SHARE_PROJECT_CONFIGURATION_FILES\": \"true\",\r\n \"WebServerToolWindowFactoryState\": \"false\",\r\n \"spring.configuration.checksum\": \"bb9bda38566c870d6f3a70881ab7a768\"\r\n }\r\n}]]></component>\r\n <component name=\"RunManager\">\r\n <configuration name=\"Aplikacija\" type=\"SpringBootApplicationConfigurationType\" factoryName=\"Spring Boot\">\r\n <module name=\"registration-login-spring-boot-security-thymeleaf\" />\r\n <option name=\"SPRING_BOOT_MAIN_CLASS\" value=\"app.Aplikacija\" />\r\n <method v=\"2\">\r\n <option name=\"Make\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"SvnConfiguration\">\r\n <configuration />\r\n </component>\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"6e82c7f1-3949-40e2-bc26-7eb50b36f993\" name=\"Default Changelist\" comment=\"\" />\r\n <created>1663427032475</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1663427032475</updated>\r\n <workItem from=\"1663427050863\" duration=\"1923000\" />\r\n <workItem from=\"1663500169914\" duration=\"6177000\" />\r\n </task>\r\n <task id=\"LOCAL-00001\" summary=\"dodata ulogovana verzija\">\r\n <created>1663501497955</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1663501497955</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"2\" />\r\n <servers />\r\n </component>\r\n <component name=\"TimeTrackingManager\">\r\n <option name=\"totallyTimeSpent\" value=\"1923000\" />\r\n </component>\r\n <component name=\"ToolWindowManager\">\r\n <frame x=\"-8\" y=\"-8\" width=\"1040\" height=\"744\" extended-state=\"6\" />\r\n <editor active=\"true\" />\r\n <layout>\r\n <window_info id=\"Designer\" />\r\n <window_info id=\"Image Layers\" />\r\n <window_info id=\"Capture Tool\" />\r\n <window_info id=\"UI Designer\" />\r\n <window_info id=\"Favorites\" side_tool=\"true\" />\r\n <window_info id=\"Web\" side_tool=\"true\" />\r\n <window_info active=\"true\" content_ui=\"combo\" id=\"Project\" order=\"0\" visible=\"true\" weight=\"0.24081632\" />\r\n <window_info id=\"Structure\" order=\"1\" side_tool=\"true\" weight=\"0.25\" />\r\n <window_info anchor=\"bottom\" id=\"Spring\" />\r\n <window_info anchor=\"bottom\" id=\"Terminal\" />\r\n <window_info anchor=\"bottom\" id=\"Docker\" show_stripe_button=\"false\" />\r\n <window_info anchor=\"bottom\" id=\"Event Log\" side_tool=\"true\" />\r\n <window_info anchor=\"bottom\" id=\"Messages\" />\r\n <window_info anchor=\"bottom\" id=\"Java Enterprise\" />\r\n <window_info anchor=\"bottom\" id=\"Database Changes\" />\r\n <window_info anchor=\"bottom\" id=\"Version Control\" />\r\n <window_info anchor=\"bottom\" id=\"Message\" order=\"0\" />\r\n <window_info anchor=\"bottom\" id=\"Find\" order=\"1\" />\r\n <window_info anchor=\"bottom\" id=\"Run\" order=\"2\" weight=\"0.3289689\" />\r\n <window_info anchor=\"bottom\" id=\"Debug\" order=\"3\" weight=\"0.4\" />\r\n <window_info anchor=\"bottom\" id=\"Cvs\" order=\"4\" weight=\"0.25\" />\r\n <window_info anchor=\"bottom\" id=\"Inspection\" order=\"5\" weight=\"0.4\" />\r\n <window_info anchor=\"bottom\" id=\"TODO\" order=\"6\" />\r\n <window_info anchor=\"right\" id=\"Maven\" visible=\"true\" weight=\"0.03469388\" />\r\n <window_info anchor=\"right\" id=\"Palette\" />\r\n <window_info anchor=\"right\" id=\"Capture Analysis\" />\r\n <window_info anchor=\"right\" id=\"Database\" />\r\n <window_info anchor=\"right\" id=\"Palette&#9;\" />\r\n <window_info anchor=\"right\" id=\"Theme Preview\" />\r\n <window_info anchor=\"right\" id=\"Commander\" internal_type=\"SLIDING\" order=\"0\" type=\"SLIDING\" weight=\"0.4\" />\r\n <window_info anchor=\"right\" id=\"Ant Build\" order=\"1\" weight=\"0.25\" />\r\n <window_info anchor=\"right\" content_ui=\"combo\" id=\"Hierarchy\" order=\"2\" weight=\"0.25\" />\r\n </layout>\r\n </component>\r\n <component name=\"TypeScriptGeneratedFilesManager\">\r\n <option name=\"version\" value=\"3\" />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <option name=\"ADD_EXTERNAL_FILES_SILENTLY\" value=\"true\" />\r\n <MESSAGE value=\"dodata ulogovana verzija\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"dodata ulogovana verzija\" />\r\n </component>\r\n <component name=\"editorHistoryManager\">\r\n <entry file=\"file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"102\">\r\n <caret line=\"19\" column=\"13\" selection-start-line=\"19\" selection-start-column=\"13\" selection-end-line=\"19\" selection-end-column=\"13\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"102\">\r\n <caret line=\"17\" column=\"13\" selection-start-line=\"17\" selection-start-column=\"13\" selection-end-line=\"17\" selection-end-column=\"13\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/resources/templates/index.html\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\" />\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/resources/templates/login.html\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"226\">\r\n <caret line=\"75\" column=\"10\" lean-forward=\"true\" selection-start-line=\"75\" selection-start-column=\"10\" selection-end-line=\"75\" selection-end-column=\"10\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/java/app/Aplikacija.java\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"153\">\r\n <caret line=\"12\" column=\"1\" lean-forward=\"true\" selection-start-line=\"12\" selection-start-column=\"1\" selection-end-line=\"12\" selection-end-column=\"1\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n </component>\r\n <component name=\"masterDetails\">\r\n <states>\r\n <state key=\"ProjectJDKs.UI\">\r\n <settings>\r\n <last-edited>1.8</last-edited>\r\n <splitter-proportions>\r\n <option name=\"proportions\">\r\n <list>\r\n <option value=\"0.2\" />\r\n </list>\r\n </option>\r\n </splitter-proportions>\r\n </settings>\r\n </state>\r\n </states>\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 3507edf55ba13831882803204ab588dd1633f455)
+++ b/.idea/workspace.xml (date 1663515884995)
@@ -4,25 +4,14 @@
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
- <list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="dodata ulogovana verzija">
+ <list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/loggedin.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/loggedin.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/property.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/property.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="HTML File" />
- </list>
- </option>
- </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@@ -33,24 +22,15 @@
</list>
</option>
</component>
- <component name="JpbToolWindowState">
- <option name="myId2FirstActivated">
- <map>
- <entry key="com.haulmont.jpb.jpaInspector" value="true" />
- <entry key="com.haulmont.jpb.jpaPalette" value="true" />
- <entry key="com.haulmont.jpb.jpaStructure" value="true" />
- </map>
- </option>
- <option name="myId2Visible">
- <map>
- <entry key="com.haulmont.jpb.jpaInspector" value="true" />
- <entry key="com.haulmont.jpb.jpaPalette" value="true" />
- <entry key="com.haulmont.jpb.jpaStructure" value="true" />
- </map>
- </option>
- </component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
+ </component>
+ <component name="MavenImportPreferences">
+ <option name="generalSettings">
+ <MavenGeneralSettings>
+ <option name="useMavenConfig" value="true" />
+ </MavenGeneralSettings>
+ </option>
</component>
<component name="MavenProjectNavigator">
<treeState>
@@ -69,10 +49,8 @@
<option name="width" value="1004" />
<option name="height" value="688" />
</component>
- <component name="ProjectId" id="2EwILGSPKCVn860rmBDBYR0jn3o" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
+ <component name="ProjectId" id="2Eug7RIRjRpiSgng03m8gCU8rpF" />
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
@@ -156,19 +134,16 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "ASKED_ADD_EXTERNAL_FILES": "true",
- "DefaultHtmlFileTemplate": "HTML File",
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "WebServerToolWindowFactoryState": "false",
- "spring.configuration.checksum": "bb9bda38566c870d6f3a70881ab7a768"
- }
-}]]></component>
+ <component name="PropertiesComponent">
+ <property name="RequestMappingsPanelOrder0" value="0" />
+ <property name="RequestMappingsPanelOrder1" value="1" />
+ <property name="RequestMappingsPanelWidth0" value="75" />
+ <property name="RequestMappingsPanelWidth1" value="75" />
+ <property name="WebServerToolWindowFactoryState" value="false" />
+ <property name="aspect.path.notification.shown" value="true" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1663428570108" />
+ <property name="settings.editor.selected.configurable" value="settings.typescriptcompiler" />
+ </component>
<component name="RunManager">
<configuration name="Aplikacija" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="registration-login-spring-boot-security-thymeleaf" />
@@ -190,16 +165,7 @@
<option name="presentableId" value="Default" />
<updated>1663427032475</updated>
<workItem from="1663427050863" duration="1923000" />
- <workItem from="1663500169914" duration="6177000" />
- </task>
- <task id="LOCAL-00001" summary="dodata ulogovana verzija">
- <created>1663501497955</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1663501497955</updated>
</task>
- <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
@@ -244,7 +210,7 @@
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="3" />
+ <option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
@@ -256,11 +222,6 @@
</entry>
</map>
</option>
- </component>
- <component name="VcsManagerConfiguration">
- <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
- <MESSAGE value="dodata ulogovana verzija" />
- <option name="LAST_COMMIT_MESSAGE" value="dodata ulogovana verzija" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java">
.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml deleted 100644 → 0
<changelist name="Uncommitted_changes_before_Update_at_18_9_2022__18_26_[Default_Changelist]" date="1663518458300" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26_[Default_Changelist]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 18.9.2022. 18:26 [Default Changelist]" />
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08_[Default_Changelist]/shelved.patch deleted 100644 → 0
Index: src/main/resources/templates/dodaj.html
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><!DOCTYPE html>\r\n<html lang=\"en\">\r\n<head>\r\n <meta charset=\"UTF-8\">\r\n <title>Title</title>\r\n</head>\r\n<body>\r\n OVDE DODAJEMO\r\n</body>\r\n</html>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/resources/templates/dodaj.html b/src/main/resources/templates/dodaj.html
--- a/src/main/resources/templates/dodaj.html (revision 4f9e193d6d431d3c8483c547914e194e2a35b851)
+++ b/src/main/resources/templates/dodaj.html (date 1663523446873)
@@ -2,9 +2,50 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>Title</title>
+ <title>Dodavanje oglasa</title>
</head>
<body>
- OVDE DODAJEMO
+
+
+<table>
+ <tr>
+ <td><label for="naziv">Naziv objekta:</label></td>
+ <td><input type="text" name="naziv" id="naziv" ></td>
+ </tr>
+
+
+ <tr>
+ <td><label for="lokacija">Lokacija:</label></td>
+ <td><input type="text" name="lokacija" id="lokacija"></td>
+ </tr>
+ <tr>
+ <td><label for="cena">Cena:</label></td>
+ <td><input type="number" name="cena" id="cena"></td>
+ </tr>
+ <tr>
+ <td><label for="kvadratura">Kvadratura:</label></td>
+ <td><input type="number" name="kvadratura" id="kvadratura"></td>
+ </tr>
+ <tr>
+ <td><label for="slika">Dodaj sliku::</label></td>
+ <td><input type="image" name="slika" id="slika"></td>
+ </tr>
+ <tr>
+ <td><label for="tip">Tip:</label></td>
+ <td> <input type="radio" id="tip" name="tip" value="izdavanje">Izdavanje
+ <input type="radio" name="tip" value="prodaja">Prodaja
+ </tr>
+ <tr>
+ <td><label for="vlasnik">Vlasnik:</label></td>
+ <td><input type="number" name="vlasnik" id="vlasnik" ></td>
+ </tr>
+ <tr>
+ <td><input type="submit" class="submit" value="Dodaj oglas"></td>
+ </tr>
+
+
+</table>
+</form>
+
</body>
</html>
\ No newline at end of file
Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"ALL\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"6e82c7f1-3949-40e2-bc26-7eb50b36f993\" name=\"Default Changelist\" comment=\"dodata ulogovana verzija\">\r\n <change afterPath=\"$PROJECT_DIR$/src/main/java/app/model/Oglas.java\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/src/main/java/app/rep/OglasRep.java\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/src/main/java/app/usluga/OglasUsluga.java\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/src/main/java/app/usluga/web/OglasController.java\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/src/main/resources/templates/oglasi.html\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.idea/workspace.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/workspace.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java\" afterDir=\"false\" />\r\n </list>\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"Interface\" />\r\n <option value=\"Class\" />\r\n <option value=\"HTML File\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"IdeDocumentHistory\">\r\n <option name=\"CHANGED_PATHS\">\r\n <list>\r\n <option value=\"$PROJECT_DIR$/src/main/resources/templates/login.html\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"JpbToolWindowState\">\r\n <option name=\"myId2FirstActivated\">\r\n <map>\r\n <entry key=\"com.haulmont.jpb.jpaInspector\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaPalette\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaStructure\" value=\"true\" />\r\n </map>\r\n </option>\r\n <option name=\"myId2Visible\">\r\n <map>\r\n <entry key=\"com.haulmont.jpb.jpaInspector\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaPalette\" value=\"true\" />\r\n <entry key=\"com.haulmont.jpb.jpaStructure\" value=\"true\" />\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"MavenProjectNavigator\">\r\n <treeState>\r\n <expand>\r\n <path>\r\n <item name=\"\" type=\"16c1761:MavenProjectsStructure$RootNode\" />\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"9519ce18:MavenProjectsStructure$ProjectNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </treeState>\r\n </component>\r\n <component name=\"ProjectFrameBounds\" extendedState=\"6\">\r\n <option name=\"x\" value=\"10\" />\r\n <option name=\"y\" value=\"20\" />\r\n <option name=\"width\" value=\"1004\" />\r\n <option name=\"height\" value=\"688\" />\r\n </component>\r\n <component name=\"ProjectId\" id=\"2EwILGSPKCVn860rmBDBYR0jn3o\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\">\r\n <ConfirmationsSetting value=\"2\" id=\"Add\" />\r\n </component>\r\n <component name=\"ProjectView\">\r\n <navigator proportions=\"\" version=\"1\">\r\n <foldersAlwaysOnTop value=\"true\" />\r\n </navigator>\r\n <panes>\r\n <pane id=\"Scope\" />\r\n <pane id=\"ProjectPane\">\r\n <subPane>\r\n <expand>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"app\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"app\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"config\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"java\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"app\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"model\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"resources\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n <path>\r\n <item name=\"registration-login-spring-boot-security-thymeleaf\" type=\"b2602c69:ProjectViewProjectNode\" />\r\n <item name=\"awesomelands\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"src\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"main\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"resources\" type=\"462c0819:PsiDirectoryNode\" />\r\n <item name=\"templates\" type=\"462c0819:PsiDirectoryNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </subPane>\r\n </pane>\r\n <pane id=\"PackagesPane\" />\r\n </panes>\r\n </component>\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\">{\r\n &quot;keyToString&quot;: {\r\n &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,\r\n &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,\r\n &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,\r\n &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,\r\n &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,\r\n &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,\r\n &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,\r\n &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,\r\n &quot;spring.configuration.checksum&quot;: &quot;bb9bda38566c870d6f3a70881ab7a768&quot;\r\n }\r\n}</component>\r\n <component name=\"RunManager\">\r\n <configuration name=\"Aplikacija\" type=\"SpringBootApplicationConfigurationType\" factoryName=\"Spring Boot\">\r\n <module name=\"registration-login-spring-boot-security-thymeleaf\" />\r\n <option name=\"SPRING_BOOT_MAIN_CLASS\" value=\"app.Aplikacija\" />\r\n <method v=\"2\">\r\n <option name=\"Make\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"SvnConfiguration\">\r\n <configuration />\r\n </component>\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"6e82c7f1-3949-40e2-bc26-7eb50b36f993\" name=\"Default Changelist\" comment=\"\" />\r\n <created>1663427032475</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1663427032475</updated>\r\n <workItem from=\"1663427050863\" duration=\"1923000\" />\r\n <workItem from=\"1663500169914\" duration=\"6177000\" />\r\n <workItem from=\"1663512751550\" duration=\"4807000\" />\r\n </task>\r\n <task id=\"LOCAL-00001\" summary=\"dodata ulogovana verzija\">\r\n <created>1663501497955</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1663501497955</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"2\" />\r\n <servers />\r\n </component>\r\n <component name=\"TimeTrackingManager\">\r\n <option name=\"totallyTimeSpent\" value=\"1923000\" />\r\n </component>\r\n <component name=\"ToolWindowManager\">\r\n <frame x=\"-8\" y=\"-8\" width=\"1040\" height=\"744\" extended-state=\"6\" />\r\n <editor active=\"true\" />\r\n <layout>\r\n <window_info id=\"Designer\" />\r\n <window_info id=\"Image Layers\" />\r\n <window_info id=\"Capture Tool\" />\r\n <window_info id=\"UI Designer\" />\r\n <window_info id=\"Favorites\" side_tool=\"true\" />\r\n <window_info id=\"Web\" side_tool=\"true\" />\r\n <window_info active=\"true\" content_ui=\"combo\" id=\"Project\" order=\"0\" visible=\"true\" weight=\"0.24081632\" />\r\n <window_info id=\"Structure\" order=\"1\" side_tool=\"true\" weight=\"0.25\" />\r\n <window_info anchor=\"bottom\" id=\"Spring\" />\r\n <window_info anchor=\"bottom\" id=\"Terminal\" />\r\n <window_info anchor=\"bottom\" id=\"Docker\" show_stripe_button=\"false\" />\r\n <window_info anchor=\"bottom\" id=\"Event Log\" side_tool=\"true\" />\r\n <window_info anchor=\"bottom\" id=\"Messages\" />\r\n <window_info anchor=\"bottom\" id=\"Java Enterprise\" />\r\n <window_info anchor=\"bottom\" id=\"Database Changes\" />\r\n <window_info anchor=\"bottom\" id=\"Version Control\" />\r\n <window_info anchor=\"bottom\" id=\"Message\" order=\"0\" />\r\n <window_info anchor=\"bottom\" id=\"Find\" order=\"1\" />\r\n <window_info anchor=\"bottom\" id=\"Run\" order=\"2\" weight=\"0.3289689\" />\r\n <window_info anchor=\"bottom\" id=\"Debug\" order=\"3\" weight=\"0.4\" />\r\n <window_info anchor=\"bottom\" id=\"Cvs\" order=\"4\" weight=\"0.25\" />\r\n <window_info anchor=\"bottom\" id=\"Inspection\" order=\"5\" weight=\"0.4\" />\r\n <window_info anchor=\"bottom\" id=\"TODO\" order=\"6\" />\r\n <window_info anchor=\"right\" id=\"Maven\" visible=\"true\" weight=\"0.03469388\" />\r\n <window_info anchor=\"right\" id=\"Palette\" />\r\n <window_info anchor=\"right\" id=\"Capture Analysis\" />\r\n <window_info anchor=\"right\" id=\"Database\" />\r\n <window_info anchor=\"right\" id=\"Palette&#9;\" />\r\n <window_info anchor=\"right\" id=\"Theme Preview\" />\r\n <window_info anchor=\"right\" id=\"Commander\" internal_type=\"SLIDING\" order=\"0\" type=\"SLIDING\" weight=\"0.4\" />\r\n <window_info anchor=\"right\" id=\"Ant Build\" order=\"1\" weight=\"0.25\" />\r\n <window_info anchor=\"right\" content_ui=\"combo\" id=\"Hierarchy\" order=\"2\" weight=\"0.25\" />\r\n </layout>\r\n </component>\r\n <component name=\"TypeScriptGeneratedFilesManager\">\r\n <option name=\"version\" value=\"3\" />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <option name=\"ADD_EXTERNAL_FILES_SILENTLY\" value=\"true\" />\r\n <MESSAGE value=\"dodata ulogovana verzija\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"dodata ulogovana verzija\" />\r\n </component>\r\n <component name=\"editorHistoryManager\">\r\n <entry file=\"file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"102\">\r\n <caret line=\"19\" column=\"13\" selection-start-line=\"19\" selection-start-column=\"13\" selection-end-line=\"19\" selection-end-column=\"13\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"102\">\r\n <caret line=\"17\" column=\"13\" selection-start-line=\"17\" selection-start-column=\"13\" selection-end-line=\"17\" selection-end-column=\"13\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/resources/templates/index.html\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\" />\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/resources/templates/login.html\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"226\">\r\n <caret line=\"75\" column=\"10\" lean-forward=\"true\" selection-start-line=\"75\" selection-start-column=\"10\" selection-end-line=\"75\" selection-end-column=\"10\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n <entry file=\"file://$PROJECT_DIR$/src/main/java/app/Aplikacija.java\">\r\n <provider selected=\"true\" editor-type-id=\"text-editor\">\r\n <state relative-caret-position=\"153\">\r\n <caret line=\"12\" column=\"1\" lean-forward=\"true\" selection-start-line=\"12\" selection-start-column=\"1\" selection-end-line=\"12\" selection-end-column=\"1\" />\r\n </state>\r\n </provider>\r\n </entry>\r\n </component>\r\n <component name=\"masterDetails\">\r\n <states>\r\n <state key=\"ProjectJDKs.UI\">\r\n <settings>\r\n <last-edited>1.8</last-edited>\r\n <splitter-proportions>\r\n <option name=\"proportions\">\r\n <list>\r\n <option value=\"0.2\" />\r\n </list>\r\n </option>\r\n </splitter-proportions>\r\n </settings>\r\n </state>\r\n </states>\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 4f9e193d6d431d3c8483c547914e194e2a35b851)
+++ b/.idea/workspace.xml (date 1663519709281)
@@ -4,14 +4,9 @@
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
- <list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="dodata ulogovana verzija">
- <change afterPath="$PROJECT_DIR$/src/main/java/app/model/Oglas.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/app/rep/OglasRep.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/OglasUsluga.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/OglasController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/oglasi.html" afterDir="false" />
+ <list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -21,8 +16,6 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
- <option value="Interface" />
- <option value="Class" />
<option value="HTML File" />
</list>
</option>
@@ -195,7 +188,6 @@
<updated>1663427032475</updated>
<workItem from="1663427050863" duration="1923000" />
<workItem from="1663500169914" duration="6177000" />
- <workItem from="1663512751550" duration="4807000" />
</task>
<task id="LOCAL-00001" summary="dodata ulogovana verzija">
<created>1663501497955</created>
.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml deleted 100644 → 0
<changelist name="Uncommitted_changes_before_Update_at_18_9_2022__20_08_[Default_Changelist]" date="1663524538323" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08_[Default_Changelist]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 18.9.2022. 20:08 [Default Changelist]" />
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07_[Default_Changelist]/shelved.patch deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml deleted 100644 → 0
<changelist name="Uncommitted_changes_before_Update_at_19_9_2022__15_07_[Default_Changelist]" date="1663592873590" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07_[Default_Changelist]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 19.9.2022. 15:07 [Default Changelist]" />
</changelist>
\ No newline at end of file
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
<list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="header i footer register">
<list default="true" id="d75636e7-c025-49ee-88ce-f7dd3739636c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jpa-buddy.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26_[Default_Changelist]/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08_[Default_Changelist]/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07_[Default_Changelist]/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Interface" />
<option value="HTML File" />
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/resources/templates/login.html" />
</list>
</option>
</component>
<component name="JpbToolWindowState">
<option name="myId2FirstActivated">
<map>
<entry key="com.haulmont.jpb.jpaInspector" value="true" />
<entry key="com.haulmont.jpb.jpaPalette" value="true" />
<entry key="com.haulmont.jpb.jpaStructure" value="true" />
</map>
</option>
<option name="myId2Visible">
<map>
<entry key="com.haulmont.jpb.jpaInspector" value="false" />
<entry key="com.haulmont.jpb.jpaPalette" value="false" />
<entry key="com.haulmont.jpb.jpaStructure" value="false" />
</map>
</option>
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="MavenProjectNavigator">
<treeState>
<expand>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="registration-login-spring-boot-security-thymeleaf" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
</expand>
<select />
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="10" />
<option name="y" value="20" />
<option name="width" value="1004" />
<option name="height" value="688" />
</component>
<component name="ProjectId" id="2EwILGSPKCVn860rmBDBYR0jn3o" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -96,84 +54,31 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="registration-login-spring-boot-security-thymeleaf" type="b2602c69:ProjectViewProjectNode" />
<item name="awesomelands" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="registration-login-spring-boot-security-thymeleaf" type="b2602c69:ProjectViewProjectNode" />
<item name="awesomelands" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="registration-login-spring-boot-security-thymeleaf" type="b2602c69:ProjectViewProjectNode" />
<item name="awesomelands" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="registration-login-spring-boot-security-thymeleaf" type="b2602c69:ProjectViewProjectNode" />
<item name="awesomelands" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="model" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="registration-login-spring-boot-security-thymeleaf" type="b2602c69:ProjectViewProjectNode" />
<item name="awesomelands" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="registration-login-spring-boot-security-thymeleaf" type="b2602c69:ProjectViewProjectNode" />
<item name="awesomelands" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
&quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
&quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
&quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
&quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
&quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;spring.configuration.checksum&quot;: &quot;bb9bda38566c870d6f3a70881ab7a768&quot;
}
}</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="app.usluga" />
<recent name="app.usluga.web" />
<recent name="app.usluga.web.transfer" />
<recent name="app.rep" />
</key>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration name="Aplikacija" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
......@@ -184,67 +89,25 @@
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="" />
<created>1663427032475</created>
<changelist id="d75636e7-c025-49ee-88ce-f7dd3739636c" name="Default Changelist" comment="" />
<created>1663793555663</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1663427032475</updated>
<workItem from="1663427050863" duration="1923000" />
<workItem from="1663500169914" duration="6177000" />
<workItem from="1663512751550" duration="4807000" />
<workItem from="1663587110231" duration="665000" />
<workItem from="1663587883995" duration="11000" />
<workItem from="1663589644471" duration="4472000" />
<workItem from="1663594548080" duration="456000" />
<workItem from="1663598082766" duration="1751000" />
<workItem from="1663600055785" duration="984000" />
<workItem from="1663675731268" duration="8728000" />
<workItem from="1663703824680" duration="5427000" />
<workItem from="1663780970951" duration="541000" />
</task>
<task id="LOCAL-00001" summary="dodata ulogovana verzija">
<created>1663501497955</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1663501497955</updated>
</task>
<task id="LOCAL-00002" summary="login/logout/anonymous user...">
<created>1663590651571</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1663590651571</updated>
</task>
<task id="LOCAL-00003" summary="UPLOAD sada radi">
<created>1663599823537</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1663599823537</updated>
<updated>1663793555663</updated>
<workItem from="1663793565593" duration="270000" />
</task>
<task id="LOCAL-00004" summary="header i footer register">
<created>1663781295222</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1663781295222</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1923000" />
<option name="totallyTimeSpent" value="270000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1040" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Designer" />
<window_info id="Image Layers" />
......@@ -252,24 +115,23 @@
<window_info id="UI Designer" />
<window_info id="Favorites" side_tool="true" />
<window_info id="Web" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24081632" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Spring" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Messages" />
<window_info anchor="bottom" id="Java Enterprise" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Version Control" visible="true" weight="0.3289689" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3289689" />
<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="right" id="Maven" visible="true" weight="0.03469388" />
<window_info anchor="right" id="Maven" />
<window_info anchor="right" id="Palette" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Database" />
......@@ -281,59 +143,7 @@
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="dodata ulogovana verzija" />
<MESSAGE value="login/logout/anonymous user..." />
<MESSAGE value="UPLOAD sada radi" />
<MESSAGE value="header i footer register" />
<option name="LAST_COMMIT_MESSAGE" value="header i footer register" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="75" column="10" lean-forward="true" selection-start-line="75" selection-start-column="10" selection-end-line="75" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/app/Aplikacija.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="12" column="1" lean-forward="true" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
</state>
</provider>
</entry>
<option name="version" value="1" />
</component>
<component name="masterDetails">
<states>
......
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