Skip to content

A
awesomelands
Commit adf7f2dc by Vuk Lazovic
Options

dodata ulogovana verzija

parent 33b58e76
Showing with 105 additions and 50 deletions
.idea/jpa-buddy.xml 0 → 100644
<?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,4 +11,7 @@ ...@@ -11,4 +11,7 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="ProjectType">
<option name="id" value="jpab" />
</component>
</project> </project>
\ No newline at end of file
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment=""> <list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" /> <change afterPath="$PROJECT_DIR$/.idea/jpa-buddy.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/loggedin.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.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/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java" 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" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<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="FileEditorManager"> <component name="FileTemplateManagerImpl">
<leaf> <option name="RECENT_TEMPLATES">
<file pinned="false" current-in-tab="true"> <list>
<entry file="file://$PROJECT_DIR$/src/main/java/app/Aplikacija.java"> <option value="HTML File" />
<provider selected="true" editor-type-id="text-editor"> </list>
<state relative-caret-position="153"> </option>
<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>
</file>
</leaf>
</component> </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$" />
...@@ -40,12 +36,24 @@ ...@@ -40,12 +36,24 @@
</list> </list>
</option> </option>
</component> </component>
<component name="MavenImportPreferences"> <component name="JpbToolWindowState">
<option name="importingSettings"> <option name="myId2FirstActivated">
<MavenImportingSettings> <map>
<option name="importAutomatically" value="true" /> <entry key="com.haulmont.jpb.jpaInspector" value="true" />
</MavenImportingSettings> <entry key="com.haulmont.jpb.jpaPalette" value="true" />
<entry key="com.haulmont.jpb.jpaStructure" value="true" />
</map>
</option> </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>
<component name="MavenProjectNavigator"> <component name="MavenProjectNavigator">
<treeState> <treeState>
...@@ -64,7 +72,10 @@ ...@@ -64,7 +72,10 @@
<option name="width" value="1004" /> <option name="width" value="1004" />
<option name="height" value="688" /> <option name="height" value="688" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectId" id="2EwILGSPKCVn860rmBDBYR0jn3o" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
...@@ -144,28 +155,23 @@ ...@@ -144,28 +155,23 @@
<pane id="PackagesPane" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="ProjectViewState">
<property name="RequestMappingsPanelOrder0" value="0" /> <option name="hideEmptyMiddlePackages" value="true" />
<property name="RequestMappingsPanelOrder1" value="1" /> <option name="showLibraryContents" value="true" />
<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="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component> </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="RunManager"> <component name="RunManager">
<configuration name="Aplikacija" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <configuration name="Aplikacija" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="registration-login-spring-boot-security-thymeleaf" /> <module name="registration-login-spring-boot-security-thymeleaf" />
...@@ -175,6 +181,7 @@ ...@@ -175,6 +181,7 @@
</method> </method>
</configuration> </configuration>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
...@@ -186,6 +193,7 @@ ...@@ -186,6 +193,7 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1663427032475</updated> <updated>1663427032475</updated>
<workItem from="1663427050863" duration="1923000" /> <workItem from="1663427050863" duration="1923000" />
<workItem from="1663500169914" duration="1149000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -231,7 +239,21 @@ ...@@ -231,7 +239,21 @@
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <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" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java"> <entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java">
......
src/main/java/app/config/Bezbednost.java
...@@ -64,7 +64,7 @@ public class Bezbednost extends WebSecurityConfigurerAdapter { ...@@ -64,7 +64,7 @@ public class Bezbednost extends WebSecurityConfigurerAdapter {
.and() .and()
.formLogin() .formLogin()
.loginPage("/login") .loginPage("/login")
.defaultSuccessUrl("/", true) .defaultSuccessUrl("/loggedin", true)
.permitAll() .permitAll()
.and() .and()
.logout() .logout()
......
src/main/java/app/usluga/web/MainKontroler.java
...@@ -15,4 +15,14 @@ public class MainKontroler { ...@@ -15,4 +15,14 @@ public class MainKontroler {
public String prikaziHome() { public String prikaziHome() {
return "index"; return "index";
} }
@GetMapping("/loggedin")
public String prikaziLoggedin() {
return "loggedin";
}
@GetMapping("/dodaj")
public String prikazidodaj() {
return "dodaj";
}
} }
src/main/resources/templates/dodaj.html 0 → 100644
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
OVDE DODAJEMO
</body>
</html>
\ No newline at end of file
src/main/resources/templates/index.html
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<nav class="navbar navbar-expand-lg navbar-dark ftco_navbar bg-dark ftco-navbar-light" id="ftco-navbar"> <nav class="navbar navbar-expand-lg navbar-dark ftco_navbar bg-dark ftco-navbar-light" id="ftco-navbar">
<div class="container"> <div class="container">
<a class="navbar-brand" href="index.html">Skuci<span>se</span></a> <a class="navbar-brand" href="index.html">AWESOME<span>lands</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#ftco-nav" aria-controls="ftco-nav" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#ftco-nav" aria-controls="ftco-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="oi oi-menu"></span> Menu <span class="oi oi-menu"></span> Menu
</button> </button>
......
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