Index: urce/freeparkingspace/.gitignore =================================================================== --- source/freeparkingspace/.gitignore (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,33 +1,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ Index: urce/freeparkingspace/mvnw =================================================================== --- source/freeparkingspace/mvnw (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,316 +1,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`\\unset -f command; \\command -v java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" Index: urce/freeparkingspace/mvnw.cmd =================================================================== --- source/freeparkingspace/mvnw.cmd (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,188 +1,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% Index: urce/freeparkingspace/pom.xml =================================================================== --- source/freeparkingspace/pom.xml (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,76 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.3 - - - com - proekt - 0.0.1-SNAPSHOT - proekt - Demo project for Spring Boot - - 11 - - - - org.springframework.boot - spring-boot-starter-data-jdbc - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - - com.h2database - h2 - runtime - - - org.postgresql - postgresql - runtime - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/Blank.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/Blank.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,25 +1,0 @@ -package com.proekt.Controller; - - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -@Controller -public class Blank { - - - @GetMapping("/contact") - public String getViewHome(Model model) { - - model.addAttribute("bodyContent","contact"); - return "master-template"; - } - @GetMapping("/about") - public String getViewHome2(Model model) { - - model.addAttribute("bodyContent","about"); - return "master-template"; - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/Employee.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/Employee.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,41 +1,0 @@ -package com.proekt.Controller; - - -import com.proekt.Repository.NajavaRepository; -import com.proekt.Repository.VrabotenRepository1; -import com.proekt.Service.EmployeeService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -@Controller -@RequestMapping("/employee") -public class Employee { - - private final VrabotenRepository1 vrabotenRepository1; - private final NajavaRepository najavaRepository; - private final EmployeeService employeeService; - - public Employee(VrabotenRepository1 vrabotenRepository1, NajavaRepository najavaRepository, EmployeeService employeeService) { - this.vrabotenRepository1 = vrabotenRepository1; - this.najavaRepository = najavaRepository; - this.employeeService = employeeService; - } - - @GetMapping - public String getMoviePage(@RequestParam(required = false) String error, Model model) { - if (error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - - model.addAttribute("employee", this.vrabotenRepository1.findAll()); - model.addAttribute("bodyContent", "employee"); - return "master-template"; - } - @PostMapping("/{id}/delete") - public String delete(@PathVariable String id) { - this.employeeService.delete(id); - return "redirect:/employee"; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/Home.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/Home.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,19 +1,0 @@ -package com.proekt.Controller; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping(value={"/", "/home"}) -public class Home{ - - @GetMapping - public String getViewHome(Model model) { - - model.addAttribute("bodyContent","home"); - return "master-template"; - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/Register.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/Register.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,69 +1,0 @@ -package com.proekt.Controller; - -import com.proekt.Repository.KorisnikRepository; -import com.proekt.Repository.NajavaRepository; -import com.proekt.model.Korisnik.Korisnik; -import com.proekt.model.Korisnik.KorisnikKey; -import com.proekt.model.Najava; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -@Controller -@RequestMapping("/register") -public class Register { - - private final NajavaRepository najavaRepository; - private final KorisnikRepository korisnikRepository; - - public Register(NajavaRepository najavaRepository, KorisnikRepository korisnikRepository) { - this.najavaRepository = najavaRepository; - this.korisnikRepository = korisnikRepository; - } - - - @GetMapping - public String getRegisterPage(@RequestParam(required = false) String error, Model model) { - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - model.addAttribute("bodyContent","register"); - return "master-template"; - } - - @PostMapping - public String register(@RequestParam String korisnicko_ime, - @RequestParam String ime, - @RequestParam String prezime, - @RequestParam String embg, - @RequestParam String email, - @RequestParam String br_tel, - @RequestParam String password - ) { - Najava najava = new Najava(); - najava.setKorisnickoIme(korisnicko_ime); - najava.setIme(ime); - najava.setPrezime(prezime); - najava.setEmbg(embg); - najava.setEmail(email); - najava.setBrTel(br_tel); - najava.setPassword(password); - - KorisnikKey korisnikKey = new KorisnikKey(najava); - Korisnik korisnik = new Korisnik(); - korisnik.setKorisnikKey(korisnikKey); - List korisnik1 = korisnikRepository.findAll(); - int id = korisnik1.size() + 1; - korisnik.setKorisnicko_ime(id); - - this.najavaRepository.save(najava); - this.korisnikRepository.save(korisnik); - return "redirect:/success"; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/RegisterConfirmation.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/RegisterConfirmation.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,23 +1,0 @@ -package com.proekt.Controller; - -import com.proekt.Repository.NajavaRepository; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -@RequestMapping("/register-info") -public class RegisterConfirmation { - - @GetMapping - public String getRegisterPage(@RequestParam(required = false) String error, Model model) { - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - model.addAttribute("bodyContent","registerConfirmation"); - return "master-template"; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/RegisterEmployee.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/RegisterEmployee.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,124 +1,0 @@ -package com.proekt.Controller; - - -import com.proekt.model.Kontroler.Kontroler; -import com.proekt.model.Kontroler.KontrolerKey; -import com.proekt.Repository.AdministratorRepository; -import com.proekt.Repository.KontrolerRepository; -import com.proekt.Repository.NajavaRepository; -import com.proekt.Repository.VrabotenRepository1; -import com.proekt.model.Admin.AdminKey; -import com.proekt.model.Admin.Administrator; -import com.proekt.model.Najava; -import com.proekt.model.Vraboten.Vraboten; -import com.proekt.model.Vraboten.VrabotenKey; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@Controller -@RequestMapping("/register-employee") -public class RegisterEmployee { - - private final NajavaRepository najavaRepository; - private final AdministratorRepository administratorRepository; - private final VrabotenRepository1 vrabotenRepository; - private final KontrolerRepository kontrolerRepository; - - public RegisterEmployee(NajavaRepository najavaRepository, AdministratorRepository administratorRepository, VrabotenRepository1 vrabotenRepository, KontrolerRepository kontrolerRepository) { - this.najavaRepository = najavaRepository; - this.administratorRepository = administratorRepository; - this.vrabotenRepository = vrabotenRepository; - this.kontrolerRepository = kontrolerRepository; - } - - - @GetMapping - public String getRegisterPage(@RequestParam(required = false) String error, Model model) { - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - model.addAttribute("bodyContent","registerEmployee"); - return "master-template"; - } - - @PostMapping - public String register(@RequestParam String korisnicko_ime, - @RequestParam String ime, - @RequestParam String prezime, - @RequestParam String embg, - @RequestParam String email, - @RequestParam String br_tel, - @RequestParam String password, - @RequestParam String user_role - ) { - - String admin = "ROLE_ADMIN"; - String controller = "ROLE_CONTROLLER"; - - - - if(user_role.equals(admin)){ - Najava najava = new Najava(); - najava.setKorisnickoIme(korisnicko_ime); - najava.setIme(ime); - najava.setPrezime(prezime); - najava.setEmbg(embg); - najava.setEmail(email); - najava.setBrTel(br_tel); - najava.setPassword(password); - this.najavaRepository.save(najava); - - Administrator admin2 = new Administrator(); - AdminKey adminKey = new AdminKey(najava); - admin2.setAdminKey(adminKey); - List administrators = najavaRepository.findAll(); - int size = administrators.size() + 1; - admin2.setIdAdministrator(size); - this.administratorRepository.save(admin2); - - Vraboten vraboten = new Vraboten(); - VrabotenKey vrabotenKey = new VrabotenKey(najava); - vraboten.setVrabotenKey(vrabotenKey); - //vraboten.setIdVraboten(1337); - vraboten.setUloga("Administrator"); - vraboten.setIdVraboten(size); - this.vrabotenRepository.save(vraboten); - return "redirect:/success"; - }else if(user_role.equals(controller)){ - - Najava najava = new Najava(); - najava.setKorisnickoIme(korisnicko_ime); - najava.setIme(ime); - najava.setPrezime(prezime); - najava.setEmbg(embg); - najava.setEmail(email); - najava.setBrTel(br_tel); - najava.setPassword(password); - this.najavaRepository.save(najava); - - KontrolerKey kontrolerKey = new KontrolerKey(najava); - Kontroler kontroler = new Kontroler(); - kontroler.setKontrolerKey(kontrolerKey); - List administrators = najavaRepository.findAll(); - int size = administrators.size() + 1; - kontroler.setId_kontroler(size); - this.kontrolerRepository.save(kontroler); - - Vraboten vraboten = new Vraboten(); - VrabotenKey vrabotenKey = new VrabotenKey(najava); - vraboten.setVrabotenKey(vrabotenKey); - //vraboten.setIdVraboten(1337); - vraboten.setUloga("Controller"); - vraboten.setIdVraboten(size); - this.vrabotenRepository.save(vraboten); - return "redirect:/success"; - }else{ - return "redirect:/register-employee"; - } - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/Reservation.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/Reservation.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,90 +1,0 @@ -package com.proekt.Controller; - -import com.proekt.Repository.*; -import com.proekt.model.Avtomobil; -import com.proekt.model.Korisnik.Korisnik; -import com.proekt.model.Korisnik.KorisnikKey; -import com.proekt.model.Plakjanje; -import com.proekt.model.Rezervacija; -import org.apache.tomcat.jni.Local; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.time.LocalDateTime; -import java.util.List; - -@Controller -@RequestMapping("/reservation") -public class Reservation { - - private final RezervacijaRepository rezervacijaRepository; - private final KorisnikRepository korisnikRepository; - private final PlakjanjeRepository plakjanjeRepository; - private final NajavaRepository najavaRepository; - private final ParkingMestoRepository parkingMestoRepository; - private final AvtomobilRepository avtomobilRepository; - - public Reservation(RezervacijaRepository rezervacijaRepository, KorisnikRepository korisnikRepository, PlakjanjeRepository plakjanjeRepository, NajavaRepository najavaRepository, ParkingMestoRepository parkingMestoRepository, AvtomobilRepository avtomobilRepository) { - this.rezervacijaRepository = rezervacijaRepository; - this.korisnikRepository = korisnikRepository; - this.plakjanjeRepository = plakjanjeRepository; - this.najavaRepository = najavaRepository; - this.parkingMestoRepository = parkingMestoRepository; - this.avtomobilRepository = avtomobilRepository; - } - - @RequestMapping("/parking-place") - public String getRegisterPage(@RequestParam(value = "broj_na_pmesta", required = false) Integer broj_na_pmesta, Model model) { - - model.addAttribute("parking", this.parkingMestoRepository.findById(broj_na_pmesta).get()); - model.addAttribute("bodyContent","reservation"); - return "master-template"; - } - - @PostMapping("/parking-place/add") - public String register(@RequestParam String reg_tablica, - @RequestParam String marka, - @RequestParam String boja, - @RequestParam String pocetno_vreme, - @RequestParam String krajno_vreme, - @RequestParam Integer broj_na_pmesta - - ) { - - // LocalDateTime dateTime = LocalDateTime.parse(pocetno_vreme); - // LocalDateTime dateTime2 = LocalDateTime.parse(krajno_vreme); - KorisnikKey korisnikKey = new KorisnikKey(); - korisnikKey.setUser(this.najavaRepository.findById("Majkl0810").get()); - Korisnik korisnik = korisnikRepository.findById(korisnikKey).get(); - - Avtomobil avtomobil = new Avtomobil(); - avtomobil.setRegTablica(reg_tablica); - avtomobil.setKorisnickoIme(korisnik); - avtomobil.setBoja(boja); - avtomobil.setMarka(marka); - this.avtomobilRepository.save(avtomobil); - - Rezervacija rezervacija = new Rezervacija(); - - List rezervacijaList = this.rezervacijaRepository.findAll(); - int sizeRezervacija = rezervacijaList.size() + 1; - rezervacija.setIdRezervacija(sizeRezervacija); - - rezervacija.setRegTablica(avtomobil); - //rezervacija.setPocetnoVreme(dateTime); - //rezervacija.setKrajnoVreme(dateTime2); - rezervacija.setBrojNaPmesta(this.parkingMestoRepository.findById(broj_na_pmesta).get()); - Plakjanje plakjanje = plakjanjeRepository.findById(113).get(); - rezervacija.setIdPlakanje(plakjanje); - this.rezervacijaRepository.save(rezervacija); - return "redirect:/success"; - } - - - - -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/ReservationInfo.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/ReservationInfo.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,31 +1,0 @@ -package com.proekt.Controller; - - -import com.proekt.Repository.ParkingMestoRepository; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -@RequestMapping("/reservation-info") -public class ReservationInfo { - - private final ParkingMestoRepository parkingMestoRepository; - - public ReservationInfo(ParkingMestoRepository parkingMestoRepository) { - this.parkingMestoRepository = parkingMestoRepository; - } - - @GetMapping - public String getRegisterPage(@RequestParam(required = false) String error, Model model) { - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - model.addAttribute("parking_mesto", this.parkingMestoRepository.findAll()); - model.addAttribute("bodyContent","reservationInfo"); - return "master-template"; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/SuccessController.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/SuccessController.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,17 +1,0 @@ -package com.proekt.Controller; - - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping("/success") -public class SuccessController { - @GetMapping - public String getViewHome(Model model) { - model.addAttribute("bodyContent","success"); - return "master-template"; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/Controller/test.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Controller/test.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,68 +1,0 @@ -package com.proekt.Controller; - -import com.proekt.Repository.*; -import com.proekt.model.*; -import com.proekt.model.Korisnik.Korisnik; -import com.proekt.model.Korisnik.KorisnikKey; -import com.proekt.model.Vraboten.Vraboten; -import com.proekt.model.Vraboten.VrabotenKey; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/tests") -public class test { - - private final NajavaRepository najavaRepository; - private final KorisnikRepository korisnikRepository; - private final VrabotenRepository1 vrabotenRepository; - private final AvtomobilRepository avtomobilRepository; - private final ParkingMestoRepository parkingMestoRepository; - private final PlakjanjeRepository plakjanjeRepository; - - - public test(NajavaRepository najavaRepository, KorisnikRepository korisnikRepository, VrabotenRepository1 vrabotenRepository, AvtomobilRepository avtomobilRepository, ParkingMestoRepository parkingMestoRepository, PlakjanjeRepository plakjanje, PlakjanjeRepository plakjanjeRepository) { - this.najavaRepository = najavaRepository; - this.korisnikRepository = korisnikRepository; - this.vrabotenRepository = vrabotenRepository; - this.avtomobilRepository = avtomobilRepository; - this.parkingMestoRepository = parkingMestoRepository; - this.plakjanjeRepository = plakjanjeRepository; - } - - - @GetMapping - public ResponseEntity viewQuery() { - Najava najava = new Najava(); - najava.setKorisnickoIme("korisnicko_ime"); - najava.setIme("ime"); - najava.setPrezime("prezime"); - najava.setEmbg("embg"); - najava.setEmail("email"); - najava.setBrTel("br_tel"); - najava.setPassword("password"); - - - - //////TEST-RESERVATION-ALL/////// - Avtomobil avtomobil = avtomobilRepository.findById("SK-2410-AZ").get(); - ParkingMesto parkingMesto = parkingMestoRepository.findById(1).get(); - Plakjanje plakjanje = plakjanjeRepository.findById(113).get(); - Rezervacija rezervacija = new Rezervacija(); - rezervacija.setIdRezervacija(1337); - rezervacija.setRegTablica(avtomobil); - rezervacija.setBrojNaPmesta(parkingMesto); - rezervacija.setIdPlakanje(plakjanje); - - return ResponseEntity.ok(rezervacija); - - - } - - - -} Index: urce/freeparkingspace/src/main/java/com/proekt/ProektApplication.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/ProektApplication.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.proekt; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class ProektApplication { - - public static void main(String[] args) { - SpringApplication.run(ProektApplication.class, args); - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/AdministratorRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/AdministratorRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Admin.AdminKey; -import com.proekt.model.Admin.Administrator; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface AdministratorRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/AvtomobilRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/AvtomobilRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Avtomobil; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface AvtomobilRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/KontrolerRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/KontrolerRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Kontroler.Kontroler; -import com.proekt.model.Kontroler.KontrolerKey; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface KontrolerRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/KorisnikRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/KorisnikRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Korisnik.Korisnik; -import com.proekt.model.Korisnik.KorisnikKey; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface KorisnikRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/NajavaRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/NajavaRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Najava; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface NajavaRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/ParkingMestoRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/ParkingMestoRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.ParkingMesto; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ParkingMestoRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/PlakjanjeRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/PlakjanjeRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Plakjanje; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PlakjanjeRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/RezervacijaRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/RezervacijaRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Rezervacija; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface RezervacijaRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/VrabotenRepository.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/VrabotenRepository.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Vraboten.Vraboten; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface VrabotenRepository extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Repository/VrabotenRepository1.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Repository/VrabotenRepository1.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.proekt.Repository; - -import com.proekt.model.Vraboten.Vraboten; -import com.proekt.model.Vraboten.VrabotenKey; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface VrabotenRepository1 extends JpaRepository { -} Index: urce/freeparkingspace/src/main/java/com/proekt/Service/AdminService.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Service/AdminService.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.proekt.Service; - -import com.proekt.model.Admin.Administrator; -import com.proekt.model.Vraboten.Vraboten; - -public interface AdminService { - public Administrator delete(String id); -} Index: urce/freeparkingspace/src/main/java/com/proekt/Service/EmployeeService.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Service/EmployeeService.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Service; - -import com.proekt.model.Vraboten.Vraboten; - -public interface EmployeeService{ - public Vraboten delete(String id); -} Index: urce/freeparkingspace/src/main/java/com/proekt/Service/KontrolerService.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Service/KontrolerService.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.proekt.Service; - -import com.proekt.model.Kontroler.Kontroler; - -public interface KontrolerService { - public Kontroler delete(String id); -} Index: urce/freeparkingspace/src/main/java/com/proekt/Service/ServiceImpl/AdminServiceImpl.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Service/ServiceImpl/AdminServiceImpl.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,32 +1,0 @@ -package com.proekt.Service.ServiceImpl; - -import com.proekt.Repository.AdministratorRepository; -import com.proekt.Repository.NajavaRepository; -import com.proekt.Service.AdminService; -import com.proekt.Service.EmployeeService; -import com.proekt.model.Admin.AdminKey; -import com.proekt.model.Admin.Administrator; -import com.proekt.model.Najava; -import org.springframework.stereotype.Service; - -@Service -public class AdminServiceImpl implements AdminService { - - private final NajavaRepository najavaRepository; - private final AdministratorRepository administratorRepository; - - public AdminServiceImpl(NajavaRepository najavaRepository, AdministratorRepository administratorRepository) { - this.najavaRepository = najavaRepository; - this.administratorRepository = administratorRepository; - } - - @Override - public Administrator delete(String id) { - Najava najava2 = najavaRepository.findById(id).get(); - AdminKey vrabotenKey1 = new AdminKey(najava2); - Administrator vraboten3 = administratorRepository.findById(vrabotenKey1).get(); - this.administratorRepository.delete(vraboten3); - return vraboten3; - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/Service/ServiceImpl/EmployeeServiceImpl.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/Service/ServiceImpl/EmployeeServiceImpl.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,31 +1,0 @@ -package com.proekt.Service.ServiceImpl; - -import com.proekt.Repository.NajavaRepository; -import com.proekt.Repository.VrabotenRepository1; -import com.proekt.Service.EmployeeService; -import com.proekt.model.Najava; -import com.proekt.model.Vraboten.Vraboten; -import com.proekt.model.Vraboten.VrabotenKey; -import org.springframework.stereotype.Service; - -@Service -public class EmployeeServiceImpl implements EmployeeService { - - private final NajavaRepository najavaRepository; - private final VrabotenRepository1 vrabotenRepository1; - - public EmployeeServiceImpl(NajavaRepository najavaRepository, VrabotenRepository1 vrabotenRepository1) { - this.najavaRepository = najavaRepository; - this.vrabotenRepository1 = vrabotenRepository1; - } - - @Override - public Vraboten delete(String id) { - Najava najava2 = najavaRepository.findById(id).get(); - VrabotenKey vrabotenKey1 = new VrabotenKey(najava2); - Vraboten vraboten3 = vrabotenRepository1.findById(vrabotenKey1).get(); - this.vrabotenRepository1.delete(vraboten3); - return vraboten3; - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Admin/AdminKey.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Admin/AdminKey.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,34 +1,0 @@ -package com.proekt.model.Admin; - - -import com.proekt.model.Najava; - -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import java.io.Serializable; - -@Embeddable -public class AdminKey implements Serializable { - - @ManyToOne - @JoinColumn(name="korisnicko_ime") - public Najava user; - - public AdminKey(Najava user) { - this.user = user; - } - - public AdminKey() { - - } - - public Najava getUser() { - return user; - } - - public void setUser(Najava user) { - this.user = user; - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Admin/Administrator.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Admin/Administrator.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,41 +1,0 @@ -package com.proekt.model.Admin; -import lombok.Data; - -import javax.persistence.*; - -@Data -@Table(name = "administrator") -@Entity -public class Administrator{ - - @EmbeddedId - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false, unique = true) - private AdminKey adminKey; - - private int idAdministrator; - - public Administrator(AdminKey adminKey, int idAdministrator) { - this.adminKey = adminKey; - this.idAdministrator = idAdministrator; - } - - public Administrator() { - } - - public AdminKey getAdminKey() { - return adminKey; - } - - public void setAdminKey(AdminKey adminKey) { - this.adminKey = adminKey; - } - - public int getIdAdministrator() { - return idAdministrator; - } - - public void setIdAdministrator(int idAdministrator) { - this.idAdministrator = idAdministrator; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Avtomobil.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Avtomobil.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,73 +1,0 @@ -package com.proekt.model; - - -import com.proekt.model.Korisnik.Korisnik; -import lombok.Data; - -import javax.persistence.*; -import javax.persistence.ManyToOne; - -@Data -@Table -@Entity - -public class Avtomobil { - - @Id - @Column(name="reg_tablica") - private String regTablica; - - @Column(nullable = false,length = 20,unique = true) - private String marka; - - @Column(nullable = false,length = 15,unique = true) - private String boja; - - - - @ManyToOne - @JoinColumn(name="korisnickoime") - public Korisnik korisnickoIme; - - public Avtomobil(String regTablica, String marka, String boja, Korisnik korisnik) { - this.regTablica = regTablica; - this.korisnickoIme = korisnik; - this.marka = marka; - this.boja = boja; - } - - public Avtomobil() { - } - - public String getRegTablica() { - return regTablica; - } - - public void setRegTablica(String regTablica) { - this.regTablica = regTablica; - } - - public String getMarka() { - return marka; - } - - public void setMarka(String marka) { - this.marka = marka; - } - - public String getBoja() { - return boja; - } - - public void setBoja(String boja) { - this.boja = boja; - } - - public Korisnik getKorisnickoIme() { - return korisnickoIme; - } - - public void setKorisnickoIme(Korisnik korisnickoIme) { - this.korisnickoIme = korisnickoIme; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/ImeNaParking.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/ImeNaParking.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,54 +1,0 @@ -package com.proekt.model; -import lombok.Data; -import javax.persistence.ManyToOne; -import javax.persistence.*; -import com.proekt.model.Admin.Administrator; -@Data -@Table -@Entity - -public class ImeNaParking { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false, unique = true) - private int Id_ime; - - @Column(nullable = false,length = 150,unique = true) - private String Lokacija; - - @ManyToOne - @JoinColumn(name="administrator_korisnicko_ime") - public Administrator korisnickoime; - - public ImeNaParking(int id_ime, String lokacija) { - Id_ime = id_ime; - Lokacija = lokacija; - } - - public ImeNaParking() { - } - - public int getId_ime() { - return Id_ime; - } - - public void setId_ime(int id_ime) { - Id_ime = id_ime; - } - - public String getLokacija() { - return Lokacija; - } - - public void setLokacija(String lokacija) { - Lokacija = lokacija; - } - - public Administrator getKorisnickoime() { - return korisnickoime; - } - - public void setKorisnickoime(Administrator korisnickoime) { - this.korisnickoime = korisnickoime; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Kancelar.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Kancelar.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,22 +1,0 @@ -package com.proekt.model; -import com.proekt.model.Vraboten.Vraboten; -import lombok.Data; - -import javax.persistence.*; - -@Data -@Table -@Entity -public class Kancelar{ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false, unique = true) - private int idKancelar; - - public Kancelar(int idKancelar) { - this.idKancelar = idKancelar; - } - - public Kancelar() { - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Kazna.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Kazna.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,31 +1,0 @@ -package com.proekt.model; -import com.proekt.model.Korisnik.Korisnik; -import lombok.Data; -import javax.persistence.ManyToOne; -import javax.persistence.*; - -@Data -@Table -@Entity -public class Kazna { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false,unique = true) - private int idKazna; - @Column(nullable = false,unique = true) - private int iznos; - @Column(nullable = false,unique = true) - private int brojKazni; - @ManyToOne - @JoinColumn(name="korisnickoime") - public Korisnik korisnickoIme; - - public Kazna() { - } - - public Kazna(int idKazna, int iznos, int brojKazni) { - this.idKazna = idKazna; - this.iznos = iznos; - this.brojKazni = brojKazni; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Kontrola.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Kontrola.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,52 +1,0 @@ -package com.proekt.model; - -import com.proekt.model.Kontroler.Kontroler; -import lombok.Data; - -import javax.persistence.*; -import java.time.LocalDateTime; -import javax.persistence.ManyToOne; -@Data -@Table -@Entity -public class Kontrola { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false, unique = true) - private int idKontrola; - - @Column(nullable = false, unique = true) - private int izvrsenaKontrola; - - @Column(nullable = false, unique = true) - private LocalDateTime vremeNaKontrola; - - @Column(nullable = false,length = 300) - private String konstantacija; - - @ManyToOne - @JoinColumn(name="korisnicko_ime") - public Kontroler korisnickoIme; - - @ManyToOne - @JoinColumn(name="broj_na_pmesta") - public ParkingMesto brojNaPmesta; - - @ManyToOne - @JoinColumn(name="id_rezervacija") - public Rezervacija idRezervacija; - - @ManyToOne - @JoinColumn(name="id_kazna") - public Kazna idKazna; - - public Kontrola() { - } - - public Kontrola(int idKontrola, int izvrsenaKontrola, LocalDateTime vremeNaKontrola, String konstantacija) { - this.idKontrola = idKontrola; - this.izvrsenaKontrola = izvrsenaKontrola; - this.vremeNaKontrola = vremeNaKontrola; - this.konstantacija = konstantacija; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Kontroler/Kontroler.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Kontroler/Kontroler.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,41 +1,0 @@ -package com.proekt.model.Kontroler; - -import lombok.Data; - -import javax.persistence.*; - -@Data -@Table -@Entity -public class Kontroler{ - - private int id_kontroler; - - @EmbeddedId - private KontrolerKey kontrolerKey; - - public Kontroler(int id_kontroler, KontrolerKey kontrolerKey) { - this.id_kontroler = id_kontroler; - this.kontrolerKey = kontrolerKey; - } - - public Kontroler() { - - } - - public int getId_kontroler() { - return id_kontroler; - } - - public void setId_kontroler(int id_kontroler) { - this.id_kontroler = id_kontroler; - } - - public KontrolerKey getKontrolerKey() { - return kontrolerKey; - } - - public void setKontrolerKey(KontrolerKey kontrolerKey) { - this.kontrolerKey = kontrolerKey; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Kontroler/KontrolerKey.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Kontroler/KontrolerKey.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,32 +1,0 @@ -package com.proekt.model.Kontroler; - -import com.proekt.model.Najava; - -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import java.io.Serializable; - -@Embeddable -public class KontrolerKey implements Serializable { - - @ManyToOne - @JoinColumn(name="korisnicko_ime") - public Najava user; - - public KontrolerKey(Najava user) { - this.user = user; - } - - public KontrolerKey() { - - } - - public Najava getUser() { - return user; - } - - public void setUser(Najava user) { - this.user = user; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Korisnik/Korisnik.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Korisnik/Korisnik.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,41 +1,0 @@ -package com.proekt.model.Korisnik; -import lombok.Data; - -import javax.persistence.*; -@Data -@Table(name = "korisnik") -@Entity -public class Korisnik{ - - @EmbeddedId - @GeneratedValue(strategy = GenerationType.IDENTITY) - private KorisnikKey korisnikKey; - - @Column(name = "id_korisnik") - private int korisnicko_ime; - - public Korisnik(KorisnikKey korisnikKey, int korisnicko_ime) { - this.korisnikKey = korisnikKey; - this.korisnicko_ime = korisnicko_ime; - } - - public Korisnik() { - - } - - public KorisnikKey getKorisnikKey() { - return korisnikKey; - } - - public void setKorisnikKey(KorisnikKey korisnikKey) { - this.korisnikKey = korisnikKey; - } - - public int getKorisnicko_ime() { - return korisnicko_ime; - } - - public void setKorisnicko_ime(int korisnicko_ime) { - this.korisnicko_ime = korisnicko_ime; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Korisnik/KorisnikKey.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Korisnik/KorisnikKey.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,32 +1,0 @@ -package com.proekt.model.Korisnik; - -import com.proekt.model.Najava; - -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import java.io.Serializable; - -@Embeddable -public class KorisnikKey implements Serializable { - - @ManyToOne - @JoinColumn(name="korisnicko_ime") - public Najava user; - - public KorisnikKey(Najava user) { - this.user = user; - } - - public KorisnikKey() { - - } - - public Najava getUser() { - return user; - } - - public void setUser(Najava user) { - this.user = user; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Najava.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Najava.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,97 +1,0 @@ -package com.proekt.model; -import lombok.Data; - -import javax.persistence.*; - -@Table(name = "najava") -@Data -@Entity - -@Inheritance(strategy = InheritanceType.JOINED) -public class Najava { - @Id - @Column (nullable = false,unique = true, length = 150) - private String korisnickoIme; - - @Column (nullable = false,unique = true, length = 13) - private String embg; - @Column (nullable = false,unique = true, length = 150) - private String brTel; - @Column (nullable = false,unique = true, length = 50) - private String email; - @Column (nullable = false,unique = true, length = 150) - private String password; - @Column (nullable = false,unique = true, length = 150) - private String ime; - @Column (nullable = false,unique = true, length = 150) - private String prezime; - - public Najava() { - } - - public Najava(String korisnickoIme, String embg, String brTel, String email, String password, String ime, String prezime) { - this.korisnickoIme = korisnickoIme; - this.embg = embg; - this.brTel = brTel; - this.email = email; - this.password = password; - this.ime = ime; - this.prezime = prezime; - } - - public String getKorisnickoIme() { - return korisnickoIme; - } - - public void setKorisnickoIme(String korisnickoIme) { - this.korisnickoIme = korisnickoIme; - } - - public String getEmbg() { - return embg; - } - - public void setEmbg(String embg) { - this.embg = embg; - } - - public String getBrTel() { - return brTel; - } - - public void setBrTel(String brTel) { - this.brTel = brTel; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getIme() { - return ime; - } - - public void setIme(String ime) { - this.ime = ime; - } - - public String getPrezime() { - return prezime; - } - - public void setPrezime(String prezime) { - this.prezime = prezime; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/ParkingMesto.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/ParkingMesto.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,44 +1,0 @@ -package com.proekt.model; -import lombok.Data; -import javax.persistence.ManyToOne; -import javax.persistence.*; - -@Data -@Table(name = "parking_mesto") -@Entity -public class ParkingMesto { - - - @Id - @Column(nullable = false, unique = true) - private int brojNaPmesta; - - @ManyToOne - @JoinColumn(name="idzona") - public Zona idZona; - - public ParkingMesto(int brojNaPmesta, Zona idZona) { - this.brojNaPmesta = brojNaPmesta; - this.idZona = idZona; - } - - public ParkingMesto() { - } - - public int getBrojNaPmesta() { - return brojNaPmesta; - } - - public void setBrojNaPmesta(int brojNaPmesta) { - this.brojNaPmesta = brojNaPmesta; - } - - public Zona getIdZona() { - return idZona; - } - - public void setIdZona(Zona idZona) { - this.idZona = idZona; - } - -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Plakjanje.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Plakjanje.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,38 +1,0 @@ -package com.proekt.model; -import com.proekt.model.Korisnik.Korisnik; -import lombok.Data; -import javax.persistence.ManyToOne; -import javax.persistence.*; - -@Data -@Table -@Entity - -public class Plakjanje { - - @Id - @Column(nullable = false, unique = true) - private int idPlakanje; - - @Column(nullable = false,length = 30,unique = true) - private String brTel; - - @Column(nullable = false,length = 150,unique = true) - private String brNaSmetka; - - @Column(nullable = false,length = 150,unique = true) - private String tipPlakjanje; - @ManyToOne - @JoinColumn(name="korisnickoime") - public Korisnik korisnickoIme; - - public Plakjanje() { - } - - public Plakjanje(int idPlakanje, String brTel, String brNaSmetka, String tipPlakjanje) { - this.idPlakanje = idPlakanje; - this.brTel = brTel; - this.brNaSmetka = brNaSmetka; - this.tipPlakjanje = tipPlakjanje; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Rezervacija.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Rezervacija.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,93 +1,0 @@ -package com.proekt.model; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; - -import lombok.Data; - - -import javax.persistence.*; -import java.time.LocalDateTime; - -@Data -@Table -@Entity - -public class Rezervacija { - @Id - @Column(name = "id_rezervacija") - private int idRezervacija; - private LocalDateTime pocetnoVreme; - private LocalDateTime krajnoVreme; - - @ManyToOne - @JoinColumn(name="reg_tablica") - public Avtomobil regTablica; - - @OneToOne - @JoinColumn(name="broj_na_pmesta") - private ParkingMesto brojNaPmesta; - - @OneToOne - @JoinColumn(name="id_plakanje") - private Plakjanje idPlakanje; - - public Rezervacija() { - } - - public Rezervacija(int idRezervacija, LocalDateTime pocetnoVreme, LocalDateTime krajnoVreme, Avtomobil regTablica, ParkingMesto brojNaPmesta, Plakjanje idPlakanje) { - this.idRezervacija = idRezervacija; - this.pocetnoVreme = pocetnoVreme; - this.krajnoVreme = krajnoVreme; - this.regTablica = regTablica; - this.brojNaPmesta = brojNaPmesta; - this.idPlakanje = idPlakanje; - } - - public int getIdRezervacija() { - return idRezervacija; - } - - public void setIdRezervacija(int idRezervacija) { - this.idRezervacija = idRezervacija; - } - - public LocalDateTime getPocetnoVreme() { - return pocetnoVreme; - } - - public void setPocetnoVreme(LocalDateTime pocetnoVreme) { - this.pocetnoVreme = pocetnoVreme; - } - - public LocalDateTime getKrajnoVreme() { - return krajnoVreme; - } - - public void setKrajnoVreme(LocalDateTime krajnoVreme) { - this.krajnoVreme = krajnoVreme; - } - - public Avtomobil getRegTablica() { - return regTablica; - } - - public void setRegTablica(Avtomobil regTablica) { - this.regTablica = regTablica; - } - - public ParkingMesto getBrojNaPmesta() { - return brojNaPmesta; - } - - public void setBrojNaPmesta(ParkingMesto brojNaPmesta) { - this.brojNaPmesta = brojNaPmesta; - } - - public Plakjanje getIdPlakanje() { - return idPlakanje; - } - - public void setIdPlakanje(Plakjanje idPlakanje) { - this.idPlakanje = idPlakanje; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Vraboten/Vraboten.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Vraboten/Vraboten.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,52 +1,0 @@ -package com.proekt.model.Vraboten; -import lombok.Data; - -import javax.persistence.*; -@Data -@Table -@Entity -public class Vraboten{ - - private int idVraboten; - - @Column(name = "uloga") - private String uloga; - - @EmbeddedId - @GeneratedValue(strategy = GenerationType.IDENTITY) - private VrabotenKey vrabotenKey; - - - public Vraboten() { - } - - public Vraboten(int idVraboten, String uloga, VrabotenKey vrabotenKey) { - this.vrabotenKey = vrabotenKey; - this.idVraboten = idVraboten; - this.uloga = uloga; - } - - public VrabotenKey getVrabotenKey() { - return vrabotenKey; - } - - public void setVrabotenKey(VrabotenKey vrabotenKey) { - this.vrabotenKey = vrabotenKey; - } - - public int getIdVraboten() { - return idVraboten; - } - - public void setIdVraboten(int idVraboten) { - this.idVraboten = idVraboten; - } - - public String getUloga() { - return uloga; - } - - public void setUloga(String uloga) { - this.uloga = uloga; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Vraboten/VrabotenKey.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Vraboten/VrabotenKey.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,32 +1,0 @@ -package com.proekt.model.Vraboten; - -import com.proekt.model.Najava; - -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import java.io.Serializable; - -@Embeddable -public class VrabotenKey implements Serializable { - - @ManyToOne - @JoinColumn(name="korisnicko_ime") - public Najava user; - - public VrabotenKey(Najava user) { - this.user = user; - } - - public VrabotenKey() { - - } - - public Najava getUser() { - return user; - } - - public void setUser(Najava user) { - this.user = user; - } -} Index: urce/freeparkingspace/src/main/java/com/proekt/model/Zona.java =================================================================== --- source/freeparkingspace/src/main/java/com/proekt/model/Zona.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,43 +1,0 @@ -package com.proekt.model; - -import lombok.Data; -import javax.persistence.ManyToOne; -import javax.persistence.*; - -@Data -@Table(name = "zona") -@Entity -public class Zona { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false, unique = true) - private String idZona; - @ManyToOne - @JoinColumn(name="ime_na_parking_id_ime") - public ImeNaParking idIme; - - public Zona(String idZona, ImeNaParking idIme) { - this.idZona = idZona; - this.idIme = idIme; - } - - - public Zona() { - } - - public String getIdZona() { - return idZona; - } - - public void setIdZona(String idZona) { - this.idZona = idZona; - } - - public ImeNaParking getIdIme() { - return idIme; - } - - public void setIdIme(ImeNaParking idIme) { - this.idIme = idIme; - } -} Index: urce/freeparkingspace/src/main/resources/application.properties =================================================================== --- source/freeparkingspace/src/main/resources/application.properties (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,19 +1,0 @@ -spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_freeparkingspace -spring.datasource.username=db_202122z_va_prj_freeparkingspace_owner -spring.datasource.password=62fdb3e574df - - -spring.datasource.hikari.connectionTimeout=20000 -spring.datasource.hikari.maximumPoolSize=5 - -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect -spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true - -spring.jpa.show-sql=true -spring.main.allow-bean-definition-overriding=true -spring.mvc.hiddenmethod.filter.enabled = true - - - -server.port=9084 Index: urce/freeparkingspace/src/main/resources/static/css/masterCss.css =================================================================== --- source/freeparkingspace/src/main/resources/static/css/masterCss.css (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,225 +1,0 @@ -@import url('https://fonts.googleapis.com/css?family=Montserrat:500'); -@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap'); - -:root { - --shadow-color: #FF9E9E; - --shadow-color-light: white; -} - -.navbar { - max-width: 100%; - height: 100%; - background: rgba(0,0,0,0.25); -} - -header { - display: flex; - justify-content: center; - align-items: center; - padding: 30px 10%; - max-width: 100%; - height: 10%; - background-color: rgb(0, 0, 0, 0.25); - border: none; - color: white; -} - -table{ - border-collapse: collapse; - color: white; - font-size: 0.3rem; - background: rgba(0,0,0,0.4); - -} - -img { - width: 120px; - height: 120px; - margin-right: 230px; - margin-left: 5px; -} -html{ - text-align: center; -} -body { - padding: 0; - margin: 0; - max-width: 100%; - background-image: url('batman.webp'); - object-fit: cover; - height: 100vh; - background-size: cover; - background-repeat: no-repeat; -} - - -li, -a:not(.btn) { - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 1.2rem; - text-decoration: none; - color: white; - padding: 10%; - list-style: none; -} - -h1{ - font-family: 'Roboto', sans-serif; - font-width: 900; - font-size: 5rem; - -} -#projection-add -{ - margin-left: 142px; - width: 75%; -} -label{ -color:white; -font-size: 1rem; -} -.right { - display: flex; - align-items: center; - justify-content: center; - background-color: rgb(0, 225, 255, 0.05); - border-radius: 10%; - flex-direction: row; - margin-left: 25%; - width: 17%; - height: 2%; -} - -.right a { - margin: -5px; -} -.navbar{ - max-width: 100%; - height: 100vh; -} - -.reg { - color: rgb(255, 0, 0); -} - -ul { - display: flex; - flex-direction: row; -} - -li, -a:hover:not(.btn) { - color: red; - font-size: 1.5rem; -} - -.reg:hover { - color: white; -} -.container-main{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - width: 100%; - height: 100% -} -P{ - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 4rem; - text-decoration: none; - color: white; - width: 80%; - list-style: none; - margin-top: -2%; -} - -.glow{ - text-transform: uppercase; - height: auto; - text-align: center; -} - -.glow { - color: white; - animation: neon 3s infinite; -} - -.h1Combined{ - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - max-width: 100%; -} - -@keyframes neon { - 0% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } - 50% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light), - 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color); - } - 100% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } -} - -.btn{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn:hover{ - background-color: #58ACFA; - color: white; -} - -.btn2{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn2:hover{ - background-color: #58ACFA; - color: white; -} - Index: urce/freeparkingspace/src/main/resources/static/css/projection.css =================================================================== --- source/freeparkingspace/src/main/resources/static/css/projection.css (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,219 +1,0 @@ -@import url('https://fonts.googleapis.com/css?family=Montserrat:500'); -@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap'); - -:root { - --shadow-color: #FF9E9E; - --shadow-color-light: white; -} - -.navbar { - max-width: 100%; - height: 100%; - background: rgba(0,0,0,0.25); -} - -header { - display: flex; - justify-content: center; - align-items: center; - padding: 30px 10%; - max-width: 100%; - height: 10%; - background-color: rgb(0, 0, 0, 0.25); - border: none; -} - -table{ - border-collapse: collapse; - color: white; - font-size: 2rem; - background: rgba(0,0,0,0.4); - margin-left: 10px; - -} - -img { - width: 120px; - height: 120px; -} -html{ - text-align: center; -} -body { - padding: 0; - margin: 0; - max-width: 100%; - background: white; - object-fit: cover; - height: 100vh; - background-size: cover; - background-repeat: no-repeat; -} - - -li, -a:not(.btn) { - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 1.2rem; - text-decoration: none; - color: white; - padding: 10%; - list-style: none; -} - -h1{ - font-family: 'Roboto', sans-serif; - font-width: 900; - font-size: 5rem; - -} -#projection-add -{ - margin-left: 100px; - width: 50%; -} -.right { - display: flex; - align-items: center; - justify-content: center; - background-color: rgb(0, 225, 255, 0.05); - border-radius: 10%; - flex-direction: row; - margin-left: 25%; - width: 17%; - height: 2%; -} - -.right a { - margin: -5px; -} -.navbar{ - max-width: 100%; - height: 100vh; -} - -.reg { - color: rgb(255, 0, 0); -} - -ul { - display: flex; - flex-direction: row; -} - -li, -a:hover:not(.btn) { - color: red; - font-size: 1.5rem; -} - -.reg:hover { - color: white; -} -.container-main{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - width: 100%; - height: 100% -} -P{ - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 4rem; - text-decoration: none; - color: white; - width: 80%; - list-style: none; - margin-top: -2%; -} - -.glow{ - text-transform: uppercase; - height: auto; - text-align: center; -} - -.glow { - color: white; - animation: neon 3s infinite; -} - -.h1Combined{ - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - max-width: 100%; -} - -@keyframes neon { - 0% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } - 50% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light), - 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color); - } - 100% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } -} - -.btn{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn:hover{ - background-color: #58ACFA; - color: white; -} - -.btn2{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn2:hover{ - background-color: #58ACFA; - color: white; -} - Index: urce/freeparkingspace/src/main/resources/static/css/style.css =================================================================== --- source/freeparkingspace/src/main/resources/static/css/style.css (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,213 +1,0 @@ -@import url('https://fonts.googleapis.com/css?family=Montserrat:500'); -@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap'); - -:root { - --shadow-color: #FF9E9E; - --shadow-color-light: white; -} - -.navbar { - max-width: 100%; - height: 100%; - background: rgba(0,0,0,0.25); -} - -header { - display: flex; - justify-content: center; - align-items: center; - padding: 30px 10%; - max-width: 100%; - height: 10%; - background-color: rgb(0, 0, 0, 0.25); - border: none; -} - -table{ - color: white; - font-size: 0.3rem; - background: rgba(255,255,255,0.05); -} - -img { - width: 120px; - height: 120px; -} -html{ - text-align: center; -} -body { - padding: 0; - margin: 0; - max-width: 100%; - background-image: url('../images/background2.jpg'); - object-fit: cover; - height: 100vh; - background-size: cover; - background-repeat: no-repeat; - text-align: center; -} - - -li, -a:not(.btn) { - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 1.2rem; - text-decoration: none; - color: white; - padding: 10%; - list-style: none; -} - -h1{ - font-family: 'Roboto', sans-serif; - font-width: 900; - font-size: 5rem; - -} - -.right { - display: flex; - align-items: center; - justify-content: center; - background-color: rgb(0, 225, 255, 0.05); - border-radius: 10%; - flex-direction: row; - margin-left: 25%; - width: 17%; - height: 2%; -} - -.right a { - margin: -5px; -} -.navbar{ - max-width: 100%; - height: 100vh; -} - -.reg { - color: rgb(255, 0, 0); -} - -ul { - display: flex; - flex-direction: row; -} - -li, -a:hover { - color: red; - font-size: 1.3rem; -} - -.reg:hover { - color: white; -} -.container-main{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - width: 100%; - height: 100% -} -P{ - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 4rem; - text-decoration: none; - color: white; - width: 80%; - list-style: none; - margin-top: -2%; -} - -.glow{ - text-transform: uppercase; - height: auto; - text-align: center; -} - -.glow { - color: white; - animation: neon 3s infinite; -} - -.h1Combined{ - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - max-width: 100%; -} - -@keyframes neon { - 0% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } - 50% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light), - 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color); - } - 100% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } -} - -.btn{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 3vw; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn:hover{ - background-color: #58ACFA; - color: white; -} - -.btn2{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn2:hover{ - background-color: #58ACFA; - color: white; -} - Index: urce/freeparkingspace/src/main/resources/static/css/styleAuditoriums.css =================================================================== --- source/freeparkingspace/src/main/resources/static/css/styleAuditoriums.css (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,482 +1,0 @@ -@import url('https://fonts.googleapis.com/css?family=Montserrat:500'); -@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap'); - -:root { - --shadow-color: #FF9E9E; - --shadow-color-light: white; -} - -.navbar { - max-width: 100%; - height: 100%; - background: rgba(0,0,0,0.25); -} - -header { - display: flex; - justify-content: center; - align-items: center; - padding: 30px 10%; - max-width: 100%; - height: 10%; - background-color: rgb(0, 0, 0, 0.25); - border: none; -} - -table{ - border-collapse: collapse; - color: white; - font-size: 0.3rem; - background: rgba(0,0,0,0.4); - margin-left: 210px; - margin-top: 50px; - -} - -img { - width: 120px; - height: 120px; -} -html{ - text-align: center; -} -body { - padding: 0; - margin: 0; - max-width: 100%; - background-image: url('giphyavengers.webp'); - object-fit: cover; - height: 100vh; - background-size: cover; - background-repeat: no-repeat; -} - - -li, -a:not(.btn) { - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 1.2rem; - text-decoration: none; - color: white; - padding: 10%; - list-style: none; -} - -h1{ - font-family: 'Roboto', sans-serif; - font-width: 900; - font-size: 6rem; - -} - -.right { - display: flex; - align-items: center; - justify-content: center; - background-color: rgb(0, 225, 255, 0.05); - border-radius: 10%; - flex-direction: row; - margin-left: 25%; - width: 17%; - height: 2%; -} - -.right a { - margin: -5px; -} -.navbar{ - max-width: 100%; - height: 100vh; -} - -.reg { - color: rgb(255, 0, 0); -} - -ul { - display: flex; - flex-direction: row; -} - -li, -a:hover:not(.btn) { - color: red; - font-size: 1.5rem; -} - -.reg:hover { - color: white; -} -.container-main{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - width: 100%; - height: 100% -} -P{ - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 4rem; - text-decoration: none; - color: white; - width: 80%; - list-style: none; - margin-top: -2%; -} - -.glow{ - text-transform: uppercase; - height: auto; - text-align: center; -} - -.glow { - color: white; - animation: neon 3s infinite; -} - -.h1Combined{ - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - max-width: 100%; -} - -@keyframes neon { - 0% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } - 50% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light), - 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color); - } - 100% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } -} - -.btn{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn:hover{ - background-color: #58ACFA; - color: white; -} - -.btn2{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn2:hover{ - background-color: #58ACFA; - color: white; -} - - - - - -/*@import url('https://fonts.googleapis.com/css?family=Montserrat:500');*/ -/*@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap');*/ - -/*:root {*/ -/* --shadow-color: #FF9E9E;*/ -/* --shadow-color-light: white;*/ -/*}*/ - -/*.navbar {*/ -/* max-width: 100%;*/ -/* height: 100%;*/ -/* background: rgba(0,0,0,0.25);*/ -/*}*/ - -/*header {*/ -/* display: flex;*/ -/* justify-content: center;*/ -/* align-items: center;*/ -/* padding: 30px 10%;*/ -/* max-width: 100%;*/ -/* height: 10%;*/ -/* background-color: rgb(0, 0, 0, 0.25);*/ -/* border: none;*/ -/*}*/ - -/*table{*/ -/* border-collapse: collapse;*/ -/* color: white;*/ -/* font-size: 1.5rem;*/ -/* background: rgba(0,0,0,0.4);*/ - -/*}*/ - -/*img {*/ -/* width: 120px;*/ -/* height: 120px;*/ -/*}*/ -/*html{*/ -/* text-align: center;*/ -/*}*/ -/*body {*/ -/* padding: 0;*/ -/* margin: 0;*/ -/* max-width: 100%;*/ -/* background-image: url('giphyavengers.webp');*/ -/* object-fit: cover;*/ -/* height: 100vh;*/ -/* background-size: cover;*/ -/* background-repeat: no-repeat;*/ -/*}*/ - -/*!*:root {*!*/ -/*!* --shadow-color: #FF9E9E;*!*/ -/*!* --shadow-color-light: white;*!*/ -/*!*}*!*/ - -/*!*.navbar {*!*/ -/*!* max-width: 100%;*!*/ -/*!* height: 100%;*!*/ -/*!* background: rgba(0,0,0,0.25);*!*/ -/*!*}*!*/ - -/*!*header {*!*/ -/*!* display: flex;*!*/ -/*!* justify-content: center;*!*/ -/*!* align-items: center;*!*/ -/*!* padding: 30px 10%;*!*/ -/*!* max-width: 100%;*!*/ -/*!* height: 10%;*!*/ -/*!* background-color: rgb(0, 0, 0, 0.25);*!*/ -/*!* border: none;*!*/ -/*!*}*!*/ - -/*!*table{*!*/ -/*!* border-collapse: collapse;*!*/ -/*!* color: white;*!*/ -/*!* font-size: 4rem;*!*/ -/*!* background: rgba(0,0,0,0.4);*!*/ - -/*!*}*!*/ - -/*!*img {*!*/ -/*!* width: 120px;*!*/ -/*!* height: 120px;*!*/ -/*!*}*!*/ -/*!*html{*!*/ -/*!* text-align: center;*!*/ -/*!*}*!*/ -/*!*body {*!*/ -/*!* padding: 0;*!*/ -/*!* margin: 0;*!*/ -/*!* max-width: 100%;*!*/ -/*!* background-image: url('auditorium.png');*!*/ -/*!* object-fit: cover;*!*/ -/*!* height: 100vh;*!*/ -/*!* background-size: cover;*!*/ -/*!* background-repeat: no-repeat;*!*/ -/*!*}*!*/ - - -/*li,*/ -/*a:not(.btn) {*/ -/* font-family: "Montserrat", sans-serif;*/ -/* font-weight: 500;*/ -/* font-size: 1.2rem;*/ -/* text-decoration: none;*/ -/* color: white;*/ -/* padding: 10%;*/ -/* list-style: none;*/ -/*}*/ - -/*h1{*/ -/* font-family: 'Roboto', sans-serif;*/ -/* font-width: 900;*/ -/* font-size: 6rem;*/ - -/*}*/ - -/*.right {*/ -/* display: flex;*/ -/* align-items: center;*/ -/* justify-content: center;*/ -/* background-color: rgb(0, 225, 255, 0.05);*/ -/* border-radius: 10%;*/ -/* flex-direction: row;*/ -/* margin-left: 25%;*/ -/* width: 17%;*/ -/* height: 2%;*/ -/*}*/ - -/*.right a {*/ -/* margin: -5px;*/ -/*}*/ -/*.navbar{*/ -/* max-width: 100%;*/ -/* height: 100vh;*/ -/*}*/ - -/*.reg {*/ -/* color: rgb(255, 0, 0);*/ -/*}*/ - -/*ul {*/ -/* display: flex;*/ -/* flex-direction: row;*/ -/*}*/ - -/*li,*/ -/*a:hover {*/ -/* color: red;*/ -/* font-size: 1.5rem;*/ -/*}*/ - -/*.reg:hover {*/ -/* color: white;*/ -/*}*/ -/*.container-main{*/ -/* display: flex;*/ -/* flex-direction: column;*/ -/* align-items: center;*/ -/* justify-content: center;*/ -/* width: 100%;*/ -/* height: 100%*/ -/*}*/ -/*P{*/ -/* font-family: "Montserrat", sans-serif;*/ -/* font-weight: 500;*/ -/* font-size: 4rem;*/ -/* text-decoration: none;*/ -/* color: white;*/ -/* width: 80%;*/ -/* list-style: none;*/ -/* margin-top: -2%;*/ -/*}*/ - -/*.glow{*/ -/* text-transform: uppercase;*/ -/* height: auto;*/ -/* text-align: center;*/ -/*}*/ - -/*.glow {*/ -/* color: white;*/ -/* animation: neon 3s infinite;*/ -/*}*/ - -/*.h1Combined{*/ -/* display: flex;*/ -/* flex-direction: row;*/ -/* align-items: center;*/ -/* justify-content: center;*/ -/* max-width: 100%;*/ -/*}*/ - -/*@keyframes neon {*/ -/* 0% {*/ -/* text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light),*/ -/* 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light),*/ -/* 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color);*/ -/* }*/ -/* 50% {*/ -/* text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light),*/ -/* 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light),*/ -/* 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color);*/ -/* }*/ -/* 100% {*/ -/* text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light),*/ -/* 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light),*/ -/* 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color);*/ -/* }*/ -/*}*/ - -/*.btn{*/ -/* text-shadow: -1px -1px 10px rgba(255,255,255,0.5);*/ -/* border: 1px solid #b70000;*/ -/* color: white;*/ -/* font-size: 1.5rem;*/ -/* border:none;*/ -/* background: #af0101;*/ -/* padding: 0.5rem 1.3rem;*/ -/* border-radius: 10%;*/ -/* cursor: pointer;*/ -/* transition: 1s ease;*/ -/* display:block;*/ -/* box-shadow: 3px 2px 10px #d50101,*/ -/* -1px -1px 1px #e60000;*/ -/* font-family: 'Roboto', sans-serif;*/ -/* font-weight: 500;*/ -/* text-decoration: none;*/ -/* transition: infinite 1s ease;*/ -/*}*/ - -/*.btn:hover{*/ -/* background-color: #58ACFA;*/ -/* color: white;*/ -/*}*/ - -/*.btn2{*/ -/* text-shadow: -1px -1px 10px rgba(255,255,255,0.5);*/ -/* border: 1px solid #b70000;*/ -/* color: white;*/ -/* font-size: 1.5rem;*/ -/* border:none;*/ -/* background: #af0101;*/ -/* padding: 0.5rem 1.3rem;*/ -/* border-radius: 10%;*/ -/* cursor: pointer;*/ -/* transition: 1s ease;*/ -/* display:block;*/ -/* box-shadow: 3px 2px 10px #d50101,*/ -/* -1px -1px 1px #e60000;*/ -/* font-family: 'Roboto', sans-serif;*/ -/* font-weight: 500;*/ -/* text-decoration: none;*/ -/* transition: infinite 1s ease;*/ -/*}*/ - -/*.btn2:hover{*/ -/* background-color: #58ACFA;*/ -/* color: white;*/ -/*}*/ - Index: urce/freeparkingspace/src/main/resources/static/css/styleMovies.css =================================================================== --- source/freeparkingspace/src/main/resources/static/css/styleMovies.css (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,443 +1,0 @@ -@import url('https://fonts.googleapis.com/css?family=Montserrat:500'); -@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap'); - -:root { - --shadow-color: #FF9E9E; - --shadow-color-light: white; -} - -.navbar { - max-width: 100%; - height: 100%; - background: rgba(0,0,0,0.25); -} - -header { - display: flex; - justify-content: center; - align-items: center; - padding: 30px 10%; - max-width: 100%; - height: 10%; - background-color: rgb(0, 0, 0, 0.25); - border: none; -} - -table{ - border-collapse: collapse; - color: white; - font-size: 2rem; - background: rgba(0,0,0,0.4); - margin-left:10px; - margin-bottom: 5%; - -} - -img { - width: 120px; - height: 120px; - border-bottom: 0px; -} -html{ - text-align: center; -} -body { - padding: 0; - margin: 0; - max-width: 100%; - background-image: url('batman.webp'); - object-fit: cover; - height: 100vh; - background-size: cover; - background-repeat: no-repeat; - -} - - -li, -a:not(.btn) { - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 1.2rem; - text-decoration: none; - color: white; - padding: 10%; - list-style: none; -} - -h1{ - font-family: 'Roboto', sans-serif; - font-width: 900; - font-size: 5rem; - -} -#projection-add -{ - margin-left: 142px; - width: 75%; -} -.right { - display: flex; - align-items: center; - justify-content: center; - background-color: rgb(0, 225, 255, 0.05); - border-radius: 10%; - flex-direction: row; - margin-left: 25%; - width: 17%; - height: 2%; -} - -.right a { - margin: -5px; -} -.navbar{ - max-width: 100%; - height: 100vh; -} - -.reg { - color: rgb(255, 0, 0); -} - -ul { - display: flex; - flex-direction: row; -} - -li, -a:hover:not(.btn) { - color: red; - font-size: 1.5rem; -} - -.reg:hover { - color: white; -} -.container-main{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - width: 100%; - height: 100% -} -P{ - font-family: "Montserrat", sans-serif; - font-weight: 500; - font-size: 4rem; - text-decoration: none; - color: white; - width: 80%; - list-style: none; - margin-top: -2%; -} - -.glow{ - text-transform: uppercase; - height: auto; - text-align: center; -} - -.glow { - color: white; - animation: neon 3s infinite; -} - -.h1Combined{ - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - max-width: 100%; -} - -@keyframes neon { - 0% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } - 50% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light), - 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color); - } - 100% { - text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light), - 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light), - 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color); - } -} - -.btn{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn:hover{ - background-color: #58ACFA; - color: white; -} - -.btn2{ - text-shadow: -1px -1px 10px rgba(255,255,255,0.5); - border: 1px solid #b70000; - color: white; - font-size: 1.5rem; - border:none; - background: #af0101; - padding: 0.5rem 1.3rem; - border-radius: 10%; - cursor: pointer; - transition: 1s ease; - display:block; - box-shadow: 3px 2px 10px #d50101, - -1px -1px 1px #e60000; - font-family: 'Roboto', sans-serif; - font-weight: 500; - text-decoration: none; - transition: infinite 1s ease; -} - -.btn2:hover{ - background-color: #58ACFA; - color: white; -} - - - - - - - - -/*@import url('https://fonts.googleapis.com/css?family=Montserrat:500');*/ -/*@import url('https://fonts.googleapis.com/css2?family=Crete+Round&family=Roboto:ital,wght@0,900;1,900&display=swap');*/ - -/*:root {*/ -/* --shadow-color: #FF9E9E;*/ -/* --shadow-color-light: white;*/ -/*}*/ - -/*.navbar {*/ -/* max-width: 100%;*/ -/* height: 100%;*/ -/* background: rgba(0,0,0,0.25);*/ -/*}*/ - -/*header {*/ -/* display: flex;*/ -/* justify-content: center;*/ -/* align-items: center;*/ -/* padding: 30px 10%;*/ -/* max-width: 100%;*/ -/* height: 10%;*/ -/* background-color: rgb(0, 0, 0, 0.25);*/ -/* border: none;*/ -/*}*/ - -/*table{*/ -/* border-collapse: collapse;*/ -/* color: white;*/ -/* font-size: 1.5rem;*/ -/* background: rgba(0,0,0,0.4);*/ - -/*}*/ - -/*img {*/ -/* width: 120px;*/ -/* height: 120px;*/ -/*}*/ -/*html{*/ -/* text-align: center;*/ -/*}*/ -/*body {*/ -/* padding: 0;*/ -/* margin: 0;*/ -/* max-width: 100%;*/ -/* background-image: url('giphyavengers.webp');*/ -/* object-fit: cover;*/ -/* height: 100vh;*/ -/* background-size: cover;*/ -/* background-repeat: no-repeat;*/ -/*}*/ - - -/*li,*/ -/*a:not(.btn) {*/ -/* font-family: "Montserrat", sans-serif;*/ -/* font-weight: 500;*/ -/* font-size: 1.2rem;*/ -/* text-decoration: none;*/ -/* color: white;*/ -/* padding: 10%;*/ -/* list-style: none;*/ -/*}*/ - -/*h1{*/ -/* font-family: 'Roboto', sans-serif;*/ -/* font-width: 900;*/ -/* font-size: 6rem;*/ - -/*}*/ - -/*.right {*/ -/* display: flex;*/ -/* align-items: center;*/ -/* justify-content: center;*/ -/* background-color: rgb(0, 225, 255, 0.05);*/ -/* border-radius: 10%;*/ -/* flex-direction: row;*/ -/* margin-left: 25%;*/ -/* width: 17%;*/ -/* height: 2%;*/ -/*}*/ - -/*.right a {*/ -/* margin: -5px;*/ -/*}*/ -/*.navbar{*/ -/* max-width: 100%;*/ -/* height: 100vh;*/ -/*}*/ - -/*.reg {*/ -/* color: rgb(255, 0, 0);*/ -/*}*/ - -/*ul {*/ -/* display: flex;*/ -/* flex-direction: row;*/ -/*}*/ - -/*li,*/ -/*a:hover:not(.btn) {*/ -/* color: red;*/ -/* font-size: 1.5rem;*/ -/*}*/ - -/*.reg:hover {*/ -/* color: white;*/ -/*}*/ -/*.container-main{*/ -/* display: flex;*/ -/* flex-direction: column;*/ -/* align-items: center;*/ -/* justify-content: center;*/ -/* width: 100%;*/ -/* height: 100%*/ -/*}*/ -/*P{*/ -/* font-family: "Montserrat", sans-serif;*/ -/* font-weight: 500;*/ -/* font-size: 4rem;*/ -/* text-decoration: none;*/ -/* color: white;*/ -/* width: 80%;*/ -/* list-style: none;*/ -/* margin-top: -2%;*/ -/*}*/ - -/*.glow{*/ -/* text-transform: uppercase;*/ -/* height: auto;*/ -/* text-align: center;*/ -/*}*/ - -/*.glow {*/ -/* color: white;*/ -/* animation: neon 3s infinite;*/ -/*}*/ - -/*.h1Combined{*/ -/* display: flex;*/ -/* flex-direction: row;*/ -/* align-items: center;*/ -/* justify-content: center;*/ -/* max-width: 100%;*/ -/*}*/ - -/*@keyframes neon {*/ -/* 0% {*/ -/* text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light),*/ -/* 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light),*/ -/* 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color);*/ -/* }*/ -/* 50% {*/ -/* text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light),*/ -/* 0 0 5px var(--shadow-color-light), 0 0 15px var(--shadow-color-light), 0 0 25px var(--shadow-color-light),*/ -/* 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 60px var(--shadow-color), 0 0 80px var(--shadow-color), 0 0 110px var(--shadow-color), 0 0 210px var(--shadow-color);*/ -/* }*/ -/* 100% {*/ -/* text-shadow: -1px -1px 1px var(--shadow-color-light), -1px 1px 1px var(--shadow-color-light), 1px -1px 1px var(--shadow-color-light), 1px 1px 1px var(--shadow-color-light),*/ -/* 0 0 3px var(--shadow-color-light), 0 0 10px var(--shadow-color-light), 0 0 20px var(--shadow-color-light),*/ -/* 0 0 30px var(--shadow-color), 0 0 40px var(--shadow-color), 0 0 50px var(--shadow-color), 0 0 70px var(--shadow-color), 0 0 100px var(--shadow-color), 0 0 200px var(--shadow-color);*/ -/* }*/ -/*}*/ - -/*.btn{*/ -/* text-shadow: -1px -1px 10px rgba(255,255,255,0.5);*/ -/* border: 1px solid #b70000;*/ -/* color: white;*/ -/* font-size: 1.5rem;*/ -/* border:none;*/ -/* background: #af0101;*/ -/* padding: 0.5rem 1.3rem;*/ -/* border-radius: 10%;*/ -/* cursor: pointer;*/ -/* transition: 1s ease;*/ -/* display:block;*/ -/* box-shadow: 3px 2px 10px #d50101,*/ -/* -1px -1px 1px #e60000;*/ -/* font-family: 'Roboto', sans-serif;*/ -/* font-weight: 500;*/ -/* text-decoration: none;*/ -/* transition: infinite 1s ease;*/ -/*}*/ - -/*.btn:hover{*/ -/* background-color: #58ACFA;*/ -/* color: white;*/ -/*}*/ - -/*.btn2{*/ -/* text-shadow: -1px -1px 10px rgba(255,255,255,0.5);*/ -/* border: 1px solid #b70000;*/ -/* color: white;*/ -/* font-size: 1.5rem;*/ -/* border:none;*/ -/* background: #af0101;*/ -/* padding: 0.5rem 1.3rem;*/ -/* border-radius: 10%;*/ -/* cursor: pointer;*/ -/* transition: 1s ease;*/ -/* display:block;*/ -/* box-shadow: 3px 2px 10px #d50101,*/ -/* -1px -1px 1px #e60000;*/ -/* font-family: 'Roboto', sans-serif;*/ -/* font-weight: 500;*/ -/* text-decoration: none;*/ -/* transition: infinite 1s ease;*/ -/*}*/ - -/*.btn2:hover{*/ -/* background-color: #58ACFA;*/ -/* color: white;*/ -/*}*/ - Index: urce/freeparkingspace/src/main/resources/templates/about.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/about.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,19 +1,0 @@ - - - - - Title - - -

-
-
-
- Изработиле:
- Мајкл Танчин 193187
- Златко Стојановски 193288
- -

- - - Index: urce/freeparkingspace/src/main/resources/templates/contact.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/contact.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,27 +1,0 @@ - - - - - Title - - -

-
-
- Контакт
- Адреса
- "Руѓер Бошковиќ" 16
- P.O. Box 393
- 1000 Скопје, Република Македонија
- -
- - Телефони
- +389 77903008
-
- E-mail
- Stojanovskizlatko08@gmail.com - -

- - Index: urce/freeparkingspace/src/main/resources/templates/employee.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/employee.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,294 +1,0 @@ - - - - - - - Одобрување - - - - - - - - -
- - - - - - - - - - - - - - -
-
-
-

FreeParking

Space

-
-
- -
-
-
- - - - - - - - - - - - - - -
ИмеПрезимеУлога
- - - - -
- -
-
-
-
- -
-
- -
- Index: urce/freeparkingspace/src/main/resources/templates/fragments/header.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/fragments/header.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,22 +1,0 @@ - -
- - -
-
- Register -
- - -
-
Index: urce/freeparkingspace/src/main/resources/templates/home.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/home.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,245 +1,0 @@ - - - - - - - ДОБРЕДОЈДОВТЕ! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-

- Платформата FreeParkingSpace ќе го реши проблемот за залудно потрошеното време на поединецот - во пронаоѓање на паркинг место низ густо населениот главен град. Главна карактеристика на оваа платофрма - е дека точно покажува на секој паркинг во кој реон има слободно место. -

- Reservation -
-
- -
- - Index: urce/freeparkingspace/src/main/resources/templates/index.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/index.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,16 +1,0 @@ - - - - - - - - - - - - - - - - Index: urce/freeparkingspace/src/main/resources/templates/master-template.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/master-template.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,225 +1,0 @@ - - - - - - - - - - - -
- -
- - - Index: urce/freeparkingspace/src/main/resources/templates/register.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/register.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,291 +1,0 @@ - - - - - - - - РЕГИСТРАЦИЈА! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-
-

-
-
- - - -
-
-
- -
- - Index: urce/freeparkingspace/src/main/resources/templates/registerConfirmation.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/registerConfirmation.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,257 +1,0 @@ - - - - - - - - РЕГИСТРАЦИЈА! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-
-

-
-
-

Ве молиме одберете што од следните понудени опции што би сакале да регистрирате!

- -
-
-
- -
- - Index: urce/freeparkingspace/src/main/resources/templates/registerEmployee.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/registerEmployee.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,297 +1,0 @@ - - - - - - - - РЕГИСТРАЦИЈА! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-
-

-
-
- - - Already have an account? Login here! -
-
-
- -
- - Index: urce/freeparkingspace/src/main/resources/templates/reservation.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/reservation.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,314 +1,0 @@ - - - - - - - РЕЗЕРВАЦИЈA! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-
- -
-
-
- -
- Index: urce/freeparkingspace/src/main/resources/templates/reservationInfo.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/reservationInfo.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,265 +1,0 @@ - - - - - - - ДОБРЕДОЈДОВТЕ! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-
- - - - - - - - - - - - - -
PARKINGZONABROJ NA PARKING
- - - -
- -
-
-
-
-
- -
- - Index: urce/freeparkingspace/src/main/resources/templates/success.html =================================================================== --- source/freeparkingspace/src/main/resources/templates/success.html (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,245 +1,0 @@ - - - - - - - ДОБРЕДОЈДОВТЕ! - - - - - - -
- - -
-
-
-

FreeParking

Space

-
-

- ВАШЕТО БАРАЊЕ Е УСПЕШНО, ВИ БЛАГОДАРИМЕ! -

- -
-
- -
- - Index: urce/freeparkingspace/src/test/java/com/proekt/ProektApplicationTests.java =================================================================== --- source/freeparkingspace/src/test/java/com/proekt/ProektApplicationTests.java (revision 31d67c0f0c6f25d3f0f116f6d94283ade221e11d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.proekt; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class ProektApplicationTests { - - @Test - void contextLoads() { - } - -}