dodaj funkcija

174e8d4d · Milena Djukic · 8545ae0d · 174e8d4d · 174e8d4d · 174e8d4d
Commit 174e8d4d authored Sep 19, 2022 by Milena Djukic
10 changed files
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26_[Default_Changelist]/shelved.patch
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26_[Default_Changelist]/shelved.patch
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml
+<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
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08_[Default_Changelist]/shelved.patch
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08_[Default_Changelist]/shelved.patch
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml
+<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
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07_[Default_Changelist]/shelved.patch
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07_[Default_Changelist]/shelved.patch
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml
+<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
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,11 @@
    <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="ispravljeno">
      <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/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/dodaj.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -194,9 +193,6 @@
      <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="979000" />
    </task>
    <task id="LOCAL-00001" summary="dodata ulogovana verzija">
      <created>1663501497955</created>

--- a/src/main/resources/templates/dodaj.html
+++ b/src/main/resources/templates/dodaj.html
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
  <head>
-    <title>Royal Estate - Free Bootstrap 4 Template by Colorlib</title>
+    <title>SkuciSe</title>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    

--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -9,9 +9,15 @@
 	integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
 	crossorigin="anonymous">

+	<style>
+
+
+	</style>
+	
 </head>
 <body>

+
 	<!-- create navigation bar ( header) -->
 	<nav class="navbar navbar-inverse navbar-fixed-top">
 		<div class="container">