diff --git a/README.md b/README.md
index f0a918b6a98575173804064562cd60949cc89865..9ece26094b71cf66ee30fe53d1018c597c76ba87 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
# Tutorial APAP
## Authors
* **Hilmi Al Biruni** - *2006463843* - *APAP-B*
+---
-
+---
## Tutorial 4
### Jelaskan perbedaan th:include dan th:replace!
@@ -28,7 +29,7 @@
##### final Integer rowId = Integer.valueOf(row);
##### course.getListPengajar().remove(rowId.intValue());
#### Nanti params tersebut akan mendefinisikan semacam "function" agar dapat diimplementasikan di dalam <button> dalam variable "name".
-
+---
## Tutorial 3
### Pertanyaan 1: Tolong jelaskan secara singkat apa kegunaan dari anotasi-anotasi yang ada pada model (@AllArgsConstructor, @NoArgsConstructor, @Setter, @Getter, @Entity, @Table)
#### @AllArgsConstructor digunakan untuk menghasilkan constructor pada semua field pada class dengan suatu parameter.
@@ -62,7 +63,7 @@ Pada @JoinColumn di atribut Course, name berguna untuk menyatakan nama dari fore
-
+---
## Tutorial 2
### Pertanyaan 1: Cobalah untuk menambahkan sebuah Course dengan mengakses link berikut: http://localhost:8080/course/add?code=APAP&nameCourse=APAP%20Tutorial2&description=2020%20Fasilkom&jumlahSks=3 Apa yang terjadi? Jelaskan mengapa hal tersebut dapat terjadi?
Jika link tersebut diakses akan memunculkan Whitelabel Error Page Service Error 500. Hal ini dikarenakan sudah ada perintah return "add-course" pada controller. Controller merupakan file yang berfungsi untuk melakukan mapping dari request yang diinput, kemudian akan diminta untuk memanggil template html yang akan direturn. Sedangkan html "add-course" belum dibuat, sehingga hal ini akan menyebabkan error.
@@ -81,7 +82,7 @@ Akan bertambah course lain
https://drive.google.com/file/d/1NGZj0VJENBv4pRQjVcsHjZRmML3h7E9O/view?usp=sharing
-
+---
## Tutorial 1
### What I have learned today
Pada tutorial ini, saya mempelajari tentang cara mengoperasikan Git secara lebih advance. Sebelumnya, saya pernah melakukan hal berikut saat mengerjakan TK Basdat oleh teman saya dari Ilmu Komputer. Lalu, saya juga baru memahami secara dasar tentang Java Springboot.
@@ -105,6 +106,7 @@ framework?
#### @RequestParam digunakan untuk membaca data formulir HTML yang disediakan oleh pengguna dan mengikatnya ke parameter permintaan.
#### @Pathvariable: Anotasi ini digunakan untuk menangani variabel template dalam pemetaan URI permintaan, dan menggunakannya sebagai parameter metode
#### @RequestParam digunakan jika anotasi parameter belum ditentukan, @Pathvariable digunakan jika parameter sudah ada
+---
### What I did not understand
(tuliskan apa saja yang kurang Anda mengerti, Anda dapat men-_check_ apabila Anda
sudah mengerti dikemudian hari, dan tambahkan tulisan yang membuat Anda mengerti)
diff --git a/singidol/.gitignore b/singidol/.gitignore
deleted file mode 100644
index c2065bc26202b2d072aca3efc3d1c2efad3afcbf..0000000000000000000000000000000000000000
--- a/singidol/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
diff --git a/singidol/build.gradle b/singidol/build.gradle
deleted file mode 100644
index b58f253260a049154deec4c53696aa8bb2d47579..0000000000000000000000000000000000000000
--- a/singidol/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-plugins {
- id 'org.springframework.boot' version '2.7.4'
- id 'io.spring.dependency-management' version '1.0.14.RELEASE'
- id 'java'
-}
-
-group = 'apap.tugasindividu'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
-
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
- implementation 'org.springframework.boot:spring-boot-starter-web'
- developmentOnly 'org.springframework.boot:spring-boot-devtools'
- testImplementation 'org.springframework.boot:spring-boot-starter-test'
- implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
- implementation 'mysql:mysql-connector-java:5.1.6'
- compileOnly("org.projectlombok:lombok:1.18.24")
- annotationProcessor('org.projectlombok:lombok:1.18.24')
- implementation 'org.springframework.boot:spring-boot-starter-validation:2.7.3'
-}
-
-tasks.named('test') {
- useJUnitPlatform()
-}
diff --git a/singidol/gradle/wrapper/gradle-wrapper.jar b/singidol/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 249e5832f090a2944b7473328c07c9755baa3196..0000000000000000000000000000000000000000
Binary files a/singidol/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/singidol/gradle/wrapper/gradle-wrapper.properties b/singidol/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 8049c684f04fdf584869d8eed0bc9168b401e403..0000000000000000000000000000000000000000
--- a/singidol/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/singidol/gradlew b/singidol/gradlew
deleted file mode 100644
index a69d9cb6c20655813e44515156e7253a2a239138..0000000000000000000000000000000000000000
--- a/singidol/gradlew
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed 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.
-#
-
-##############################################################################
-#
-# Gradle start up script for POSIX generated by Gradle.
-#
-# Important for running:
-#
-# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-# noncompliant, but you have some other compliant shell such as ksh or
-# bash, then to run this script, type that shell name before the whole
-# command line, like:
-#
-# ksh Gradle
-#
-# Busybox and similar reduced shells will NOT work, because this script
-# requires all of these POSIX shell features:
-# * functions;
-# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-# * compound commands having a testable exit status, especially «case»;
-# * various built-in commands including «command», «set», and «ulimit».
-#
-# Important for patching:
-#
-# (2) This script targets any POSIX shell, so it avoids extensions provided
-# by Bash, Ksh, etc; in particular arrays are avoided.
-#
-# The "traditional" practice of packing multiple parameters into a
-# space-separated string is a well documented source of bugs and security
-# problems, so this is (mostly) avoided, by progressively accumulating
-# options in "$@", and eventually passing that to Java.
-#
-# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-# see the in-line comments for details.
-#
-# There are tweaks for specific operating systems such as AIX, CygWin,
-# Darwin, MinGW, and NonStop.
-#
-# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-# within the Gradle project.
-#
-# You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
- APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
- [ -h "$app_path" ]
-do
- ls=$( ls -ld "$app_path" )
- link=${ls#*' -> '}
- case $link in #(
- /*) app_path=$link ;; #(
- *) app_path=$APP_HOME$link ;;
- esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
- echo "$*"
-} >&2
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in #(
- CYGWIN* ) cygwin=true ;; #(
- Darwin* ) darwin=true ;; #(
- MSYS* | MINGW* ) msys=true ;; #(
- NONSTOP* ) nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-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
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
- case $MAX_FD in #(
- max*)
- MAX_FD=$( ulimit -H -n ) ||
- warn "Could not query maximum file descriptor limit"
- esac
- case $MAX_FD in #(
- '' | soft) :;; #(
- *)
- ulimit -n "$MAX_FD" ||
- warn "Could not set maximum file descriptor limit to $MAX_FD"
- esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-# * args from the command line
-# * the main class name
-# * -classpath
-# * -D...appname settings
-# * --module-path (only if needed)
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
- APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
- JAVACMD=$( cygpath --unix "$JAVACMD" )
-
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- for arg do
- if
- case $arg in #(
- -*) false ;; # don't mess with options #(
- /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
- [ -e "$t" ] ;; #(
- *) false ;;
- esac
- then
- arg=$( cygpath --path --ignore --mixed "$arg" )
- fi
- # Roll the args list around exactly as many times as the number of
- # args, so each arg winds up back in the position where it started, but
- # possibly modified.
- #
- # NB: a `for` loop captures its iteration list before it begins, so
- # changing the positional parameters here affects neither the number of
- # iterations, nor the values presented in `arg`.
- shift # remove old arg
- set -- "$@" "$arg" # push replacement arg
- done
-fi
-
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
- "-Dorg.gradle.appname=$APP_BASE_NAME" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
- "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
- die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-# set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
- printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
- xargs -n1 |
- sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
- tr '\n' ' '
- )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/singidol/gradlew.bat b/singidol/gradlew.bat
deleted file mode 100644
index f127cfd49d4024c3e1e0d08ba56399221b4fb25d..0000000000000000000000000000000000000000
--- a/singidol/gradlew.bat
+++ /dev/null
@@ -1,91 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/singidol/settings.gradle b/singidol/settings.gradle
deleted file mode 100644
index 5b955c31c0173c32ef9efae683e32ed7f4511bfc..0000000000000000000000000000000000000000
--- a/singidol/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'singidol'
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/SingidolApplication.java b/singidol/src/main/java/apap/tugasindividu/singidol/SingidolApplication.java
deleted file mode 100644
index b0e5eee6db3ca793f1d674216193bcec741bd04e..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/SingidolApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package apap.tugasindividu.singidol;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class SingidolApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SingidolApplication.class, args);
- }
-
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/controller/BaseController.java b/singidol/src/main/java/apap/tugasindividu/singidol/controller/BaseController.java
deleted file mode 100644
index 3c92e535e87aa20a321acf9c685ff0adb50e7e46..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/controller/BaseController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.controller;
-
-public class BaseController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/controller/IdolController.java b/singidol/src/main/java/apap/tugasindividu/singidol/controller/IdolController.java
deleted file mode 100644
index b9c7188717bc4116077769fa0ea7fd4fc939fb97..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/controller/IdolController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.controller;
-
-public class IdolController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/controller/KonserController.java b/singidol/src/main/java/apap/tugasindividu/singidol/controller/KonserController.java
deleted file mode 100644
index 3951cc0f0e50f373940508e43900e93df13a11c4..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/controller/KonserController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.controller;
-
-public class KonserController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/controller/TiketController.java b/singidol/src/main/java/apap/tugasindividu/singidol/controller/TiketController.java
deleted file mode 100644
index 21f1862b92a1109ca1fdd898eefc527f0420e103..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/controller/TiketController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.controller;
-
-public class TiketController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/controller/TipeController.java b/singidol/src/main/java/apap/tugasindividu/singidol/controller/TipeController.java
deleted file mode 100644
index 9b5f899b24205fe91561e43e00f85b1ea6cc2a31..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/controller/TipeController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.controller;
-
-public class TipeController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/model/IdolModel.java b/singidol/src/main/java/apap/tugasindividu/singidol/model/IdolModel.java
deleted file mode 100644
index f49f7e09c043f348a8e7f3c1d8b4e7e7202ec44c..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/model/IdolModel.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package apap.tugasindividu.singidol.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Setter
-@Getter
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@Table(name = "idol")
-public class IdolModel {
- @Id
- @Size(max = 30)
- private String idolID;
-
- @NotNull
- @Size(max = 30)
- @Column(name = "nama_idol", nullable = false)
- private String namaIdol;
-
- @NotNull
- @Size(max = 30)
- @Column(name = "asal_negara", nullable = false)
- private String asalNegara;
-
- @NotNull
- @Column(name = "jumlah_angoota", nullable = false)
- private Integer jumlahAnggota;
-
- @NotNull
- @Column(nullable = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
- private LocalDateTime tanggalDebut;
-
-// @NotNull
-// @Column(nullable = false)
-// @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
-// private LocalDateTime tanggalBerakhir;
-
- @OneToMany(mappedBy = "idol", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- private List<PengajarModel> listPengajar;
-
- @ManyToMany
- @JoinTable(name = "penyelenggara_course", joinColumns = @JoinColumn(name = "code"), inverseJoinColumns = @JoinColumn(name = "no_penyelenggara"))
- List<PenyelenggaraModel> listPenyelenggara;
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/model/KonserController.java b/singidol/src/main/java/apap/tugasindividu/singidol/model/KonserController.java
deleted file mode 100644
index 591cfe7a3901a45d69797992e97ceb1281dea3b0..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/model/KonserController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.model;
-
-public class KonserController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/model/TiketController.java b/singidol/src/main/java/apap/tugasindividu/singidol/model/TiketController.java
deleted file mode 100644
index 6bc2483e254ea55d90778dfdcf999c356d8ed89c..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/model/TiketController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.model;
-
-public class TiketController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/model/TipeController.java b/singidol/src/main/java/apap/tugasindividu/singidol/model/TipeController.java
deleted file mode 100644
index 15b5b5c937ebdcafbee013fd0023ac5a4490317f..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/model/TipeController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.model;
-
-public class TipeController {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/repository/IdolDb.java b/singidol/src/main/java/apap/tugasindividu/singidol/repository/IdolDb.java
deleted file mode 100644
index aa1df43e2bb0cf0a47b81114ecd65807fed4d4a0..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/repository/IdolDb.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.repository;
-
-public class IdolDb {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/repository/KonserDb.java b/singidol/src/main/java/apap/tugasindividu/singidol/repository/KonserDb.java
deleted file mode 100644
index 2d810724b0bb33e437c7af973875c0296378624e..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/repository/KonserDb.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.repository;
-
-public class KonserDb {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/repository/TiketDb.java b/singidol/src/main/java/apap/tugasindividu/singidol/repository/TiketDb.java
deleted file mode 100644
index 94e562a504a2e5bfbbd1e23c6d0589593c3c3a40..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/repository/TiketDb.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.repository;
-
-public class TiketDb {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/repository/TipeDb.java b/singidol/src/main/java/apap/tugasindividu/singidol/repository/TipeDb.java
deleted file mode 100644
index bd17d437593cdb1dacaaf86099032bcdbdb3eadd..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/repository/TipeDb.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.repository;
-
-public class TipeDb {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/IdolService.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/IdolService.java
deleted file mode 100644
index 4f7d707ebdc06a77dc7c0859e9398d388cef4fd4..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/IdolService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class IdolService {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/IdolServiceImpl.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/IdolServiceImpl.java
deleted file mode 100644
index 151ef3e61f06dc78a59626a397b37eca18463cde..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/IdolServiceImpl.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class IdolServiceImpl {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/KonserService.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/KonserService.java
deleted file mode 100644
index 31ffefd9a236532646add60c3db1495c942e912a..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/KonserService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class KonserService {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/KonserServiceImpl.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/KonserServiceImpl.java
deleted file mode 100644
index 7773a062d093a68db454be5d502aff74c2ac3091..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/KonserServiceImpl.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class KonserServiceImpl {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/TiketService.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/TiketService.java
deleted file mode 100644
index db2642affe337985548a5dcf8cff8d9d7d372e33..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/TiketService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class TiketService {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/TiketServiceImpl.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/TiketServiceImpl.java
deleted file mode 100644
index 16ab0d5a2d1d5c166c683151bff0ec44aba67448..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/TiketServiceImpl.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class TiketServiceImpl {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/TipeService.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/TipeService.java
deleted file mode 100644
index 8f9ca92450e42c4bff248c2605d0d8df51fb8cc7..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/TipeService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class TipeService {
-}
diff --git a/singidol/src/main/java/apap/tugasindividu/singidol/service/TipeServiceImpl.java b/singidol/src/main/java/apap/tugasindividu/singidol/service/TipeServiceImpl.java
deleted file mode 100644
index 4497c1e26295f29f08dcbc6352f007b124438f2d..0000000000000000000000000000000000000000
--- a/singidol/src/main/java/apap/tugasindividu/singidol/service/TipeServiceImpl.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package apap.tugasindividu.singidol.service;
-
-public class TipeServiceImpl {
-}
diff --git a/singidol/src/main/resources/application.properties b/singidol/src/main/resources/application.properties
deleted file mode 100644
index 1c852cfce21faa075e86dcdb6f280a6de38000bf..0000000000000000000000000000000000000000
--- a/singidol/src/main/resources/application.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#konfigurasi untuk koneksi MySQL
-spring.sql.init.platform=mysql
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-#sesuaikan NAMA_DATABASE dengan nama database anda
-spring.datasource.url=jdbc:mysql://localhost:3306/singidol?useSSL=false&serverTimezone=Asia/Jakarta
-
-#sesuaikan dengan NAMA dan PASSWORD mysql anda
-spring.datasource.username=root
-spring.datasource.password=
-
-#optimize query untuk db MySQL
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-
-#pembuatan database (create || create drop || validate || update)
-spring.jpa.hibernate.ddl-auto=create
diff --git a/singidol/src/main/resources/templates/error/404.html b/singidol/src/main/resources/templates/error/404.html
deleted file mode 100644
index 5c2de6bc7268ef3a144950dcfcd11b088c3668f1..0000000000000000000000000000000000000000
--- a/singidol/src/main/resources/templates/error/404.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://thymeleaf.org">
-<head>
- <meta charset="UTF-8">
- <title>404 not found</title>
- <object th:include="fragments/fragment :: css" th:remove="tag"></object>
- <object th:include="fragments/fragment :: js" th:remove="tag"></object>
-
-</head>
-<body>
-<nav th:replace="fragments/fragment :: navbar"></nav>
-<div class="container-fluid">
- <h2>Halaman tidak ditemukan</h2>
- <a th:href="@{/}">Kembali ke home</a>
-</div>
-</body>
-</html>
diff --git a/singidol/src/main/resources/templates/fragments/fragment.html b/singidol/src/main/resources/templates/fragments/fragment.html
deleted file mode 100644
index 5b40d2b3393be4676222a81b39d269befaf9d89a..0000000000000000000000000000000000000000
--- a/singidol/src/main/resources/templates/fragments/fragment.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="https://thymeleaf.org">
-
-<head>
- <meta charset="UTF-8">
- <title>Singidol</title>
-
- <head th:fragment="css">
- <link rel="stylesheet" th:href="@{/css/bootstrap.min.css/}"/>
- </head>
-
- <head th:fragment="js">
- <script
- src="https://code.jquery.com/jquery-3.4.1.min.js"
- integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFIBw8HfCJo="
- crossorigin="anonymous"
- ></script>
- <script src="https://getbootstrap.com/docs/4.1/assets/js/vendor/popper.min.js"></script>
- <script th:src="@{/js/bootstrap.min.js/}"></script>
- </head>
-</head>
-
-<body>
-<nav th:fragment="navbar" class="navbar navbar-expand-lg navbar-light bg-light">
- <a class="navbar-brand font-weight-bold text-primary" href="#">Singidol</a>
- <button
- class="navbar-toggler"
- type="button"
- data-toggle="collapse"
- data-target="#navbarNavAltMarkup"
- aria-controls="navbarNavAltMarkup"
- aria-expanded="false"
- aria-label="Toggle navigation"
- >
- <span class="navbar-toggler-icon"></span>
- </button>
-
- <div class="collapse navbar-collapse">
- <ul class="navbar-nav mr-auto">
- <li th:classappend="${#httpServletRequest.getRequestURI() == '/' ? 'nav-item active':'nav-item'}">
- <a class="nav-item nav-link text-secondary" th:href="@{/}">
- Konser <span class="sr-only">(current)</span>
- </a>
- </li>
- <li th:classappend="${#httpServletRequest.getRequestURI().startsWith('/tiket/viewall') == '/' ? 'nav-item active':'nav-item'}">
- <a class="nav-item nav-link text-secondary" th:href="@{/tiket/viewall}">
- Tiket <span class="sr-only">(current)</span>
- </a>
- </li>
- <li th:classappend="${#httpServletRequest.getRequestURI().startsWith('/idol/viewall') == '/' ? 'nav-item active':'nav-item'}">
- <a class="nav-item nav-link text-secondary" th:href="@{/idol/viewall}">
- Idol <span class="sr-only">(current)</span>
- </a>
- </li>
- </ul>
-
- <form class="form-inline my-2 my-lg-0" th:action="@{/tiket/view/}" method="GET">
- <input class="form-control mr-sm-2" type="search"
- name="code" placeholder="Code Course" aria-label="Search">
- <button class="btn btn-outline-primary my-2 my-sm-0" type="submit">Search</button>
- </form>
- </div>
-</nav>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/singidol/src/test/java/apap/tugasindividu/singidol/SingidolApplicationTests.java b/singidol/src/test/java/apap/tugasindividu/singidol/SingidolApplicationTests.java
deleted file mode 100644
index e0c7ca2522f080be256d610bdfcbf2d938464aec..0000000000000000000000000000000000000000
--- a/singidol/src/test/java/apap/tugasindividu/singidol/SingidolApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package apap.tugasindividu.singidol;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class SingidolApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/tutorial-6/index.html b/tutorial-6/index.html
index f09a29a448ee080face84c4481157c7918e36720..6b4d15d2764df10a7e41a06318627d5413377f69 100644
--- a/tutorial-6/index.html
+++ b/tutorial-6/index.html
@@ -6,6 +6,7 @@
</head>
<body>
<p>Body from feat/tutorial-6-advancedgit-1</p>
+ <p>Body from tut6-for-merge</p>
</body>
<footer>
<p>APAP sungguh menyenangkan, UHUY</p>