From 4c782fce99702a1f293318f6ceb9690325f97856 Mon Sep 17 00:00:00 2001
From: alifyandra <alif@wellmart.id>
Date: Sun, 23 May 2021 23:06:41 +0700
Subject: [PATCH] Fix accidental gradle folder delete
---
build/bootRunMainClassName | 1 -
build/resources/main/application.properties | 6 --
build/resources/main/log4j2.xml | 37 --------
.../main/templates/SeeAppointment.html | 43 ----------
.../main/templates/accept_reject.html | 82 ------------------
build/resources/main/templates/add_roles.html | 84 -------------------
build/resources/main/templates/home.html | 25 ------
build/resources/main/templates/index.html | 18 ----
build/resources/main/templates/register.html | 16 ----
.../compileJava/source-classes-mapping.txt | 55 ------------
gradle/wrapper/gradle-wrapper.properties | 5 ++
11 files changed, 5 insertions(+), 367 deletions(-)
delete mode 100644 build/bootRunMainClassName
delete mode 100644 build/resources/main/application.properties
delete mode 100644 build/resources/main/log4j2.xml
delete mode 100644 build/resources/main/templates/SeeAppointment.html
delete mode 100644 build/resources/main/templates/accept_reject.html
delete mode 100644 build/resources/main/templates/add_roles.html
delete mode 100644 build/resources/main/templates/home.html
delete mode 100644 build/resources/main/templates/index.html
delete mode 100644 build/resources/main/templates/register.html
delete mode 100644 build/tmp/compileJava/source-classes-mapping.txt
create mode 100644 gradle/wrapper/gradle-wrapper.properties
diff --git a/build/bootRunMainClassName b/build/bootRunMainClassName
deleted file mode 100644
index 801e298..0000000
--- a/build/bootRunMainClassName
+++ /dev/null
@@ -1 +0,0 @@
-com.adpro.tasc.TASCApp
\ No newline at end of file
diff --git a/build/resources/main/application.properties b/build/resources/main/application.properties
deleted file mode 100644
index 7c1305b..0000000
--- a/build/resources/main/application.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/tasc
-spring.datasource.username=postgres
-spring.datasource.password=admin
-spring.datasource.currentSchema=tasc
-
-logging.level.root=info
\ No newline at end of file
diff --git a/build/resources/main/log4j2.xml b/build/resources/main/log4j2.xml
deleted file mode 100644
index b3c893a..0000000
--- a/build/resources/main/log4j2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
- <Appenders>
- <Console name="LogToConsole" target="SYSTEM_OUT">
- <Filters>
- <LevelRangeFilter minLevel="FATAL" maxLevel="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
- </Filters>
- <PatternLayout pattern="%style{%d{ISO8601}}{black} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%c{1.}}{bright,yellow}: %msg%n%throwable"/>
- </Console>
-
- <RollingFile name="LogGenericErrorsToFile" fileName="./logs/${date:MM-yyyy}/errors/error.log"
- filePattern="./logs/${date:MM-yyyy}/errors/error-%d{MM-yyyy}-%i.log.gz">
- <Filters>
- <LevelRangeFilter minLevel="FATAL" maxLevel="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
- </Filters>
- <PatternLayout pattern="%style{%d{ISO8601}}{black} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%c{1.}}{bright,yellow}: %msg%n%throwable"/>
-
- <Policies>
- <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
- <SizeBasedTriggeringPolicy size="25MB"/>
- </Policies>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Logger name="com.adpro.tasc" additivity="false">
- <AppenderRef ref="LogToConsole"/>
- <AppenderRef ref="LogErrorsToFile"/>
- </Logger>
- <Logger name="org.springframework" additivity="false">
- <AppenderRef ref="LogToConsole"/>
- </Logger>
- <Root level="all">
- <AppenderRef ref="LogToConsole"/>
- <AppenderRef ref="LogErrorsToFile"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git a/build/resources/main/templates/SeeAppointment.html b/build/resources/main/templates/SeeAppointment.html
deleted file mode 100644
index a64397c..0000000
--- a/build/resources/main/templates/SeeAppointment.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
- <meta charset="UTF-8">
- <title>See Appointment</title>
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
- <!-- Bootstrap -->
- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script>
- <!-- Datatables CDN-->
- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.css">
- <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.24/js/jquery.dataTables.js"></script>
-</head>
-
-<body>
-<h3>See Appointment</h3>
-<table class="table table-striped" style="width:100%">
- <thead>
- <th> Student Name </th>
- <th> Course </th>
- <th> Date </th>
- <th> Duration </th>
- </thead>
- <tbody>
- <td> Test Student </td>
- <td> Software Engineering </td>
- <td> 5-10-2021</td>
- <td> 30 min </td>
- </tbody>
- <tr th:each="appoint :${newAppointment}">
- <td th:text="${appoint.student.fullName}"> </td>
- <td th:text="${appoint.appointment.course.name}"></td>
- <td th:text="${appoint.appointment.date}"></td>
- <td th:text="${appoint.requestTime}"></td>
- </tr>
-</table>
-<br>
-<form th:action="@{/home}">
- <button type="submit" class="btn btn-outline-dark">Return</button>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/build/resources/main/templates/accept_reject.html b/build/resources/main/templates/accept_reject.html
deleted file mode 100644
index 5348c77..0000000
--- a/build/resources/main/templates/accept_reject.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
- <meta charset="UTF-8">
- <title>Request Appointment</title>
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
- <!-- Bootstrap -->
- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script>
- <!-- Datatables CDN-->
- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.css">
- <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.24/js/jquery.dataTables.js"></script>
-</head>
-
-<body>
-<h3>Accept Reject Appointments</h3>
-<table class="table table-striped" style="width:100%">
- <thead>
- <tr>
- <th>Full Name</th>
- <th>Course</th>
- <th>Date</th>
- <th>Duration</th>
- <th>Status</th>
- <th>Permission</th>
- <th>Accept/Reject</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td> Test Student </td>
- <td> Software Engineering </td>
- <td> 5-10-2021</td>
- <td> 30 min </td>
- <td> Pending </td>
- <td> True </td>
- <td>
- <form th:action="@{/see}">
- <button type="submit" class="btn btn-outline-dark">Accept</button>
- </form>
- <form th:action="@{/home}">
- <button onclick="myFunction()" class="btn btn-outline-dark">Reject</button>
- </form>
- </td>
- </tr>
- <tr th:each="users :${userList}">
- <td th:text="${users.student.fullName}"> </td>
- <td th:text="${users.appointment.course.name}"></td>
- <td th:text="${users.appointment.date}"></td>
- <td th:text="${users.requestTime}"></td>
- <td th:text="${users.status}"></td>
- <td th:text="${users.adminHasPermission}"></td>
- <!-- Assign role button here-->
- <td>
- <form th:action="@{/accepted}" th:object="${users}" method="post">
- <input id = "fullName" name = "fullName" type = "hidden" value = "${users.student.fullName}"/>
- <input id = "course" name = "course" type = "hidden" value = "${users.appointment.course.name}"/>
- <input id = "date" name = "date" type = "hidden" value = "${users.appointment.date}"/>
- <input id = "duration" name = "duration" type = "hidden" value = "${users.requestTime}"/>
- <button type="submit" class="btn btn-outline-dark">Accept</button>
- </form>
- <form th:action="@{/home}">
- <button onclick="myFunction()" class="btn btn-outline-dark">Reject</button>
- </form>
- </td>
- </tr>
- </tbody>
-</table>
-<br>
-<form th:action="@{/home}">
- <button type="submit" class="btn btn-outline-dark">Return</button>
-</form>
-
-<script>
-function myFunction() {
- alert("Rejected!");
-}
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/build/resources/main/templates/add_roles.html b/build/resources/main/templates/add_roles.html
deleted file mode 100644
index d48c535..0000000
--- a/build/resources/main/templates/add_roles.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
- <head>
- <meta charset="UTF-8">
- <title>Add Roles</title>
-
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
- <!-- Bootstrap -->
- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script>
- <!-- Datatables CDN-->
- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.css">
- <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.24/js/jquery.dataTables.js"></script>
-
- </head>
-
- <body>
-
- <h3>Add Roles to User</h3>
-
- <div sec:authorize="!isAuthenticated()">
- <a href="/index"> Login </a>
- </div>
-
- <div sec:authorize="hasRole('ROLE_ADMIN')">
-
- <table id="userList" class="table table-striped" style="width:100%">
- <thead>
- <tr>
- <th>User</th>
- <th>Full Name</th>
- <th>Role</th>
- <th>Select Role</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td> </td>
- <td> </td>
- <td> </td>
- <td>
- <form th:action="@{/home}">
- <button type="submit" class="btn btn-outline-dark">Student</button>
- </form>
- <form th:action="@{/home}">
- <button onclick="myFunction()" class="btn btn-outline-dark">Teaching Assistant</button>
- </form>
- </td>
- </tr>
- <tr th:each="user :${userList}">
- <td th:text="${user.userName}"> </td>
- <td th:text="${user.fullName}"></td>
- <td th:text="${user.role}"></td>
- <!-- Assign role button here-->
- <td>
- <form th:action="@{/add-roles/student}" th:object="${user}" method="post">
- <input id = "userName" name = "userName" type = "hidden" value = "${user.userName}"/>
- <input id = "fullName" name = "fullName" type = "hidden" value = "${user.fullName}"/>
- <input id = "password" name = "password" type = "hidden" value = "${user.password}"/>
- <button type="submit" class="btn btn-outline-dark" value="STUDENT">Student</button>
- </form>
- <form th:action="@{/add-roles/ta}" th:object="${user}" method="post">
- <input id = "userNameTA" name = "userNameTA" type = "hidden" value = "${user.userName}"/>
- <input id = "fullNameTA" name = "fullNameTA" type = "hidden" value = "${user.fullName}"/>
- <input id = "passwordTA" name = "passwordTA" type = "hidden" value = "${user.password}"/>
- <button type="submit" class="btn btn-outline-dark" value="TEACHING_ASSISTANT">Teaching Assistant</button>
- </form>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <br>
- <form th:action="@{/home}">
- <button type="submit" class="btn btn-outline-dark">Return</button>
- </form>
-
-
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-
- </body>
-
-</html>
\ No newline at end of file
diff --git a/build/resources/main/templates/home.html b/build/resources/main/templates/home.html
deleted file mode 100644
index d1a2822..0000000
--- a/build/resources/main/templates/home.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
- <meta charset="UTF-8">
- <title>Home</title>
-</head>
-<body>
-<h1>Roles</h1>
-<form th:action="@{/add-roles}">
- <p><input type="submit" value="Set Roles" ></p>
-</form>
-<h1>See Available Appointment</h1>
-<form th:action="@{/see-appointment}">
- <p><input type="submit" value="See Appointment" ></p>
-</form>
-<h1>See Request Appointment</h1>
-<form th:action="@{/accept_reject}">
- <p><input type="submit" value="See Request Appointment" ></p>
-</form>
-<h3>Logout</h3>
-<form th:action="@{/}">
- <p><input type="submit" value="Logout" ></p>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/build/resources/main/templates/index.html b/build/resources/main/templates/index.html
deleted file mode 100644
index 6cd6c6a..0000000
--- a/build/resources/main/templates/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
- <meta charset="UTF-8">
- <title>TASC</title>
-</head>
-<body>
-<h1>Welcome to TASC</h1>
-<form th:action="@{/home}">
- <p>Username: <input type="text"></p>
- <p>Password: <input type="text"></p>
- <p><input type="submit" value="Login" ></p>
-</form>
-<form th:action="@{/register}">
- <p><input type="submit" value="Register" ></p>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/build/resources/main/templates/register.html b/build/resources/main/templates/register.html
deleted file mode 100644
index da7becc..0000000
--- a/build/resources/main/templates/register.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
- <meta charset="UTF-8">
- <title>Register</title>
-</head>
-<body>
-<h1>Register</h1>
-<form th:action="@{/home}">
- <p>Username: <input type="text"></p>
- <p>Password: <input type="text"></p>
- <p>Retype Password: <input type="text"></p>
- <p><input type="submit" value="Submit" ></p>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/build/tmp/compileJava/source-classes-mapping.txt b/build/tmp/compileJava/source-classes-mapping.txt
deleted file mode 100644
index 2010e31..0000000
--- a/build/tmp/compileJava/source-classes-mapping.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-com/adpro/tasc/user/db/model/AcademicUser.java
- com.adpro.tasc.user.db.model.AcademicUser
-com/adpro/tasc/user/db/model/User.java
- com.adpro.tasc.user.db.model.User
-com/adpro/tasc/appointment/db/mapper/CourseMapper.java
- com.adpro.tasc.appointment.db.mapper.CourseMapper
-com/adpro/tasc/appointment/db/model/Slot.java
- com.adpro.tasc.appointment.db.model.Slot
- com.adpro.tasc.appointment.db.model.Slot$Day
-com/adpro/tasc/appointment/db/model/Schedule.java
- com.adpro.tasc.appointment.db.model.Schedule
-com/adpro/tasc/appointment/db/dao/ScheduleDAO.java
- com.adpro.tasc.appointment.db.dao.ScheduleDAO
-com/adpro/tasc/appointment/db/template/CourseTemplate.java
- com.adpro.tasc.appointment.db.template.CourseTemplate
-com/adpro/tasc/appointment/db/dao/CourseDAO.java
- com.adpro.tasc.appointment.db.dao.CourseDAO
-com/adpro/tasc/TASCApp.java
- com.adpro.tasc.TASCApp
-com/adpro/tasc/config/DBConfig.java
- com.adpro.tasc.config.DBConfig
-com/adpro/tasc/appointment/db/mapper/ScheduleMapper.java
- com.adpro.tasc.appointment.db.mapper.ScheduleMapper
-com/adpro/tasc/appointment/db/mapper/AppointmentMapper.java
- com.adpro.tasc.appointment.db.mapper.AppointmentMapper
-com/adpro/tasc/appointment/db/model/Course.java
- com.adpro.tasc.appointment.db.model.Course
-com/adpro/tasc/appointment/db/mapper/SlotMapper.java
- com.adpro.tasc.appointment.db.mapper.SlotMapper
-com/adpro/tasc/appointment/db/template/AppointmentTemplate.java
- com.adpro.tasc.appointment.db.template.AppointmentTemplate
-com/adpro/tasc/appointment/db/template/ScheduleTemplate.java
- com.adpro.tasc.appointment.db.template.ScheduleTemplate
-com/adpro/tasc/user/db/model/Role.java
- com.adpro.tasc.user.db.model.Role
- com.adpro.tasc.user.db.model.Role$1
-com/adpro/tasc/user/db/mapper/UserMapper.java
- com.adpro.tasc.user.db.mapper.UserMapper
-com/adpro/tasc/user/db/template/UserTemplate.java
- com.adpro.tasc.user.db.template.UserTemplate
-com/adpro/tasc/appointment/db/dao/AppointmentDAO.java
- com.adpro.tasc.appointment.db.dao.AppointmentDAO
-com/adpro/tasc/appointment/db/model/AppointmentRequest.java
- com.adpro.tasc.appointment.db.model.AppointmentRequest
- com.adpro.tasc.appointment.db.model.AppointmentRequest$Status
-com/adpro/tasc/controller/AddRolesController.java
- com.adpro.tasc.controller.AddRolesController
-com/adpro/tasc/user/db/dao/UserDAO.java
- com.adpro.tasc.user.db.dao.UserDAO
-com/adpro/tasc/appointment/db/model/Appointment.java
- com.adpro.tasc.appointment.db.model.Appointment
-com/adpro/tasc/controller/HelloController.java
- com.adpro.tasc.controller.HelloController
-com/adpro/tasc/controller/SeeAppointmentController.java
- com.adpro.tasc.controller.SeeAppointmentController
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..be52383
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--
GitLab