Skip to content

T
Tim11
Commit cb79efd8 by Krunoslav Velfel
Options

Ver. 2.

parent bcce7a6c
Showing with 64 additions and 547 deletions
mvnw deleted 100755 → 0
This diff is collapsed. Click to expand it.
mvnw.cmd deleted 100644 → 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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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%
exit /B %ERROR_CODE%
src/main/java/com/imi/informacionisistem/Server/ControllerMain.java
package com.imi.informacionisistem.Server;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -10,11 +9,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import java.sql.*;
import com.imi.informacionisistem.Server.ContentDelivery;
@Controller
public class ControllerMain {
public class ControllerMain extends ContentDelivery{
private final int COOKIE_LENGTH = 30;
private Connection connection = null;
private Statement statement = null;
private String response = null;
......@@ -43,33 +43,10 @@ public class ControllerMain {
}
@RequestMapping(value = "/", method = RequestMethod.GET)
public String Login(HttpServletRequest request, Model model) {
public String Login(HttpServletRequest request) {
return "login";
}
@RequestMapping(value = "/panel", method = RequestMethod.GET)
public String Panel(@RequestParam(name = "token") String t,
@RequestParam(name = "area") String a,
Model model) throws SQLException{
connection = DriverManager.getConnection("jdbc:mariadb://localhost/security", "root", "password");
statement = connection.createStatement();
sql = "SELECT * FROM tokens WHERE token=" + "\"" + t + "\"";
rs = statement.executeQuery(sql);
try {
rs.next();
int id = rs.getInt("id");
} catch (SQLDataException e) {
return "login";
} finally {
statement.close();
connection.close();
}
return "panel";
}
@RequestMapping(value = "/auth", method = RequestMethod.GET)
@ResponseBody
......@@ -83,9 +60,7 @@ public class ControllerMain {
sql = "SELECT * FROM login WHERE username=\"" + u + "\" AND " + "password=\"" + p + "\"";
rs = statement.executeQuery(sql);
if(rs.next() == false) {
response = "auth_error";
} else {
try {
rs.first();
id = rs.getInt("id");
role = rs.getString("role");
......@@ -97,9 +72,13 @@ public class ControllerMain {
sql = "INSERT INTO tokens(token, id, role) VALUES(\"" + response + "\", \"" + id + "\", \"" + role + "\")";
statement.executeUpdate(sql);
} catch (SQLDataException e) {
response = "auth_error";
return response;
} finally {
statement.close();
connection.close();
}
statement.close();
connection.close();
return response;
}
}
\ No newline at end of file
src/main/resources/static/css/panel.css
......@@ -119,4 +119,8 @@ body {
width: 800px;
margin-left: auto;
margin-right: auto;
}
.spectrum-Breadcrumbs-itemSeparator {
color: rgba(255, 255, 255) !important;
}
\ No newline at end of file
src/main/resources/static/css/spectrum-dark.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/static/css/spectrum-darkest.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/static/css/spectrum-light.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/static/js/auth.js
function Auth() {
fetch("http://localhost:8080/auth?username=" + document.getElementById("username").value + "&password=" + document.getElementById("password").value)
fetch("/auth?username=" + document.getElementById("username").value + "&password=" + document.getElementById("password").value)
.then(function (response) {
response.text().then(function (text) {
if(text.localeCompare("auth_error") == 0) {
......@@ -7,7 +7,7 @@ function Auth() {
document.getElementsByClassName("wrapper")[0].style.borderColor = "rgb(203, 111, 16)";
document.getElementById("login-message").innerHTML = "Greška pri autentikaciji.";
} else {
window.location.replace("http://localhost:8080/panel?token=" + text + "&area=overview");
window.location.replace("/panel?token=" + text);
document.cookie = text;
}
});
......
src/main/resources/static/js/deliverContent.js
function overview() {
fetch("/overview?token=" + document.cookie)
.then(function (response) {
response.text().then(function (text) {
document.getElementsByClassName("content")[0].innerHTML = text;
});
})
}
function passed() {
}
function attends() {
function attending() {
}
......@@ -19,9 +24,11 @@ function cheque() {
}
function changeActivity(b) {
if(b.class.indexOf("is-open") >= 0) {
b.class = "spectrum-Accordion-item";
if(b.className.includes("is-open")) {
b.className = "spectrum-Accordion-item";
} else {
b.class = "spectrum-Accordion-item is-open";
b.className = "spectrum-Accordion-item is-open";
}
}
overview();
\ No newline at end of file
src/main/resources/templates/login.html
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<meta charset="UTF-8">
<title>Studentski portal - prijava | Prirodno-matematički fakultet - Univerzitet u Kragujevcu</title>
......@@ -38,4 +41,4 @@
</div>
<script src="/js/auth.js"></script>
</body>
</html>
</html>
\ No newline at end of file
target/classes/static/css/panel.css
......@@ -119,4 +119,8 @@ body {
width: 800px;
margin-left: auto;
margin-right: auto;
}
.spectrum-Breadcrumbs-itemSeparator {
color: rgba(255, 255, 255) !important;
}
\ No newline at end of file
target/classes/static/css/spectrum-dark.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
target/classes/static/css/spectrum-darkest.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
target/classes/static/css/spectrum-light.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
target/classes/static/js/auth.js
function Auth() {
fetch("http://localhost:8080/auth?username=" + document.getElementById("username").value + "&password=" + document.getElementById("password").value)
fetch("/auth?username=" + document.getElementById("username").value + "&password=" + document.getElementById("password").value)
.then(function (response) {
response.text().then(function (text) {
if(text.localeCompare("auth_error") == 0) {
......@@ -7,7 +7,7 @@ function Auth() {
document.getElementsByClassName("wrapper")[0].style.borderColor = "rgb(203, 111, 16)";
document.getElementById("login-message").innerHTML = "Greška pri autentikaciji.";
} else {
window.location.replace("http://localhost:8080/panel?token=" + text + "&area=overview");
window.location.replace("/panel?token=" + text);
document.cookie = text;
}
});
......
target/classes/static/js/deliverContent.js
function overview() {
fetch("/overview?token=" + document.cookie)
.then(function (response) {
response.text().then(function (text) {
document.getElementsByClassName("content")[0].innerHTML = text;
});
})
}
function passed() {
}
function attends() {
function attending() {
}
......@@ -19,10 +24,11 @@ function cheque() {
}
function changeActivity(b) {
if(b.class.indexOf("is-open") >= 0) {
b.class = "spectrum-Accordion-item";
if(b.className.includes("is-open")) {
b.className = "spectrum-Accordion-item";
} else {
b.class = "spectrum-Accordion-item is-open";
b.className = "spectrum-Accordion-item is-open";
}
}
overview();
\ No newline at end of file
target/classes/templates/login.html
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<meta charset="UTF-8">
<title>Studentski portal - prijava | Prirodno-matematički fakultet - Univerzitet u Kragujevcu</title>
......@@ -38,4 +41,4 @@
</div>
<script src="/js/auth.js"></script>
</body>
</html>
</html>
\ No newline at end of file
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
com/imi/informacionisistem/Server/ServerApplication.class
com/imi/informacionisistem/Server/ControllerMain.class
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
/home/krunoslav/Documents/IV semestar/POOP/IS/src/Server/src/main/java/com/imi/informacionisistem/Server/ControllerMain.java
/home/krunoslav/Documents/IV semestar/POOP/IS/src/Server/src/main/java/com/imi/informacionisistem/Server/ServerApplication.java
/home/krunoslav/Documents/IV semestar/POOP/IS/src/Server/src/main/java/com/imi/informacionisistem/Server/ContentDelivery.java
target/surefire-reports/com.imi.informacionisistem.Server.ServerApplicationTests.txt
-------------------------------------------------------------------------------
Test set: com.imi.informacionisistem.Server.ServerApplicationTests
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.158 s - in com.imi.informacionisistem.Server.ServerApplicationTests
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.921 s - in com.imi.informacionisistem.Server.ServerApplicationTests
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment