STRLCPY/wrongsecrets

Merge pull request #450 from OWASP/datatable
```
Datatable implementation (#415)
```
Jeroen Willemsen committed with GitHub 2 years ago

b6c28ce9

2 parents
05545839
14b7681e

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

pom.xml

		skipped 30 lines
31	31		<name>The Open Web Application Security Project (OWASP)</name>
32	32		<url>https://owasp.org/</url>
33	33		</organization>
34		-	<!-- <distributionManagement>-->
35		-	<!-- <snapshotRepository>-->
36		-	<!-- <id>ossrh</id>-->
37		-	<!-- <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
38		-	<!-- </snapshotRepository>-->
39		-	<!-- </distributionManagement>-->
	34	+	<!-- <distributionManagement>-->
	35	+	<!-- <snapshotRepository>-->
	36	+	<!-- <id>ossrh</id>-->
	37	+	<!-- <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
	38	+	<!-- </snapshotRepository>-->
	39	+	<!-- </distributionManagement>-->
40	40
41	41		<properties>
42	42		<java.version>19</java.version>
		skipped 6 lines
49	49		<bootstrap.version>5.2.2</bootstrap.version>
50	50		<github.button.version>2.14.1</github.button.version>
51	51		<gcp.sdk.version>3.4.0</gcp.sdk.version>
	52	+	<datatables.version>1.12.1</datatables.version>
	53	+	<jquery.version>3.6.1</jquery.version>
52	54		<thymeleaf-spring5.version>3.0.15.RELEASE</thymeleaf-spring5.version>
53	55		<thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
54	56		<thymeleaf.layout>3.1.0</thymeleaf.layout>
		skipped 100 lines
155	157		<groupId>org.webjars.npm</groupId>
156	158		<artifactId>github-buttons</artifactId>
157	159		<version>${github.button.version}</version>
	160	+	</dependency>
	161	+	<dependency>
	162	+	<groupId>org.webjars</groupId>
	163	+	<artifactId>datatables</artifactId>
	164	+	<version>${datatables.version}</version>
	165	+	</dependency>
	166	+	<dependency>
	167	+	<groupId>org.webjars</groupId>
	168	+	<artifactId>jquery</artifactId>
	169	+	<version>${jquery.version}</version>
158	170		</dependency>
159	171		<!-- <dependency>-->
160	172		<!-- <groupId>org.springframework.boot</groupId>-->
		skipped 285 lines

■ ■ ■ ■ ■ ■

src/main/resources/static/css/dark.css

		skipped 82 lines
83	83		border-color: var(--bs-indigo);
84	84		}
85	85
	86	+	.dark-mode input {
	87	+	background-color: var(--bs-gray-600);
	88	+	color: var(--bs-body-color);
	89	+	}
	90	+
	91	+	.dark-mode select {
	92	+	background-color: var(--bs-gray-600);
	93	+	color: var(--bs-body-color);
	94	+	}
	95	+

■ ■ ■ ■ ■ ■

src/main/resources/templates/index.html

		skipped 5 lines
6	6		<title>OWASP WrongSecrets</title>
7	7		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
8	8		<link th:rel="stylesheet" th:href="@{/webjars/bootstrap/5.2.2/css/bootstrap.min.css} " />
	9	+	<link th:rel="stylesheet" th:href="@{/webjars/datatables/1.12.1/css/dataTables.bootstrap5.min.css} " />
9	10		<link rel="stylesheet" type="text/css" th:href="@{/css/style.css}" />
10	11		<link rel="stylesheet" type="text/css" th:href="@{/css/dark.css}" />
	12	+
11	13		</head>
12	14
13	15		<body>
		skipped 4 lines
18	20
19	21		<script th:src="@{/webjars/bootstrap/5.2.2/js/bootstrap.bundle.min.js}"></script>
20	22		<script th:src="@{/webjars/github-buttons/2.14.1/dist/buttons.js}"></script>
	23	+	<script th:src="@{/webjars/jquery/3.6.1/jquery.js}"></script>
	24	+	<script th:src="@{/webjars/datatables/1.12.1/js/jquery.dataTables.min.js}"></script>
	25	+	<script th:src="@{/webjars/datatables/1.12.1/js/dataTables.bootstrap5.min.js}"></script>
21	26		<script th:if="${allCompleted} eq 'party'">
22	27		window.addEventListener("load", function () {
23	28		new bootstrap.Modal(document.getElementById('finishedModal'), {}).toggle()
		skipped 12 lines
36	41		+ "&client_secret=" + encodeURIComponent(password));
37	42		</script>
38	43		</body>
	44	+
	45	+	<script>
	46	+
	47	+	$.extend(true, $.fn.dataTable.defaults, {
	48	+	searching: true,
	49	+	ordering: true,
	50	+	});
	51	+	$(document).ready(function () {
	52	+	$('#challenge_overview').DataTable({
	53	+	lengthMenu: [ [20, 30, 50, -1], [20, 30, 50, "All"] ]
	54	+	});
	55	+	});
	56	+	</script>
	57	+
39	58
40	59		</html>
41	60

■ ■ ■ ■ ■ ■

src/main/resources/templates/welcome.html

		skipped 16 lines
17	17		<div class="container-fluid text-sm p-2 p-lg-3">
18	18		<div class="row">
19	19		<div class="col-12 col-lg-7">
20		-	<table class="table table-responsive">
	20	+	<table class="table table-responsive" id="challenge_overview">
21	21		<thead>
22	22		<tr>
23	23		<th scope="col" class="d-none d-xl-table-cell">#</th>
		skipped 14 lines
38	38		th:text="${challenge.name}"
39	39		th:remove="tag"></span></a></td>
40	40		<td th:text="${challenge.tech}"></td>
	41	+	<td td:if="${{challenge.requiredEnv == 'USEDFORDEDUPLICATIONDONOTREMOVE'}}" class="d-sm-none"></td>
41	42		<td class="d-none d-md-table-cell">
42	43		<th:span th:each="i: ${#numbers.sequence(1, challenge.difficulty)}"><span>★ </span></th:span>
43	44		<th:span th:if="${challenge.difficulty<5}"
		skipped 1 lines
45	46		</th:span>
46	47		</td>
47	48		<th:block th:if="${challenge.requiredEnv} == 'DOCKER'">
48		-	<td>Docker</td>
	49	+	<td class="d-none d-sm-table-cell" >Docker</td>
49	50		</th:block>
50	51		<th:block th:if="${challenge.requiredEnv} == 'K8S'">
51		-	<td>K8s or Minikube</td>
	52	+	<td class="d-none d-sm-table-cell" >K8s or Minikube</td>
52	53		</th:block>
53	54		<th:block th:if="${challenge.requiredEnv} == 'VAULT'">
54		-	<td>K8s or Minikube with Vault</td>
	55	+	<td class="d-none d-sm-table-cell" >K8s or Minikube with Vault</td>
55	56		</th:block>
56	57		<th:block
57	58		th:if="${challenge.requiredEnv} == 'AWS' or ${challenge.requiredEnv} == 'GCP' or ${challenge.requiredEnv} == 'AZURE'">
58		-	<td>AWS, GCP, Azure</td>
	59	+	<td class="d-none d-sm-table-cell" >AWS, GCP, Azure</td>
59	60		</th:block>
60	61
61	62		</tr>
		skipped 106 lines

Merge pull request #450 from OWASP/datatable