Erik/DataDash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull changes into 11-add-api-for-getting-home-page-data

Browse Source
This commit is contained in:
Erik Foris
2024-06-18 15:17:22 +02:00
parent c0de764f15 15b9980772
commit e0b266ce94
10 changed files with 519 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -31,3 +31,6 @@ build/
### VS Code ###
.vscode/
### Live Server directory ###
html/

9
pom.xml
View File

@@ -22,20 +22,29 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>

105
src/main/resources/static/add-button-mask.svg Normal file
View File

@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg"
width="1.70667in" height="1.70667in"
viewBox="0 0 512 512">
<path id="Selection"
fill="#222" stroke="#222" stroke-width="1"
d="M 343.00,167.00
C 343.00,167.00 459.00,51.00 459.00,51.00
459.00,51.00 493.00,17.00 493.00,17.00
498.17,11.83 505.67,2.99 512.00,0.00
512.00,0.00 512.00,512.00 512.00,512.00
512.00,512.00 0.00,512.00 0.00,512.00
0.00,512.00 23.83,487.00 23.83,487.00
23.83,487.00 58.00,452.00 58.00,452.00
58.00,452.00 107.00,403.00 107.00,403.00
107.00,403.00 136.00,374.00 136.00,374.00
137.97,372.03 145.89,364.80 146.29,362.58
146.69,360.29 142.68,354.93 141.35,353.00
141.35,353.00 125.66,330.00 125.66,330.00
125.66,330.00 80.32,263.00 80.32,263.00
80.32,263.00 69.89,247.83 69.89,247.83
68.45,245.69 65.56,242.71 65.91,240.00
66.25,237.36 70.15,233.86 72.00,232.00
72.00,232.00 92.00,212.42 92.00,212.42
96.05,209.82 99.54,213.00 103.00,215.28
103.00,215.28 127.00,231.61 127.00,231.61
127.00,231.61 144.00,242.96 144.00,242.96
144.00,242.96 194.00,277.00 194.00,277.00
194.00,277.00 210.00,287.95 210.00,287.95
211.56,289.01 214.71,291.60 216.58,291.58
219.48,291.55 227.66,282.34 230.00,280.00
230.00,280.00 210.00,261.00 210.00,261.00
210.00,261.00 178.00,229.00 178.00,229.00
178.00,229.00 146.00,197.00 146.00,197.00
146.00,197.00 127.00,177.00 127.00,177.00
143.52,160.48 160.02,138.08 186.00,139.36
201.99,140.15 214.55,147.35 227.00,156.83
246.44,171.64 266.00,194.88 269.19,220.00
270.40,229.48 267.55,235.32 266.00,244.00
266.00,244.00 307.00,203.00 307.00,203.00
307.00,203.00 287.00,184.00 287.00,184.00
287.00,184.00 255.00,152.00 255.00,152.00
255.00,152.00 223.00,120.00 223.00,120.00
223.00,120.00 204.00,100.00 204.00,100.00
219.55,84.45 234.07,64.73 257.58,62.38
275.04,60.64 290.72,69.69 304.00,79.83
324.38,95.39 345.96,120.97 346.68,148.00
346.85,154.54 344.43,160.73 343.00,167.00 Z
M 315.00,164.00
C 316.37,161.28 318.16,158.01 318.65,155.00
320.22,145.40 311.79,134.05 306.22,127.00
297.46,115.92 292.28,110.47 281.00,101.83
268.92,92.58 259.85,85.59 245.00,94.00
247.97,100.29 255.94,106.94 261.00,112.00
261.00,112.00 294.00,145.00 294.00,145.00
299.40,150.40 308.55,160.95 315.00,164.00 Z
M 237.00,242.00
C 239.18,238.69 241.42,235.05 241.78,231.00
242.25,225.48 239.16,219.09 236.49,214.42
230.27,203.54 220.92,194.72 212.00,186.01
208.24,182.34 204.16,178.87 200.01,175.64
190.44,168.17 176.54,162.65 167.00,173.00
167.00,173.00 212.00,218.00 212.00,218.00
212.00,218.00 237.00,242.00 237.00,242.00 Z
M 343.00,167.00
C 343.00,167.00 342.00,167.00 342.00,167.00
342.00,167.00 343.00,168.00 343.00,168.00
343.00,168.00 343.00,167.00 343.00,167.00 Z
M 266.00,244.00
C 266.00,244.00 265.00,244.00 265.00,244.00
265.00,244.00 266.00,245.00 266.00,245.00
266.00,245.00 266.00,244.00 266.00,244.00 Z
M 100.00,245.00
C 100.00,245.00 99.00,245.00 99.00,245.00
99.00,245.00 100.00,246.00 100.00,246.00
100.00,246.00 100.00,245.00 100.00,245.00 Z
M 265.00,245.00
C 265.00,245.00 264.00,245.00 264.00,245.00
264.00,245.00 265.00,246.00 265.00,246.00
265.00,246.00 265.00,245.00 265.00,245.00 Z
M 101.00,246.00
C 101.00,246.00 100.00,246.00 100.00,246.00
100.00,246.00 101.00,247.00 101.00,247.00
101.00,247.00 101.00,246.00 101.00,246.00 Z
M 102.00,247.00
C 102.00,247.00 101.00,247.00 101.00,247.00
101.00,247.00 102.00,248.00 102.00,248.00
102.00,248.00 102.00,247.00 102.00,247.00 Z
M 146.00,278.00
C 146.00,278.00 122.00,261.20 122.00,261.20
117.33,257.51 107.29,249.51 102.00,248.00
102.00,248.00 122.98,278.00 122.98,278.00
124.77,280.69 130.15,288.87 133.09,289.66
137.56,290.87 144.36,281.48 146.00,278.00 Z
M 167.00,293.00
C 167.00,293.00 154.01,305.00 154.01,305.00
154.01,305.00 149.32,312.00 149.32,312.00
149.32,312.00 154.21,321.00 154.21,321.00
154.21,321.00 168.00,341.00 168.00,341.00
174.28,338.03 183.78,327.33 189.00,322.00
190.79,320.17 194.48,317.02 193.66,314.13
193.08,312.05 188.76,309.50 187.00,308.16
187.00,308.16 167.00,293.00 167.00,293.00 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

133
src/main/resources/static/add.css Normal file
View File

@@ -0,0 +1,133 @@
@import url("main.css");
:root {
--accent-color: oklch(65.33% 0.158 247.76);
}
form label:after {
content: ":";
}
form :is(input[type=text], textarea) {
background-color: var(--fg-color);
border: none;
border-radius: .25lh;
color: var(--text-color, white);
padding: .5em;
font-family: sans-serif;
}
/* quick info box */
form {
display: grid;
grid-template-columns: 1fr 1fr auto;
gap: 1rem 2rem;
}
form > * {
display: flex;
align-items: center;
gap: 1rem;
}
form :is(input[type=text], textarea) {
flex-grow: 1;
}
/* switch */
label:has(#is-dataset) {
gap: 0;
}
#is-dataset {
display: none;
}
#is-dataset-toggle {
margin-inline: 1ch;
padding-inline: .5ch;
width: 2rem;
height: 1lh;
background-color: var(--fg-color);
border-radius: .5lh;
position: relative;
}
#is-dataset-toggle::before {
content: "";
position: absolute;
top: 0;
--switch-gap: 2px;
--size: calc(1lh - 2 * var(--switch-gap));
width: var(--size);
height: var(--size);
border-radius: 50%;
margin: var(--switch-gap);
box-sizing: border-box;
background-color: var(--text-color);
transition: inset-inline ease-out 50ms;
}
#is-dataset:not(:checked) + #is-dataset-toggle::before {
left: 0;
}
#is-dataset:checked + #is-dataset-toggle::before {
inset-inline: calc(2rem - .5lh - var(--switch-gap)) 0;
}
/* short description box */
form :has(#short-description) {
grid-column: 1 / 3;
}
/* full description box */
#full-description-box {
grid-column: 1 / 4;
margin: 1rem 0;
align-items: start;
}
#full-description {
height: 15rem;
box-sizing: border-box;
}
/* button bar */
#btn-bar {
grid-column: 1 / 4;
justify-content: end;
gap: 1rem;
}
/* button styling */
.btn {
padding: .5lh 1lh;
border: none;
border-radius: .5lh;
--btn-color: var(--fg-color);
background-color: var(--btn-color);
color: var(--text-color);
font-weight: bold;
font-size: 1rem;
transition: background-color 100ms, filter 200ms;
transition-timing-function: ease-out;
--drop-shadow-opacity: .5;
--drop-shadow-offset-y: 0;
--drop-shadow-blur: .25rem;
filter: drop-shadow(
rgba(0, 0, 0, var(--drop-shadow-opacity))
0 var(--drop-shadow-offset-y) var(--drop-shadow-blur)
);
}
.btn:hover {
background-color: color-mix(in oklab, var(--btn-color) 80%, var(--bg-color));
--drop-shadow-opacity: .8;
--drop-shadow-offset-y: .25rem;
--drop-shadow-blur: .4rem;
}
.btn.suggested {
--btn-color: var(--accent-color);
}

49
src/main/resources/static/filter.svg Normal file
View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg"
width="1.29333in" height="1.31in"
viewBox="0 0 388 393">
<path id="Selection"
fill="#222" stroke="#222" stroke-width="1"
d="M 13.00,0.53
C 13.00,0.53 46.00,0.00 46.00,0.00
46.00,0.00 109.00,0.00 109.00,0.00
109.00,0.00 303.00,0.00 303.00,0.00
303.00,0.00 367.00,0.00 367.00,0.00
379.06,0.02 388.86,5.38 387.90,19.00
387.38,26.49 382.97,30.02 378.00,35.00
378.00,35.00 360.00,53.00 360.00,53.00
360.00,53.00 277.00,136.00 277.00,136.00
277.00,136.00 257.00,156.00 257.00,156.00
249.62,163.38 246.02,164.34 246.00,175.00
246.00,175.00 246.00,317.00 246.00,317.00
246.00,317.00 246.00,370.00 246.00,370.00
245.98,381.68 241.23,394.14 227.00,392.66
217.40,391.67 208.57,380.57 202.00,374.00
202.00,374.00 164.00,336.00 164.00,336.00
152.71,324.71 145.03,320.93 145.00,304.00
145.00,304.00 145.00,177.00 145.00,177.00
144.99,174.35 145.19,171.43 143.98,169.00
142.58,166.21 137.39,161.39 135.00,159.00
135.00,159.00 118.00,142.00 118.00,142.00
118.00,142.00 35.00,59.00 35.00,59.00
35.00,59.00 13.00,37.04 13.00,37.04
9.44,33.64 4.50,30.22 2.09,26.00
-3.75,15.77 2.41,3.93 13.00,0.53 Z
M 328.00,35.00
C 328.00,35.00 61.00,35.00 61.00,35.00
65.72,41.59 84.13,59.13 91.00,66.00
91.00,66.00 149.00,124.00 149.00,124.00
149.00,124.00 167.00,142.00 167.00,142.00
170.31,145.31 175.43,149.89 177.43,154.00
179.72,158.68 179.99,163.91 180.00,169.00
180.00,169.00 180.00,295.00 180.00,295.00
180.00,297.09 179.88,300.06 180.60,302.00
182.02,305.85 190.74,313.74 194.00,317.00
199.15,322.15 205.21,328.85 211.00,333.00
211.00,333.00 211.00,166.00 211.00,166.00
211.01,160.84 211.17,156.76 213.56,152.00
215.57,147.97 219.79,144.21 223.00,141.00
223.00,141.00 241.00,123.00 241.00,123.00
241.00,123.00 298.00,66.00 298.00,66.00
304.87,59.13 323.28,41.59 328.00,35.00 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

2
src/main/resources/static/looking-glass.svg Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" id="looking-glass" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><g id="main-layer"><path id="looking-glass" style="fill:none;stroke:#222222;stroke-width:1.5;stroke-linecap:round" d="M 11.22141,6 A 5.2214103,5.2214103 0 0 1 6,11.22141 5.2214103,5.2214103 0 0 1 0.77858973,6 5.2214103,5.2214103 0 0 1 6,0.77858973 5.2214103,5.2214103 0 0 1 11.22141,6 Z M 15.25,15.25 10,10" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 531 B

78
src/main/resources/static/main.css
View File

@@ -5,12 +5,15 @@
--pad-datasets: 1rem;
--pad-main: 2rem;
--min-card-size: 60ch;
--corner-radius: 1rem;
font-size: 12pt;
font-family: sans-serif;
}
body {
background-color: var(--bg-color, black);
color: var(--text-color, white);
margin: 0;
}
main {
@@ -25,6 +28,40 @@ header {
margin-inline: .75rem;
}
#add-btn {
width: 7rem;
height: 7rem;
content: url("add-button-mask.svg");
background: linear-gradient(135deg, pink, darkblue);
clip-path: polygon(0% 0%, 100% 0%, 0% 100%);
cursor: pointer;
position: fixed;
top: 0;
left: 0;
z-index: 1;
}
#tool-bar {
display: flex;
flex-direction: row;
float: right;
gap: .5rem;
background-color: var(--fg-color, darkgrey);
padding: .5rem 1rem;
border-radius: 1.5rem;
}
#search-entry {
background: none;
border: none;
color: var(--text-color);
}
#search-entry:focus-visible {
outline: none;
}
.datasets {
padding-inline: var(--pad-datasets);
display: grid;
@@ -41,7 +78,7 @@ header {
.dataset {
padding: 1rem 2rem;
background-color: var(--fg-color, darkgrey);
border-radius: 1rem;
border-radius: var(--corner-radius);
list-style: none;
display: inline-flex;
align-items: center;
@@ -57,27 +94,52 @@ header {
align-items: center;
gap: .5em;
}
.upvote-btn, .downvote-btn {
background: url(triangle.svg) no-repeat;
/* Buttons */
.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn {
background: var(--icon-url) no-repeat;
background-size: contain;
border: none;
width: 2em;
height: 2em;
width: var(--icon-size);
height: var(--icon-size);
padding: 0;
overflow: hidden;
color: transparent;
cursor: pointer;
}
.downvote-btn, .upvote-btn{
--icon-url: url(triangle.svg);
--icon-size: 2rem;
}
.downvote-btn {
transform: rotate(180deg);
}
:is(.upvote-btn, .downvote-btn):is(:hover, :focus-visible) {
#search-btn {
--icon-url: url(looking-glass.svg);
--icon-size: 1rem;
}
#filter-btn {
--icon-url: url(filter.svg);
--icon-size: 1rem;
}
#sort-btn {
--icon-url: url(sort.svg);
--icon-size: 1rem;
}
.divider {
width: .05rem;
height: 1rem;
background-color: var(--bg-color);
}
:is(.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn, #add-btn):is(:hover, :focus-visible) {
filter: brightness(1.5);
}
:is(.upvote-btn, .downvote-btn):active {
:is(.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn, #add-btn):active {
filter: brightness(1.75);
}

61
src/main/resources/static/sort.svg Normal file
View File

@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg"
width="1.2in" height="1.05333in"
viewBox="0 0 360 316">
<path id="Selection"
fill="#222" stroke="#222" stroke-width="1"
d="M 64.00,85.00
C 64.00,85.00 43.62,121.00 43.62,121.00
40.24,127.21 33.18,140.58 27.99,144.58
16.02,153.82 -0.96,144.07 0.10,129.00
0.58,122.10 5.78,114.81 9.25,109.00
9.25,109.00 17.50,94.00 17.50,94.00
17.50,94.00 27.91,76.00 27.91,76.00
27.91,76.00 34.83,65.00 34.83,65.00
34.83,65.00 62.26,17.00 62.26,17.00
67.57,7.75 71.45,-0.78 84.00,0.10
94.23,0.81 97.72,8.22 102.17,16.00
102.17,16.00 108.62,27.00 108.62,27.00
108.62,27.00 125.76,57.00 125.76,57.00
125.76,57.00 130.48,64.00 130.48,64.00
130.48,64.00 150.17,99.00 150.17,99.00
155.14,107.71 165.61,121.95 164.90,132.00
164.00,144.90 148.83,152.55 138.00,145.30
131.19,140.74 124.40,125.60 119.70,118.00
119.70,118.00 100.00,84.00 100.00,84.00
100.00,84.00 100.00,263.00 100.00,263.00
100.00,263.00 100.00,289.00 100.00,289.00
100.00,293.06 100.34,300.37 99.20,304.00
96.71,311.96 89.10,316.47 81.00,315.90
68.82,315.05 65.02,305.63 65.00,295.00
65.00,295.00 65.00,152.00 65.00,152.00
65.00,152.00 65.00,108.00 65.00,108.00
65.00,101.39 65.72,91.06 64.00,85.00 Z
M 260.00,232.00
C 260.00,232.00 260.00,53.00 260.00,53.00
260.00,53.00 260.00,27.00 260.00,27.00
260.00,22.94 259.66,15.63 260.80,12.00
263.29,4.04 270.90,-0.47 279.00,0.10
291.18,0.95 294.98,10.37 295.00,21.00
295.00,21.00 295.00,164.00 295.00,164.00
295.00,164.00 295.00,208.00 295.00,208.00
295.00,214.61 294.28,224.94 296.00,231.00
296.00,231.00 316.38,195.00 316.38,195.00
319.76,188.79 326.82,175.42 332.01,171.42
343.98,162.18 360.96,171.93 359.90,187.00
359.42,193.90 354.22,201.19 350.75,207.00
350.75,207.00 342.50,222.00 342.50,222.00
342.50,222.00 332.09,240.00 332.09,240.00
332.09,240.00 325.17,251.00 325.17,251.00
325.17,251.00 297.74,299.00 297.74,299.00
292.43,308.25 288.55,316.78 276.00,315.90
265.77,315.19 262.28,307.78 257.83,300.00
257.83,300.00 251.38,289.00 251.38,289.00
251.38,289.00 234.24,259.00 234.24,259.00
234.24,259.00 229.52,252.00 229.52,252.00
229.52,252.00 209.83,217.00 209.83,217.00
204.86,208.29 194.39,194.05 195.10,184.00
196.00,171.10 211.17,163.45 222.00,170.70
228.81,175.26 235.60,190.40 240.30,198.00
240.30,198.00 260.00,232.00 260.00,232.00 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

58
src/main/resources/templates/add.html Normal file
View File

@@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DataDash – Add dataset/API</title>
<link rel="stylesheet" href="add.css">
</head>
<body>
<main>
<header>
<h1>Add new DataDash content</h1>
</header>
<section>
<p>
Please add the following information about your dataset/API to
help users better find it and understand what it is about and
how to use it.
</p>
<form action="/api/add" method="post">
<span>
<label for="text">Title</label>
<input type="text" name="title" id="title">
</span>
<span id="author-box">
<label for="author">Author</label>
<input type="text" name="author" id="author">
</span>
<label>
Dataset
<input type="checkbox" name="is-dataset" id="is-dataset">
<span id="is-dataset-toggle"></span>
API
</label>
<span>
<label for="short-description">Short description</label>
<input type="text" name="short-description" id="short-description">
</span>
<span id="full-description-box">
<label for="full-description">Full description</label>
<textarea name="full-description" id="full-description"></textarea>
</span>
<span id="btn-bar">
<input type="submit" value="Add" id="btn-add" class="btn suggested">
<input type="reset" value="Cancel" id="btn-cancel" class="btn">
</span>
</form>
</section>
</main>
</body>
</html>

31
src/main/resources/templates/index.html
View File

@@ -7,12 +7,32 @@
<link rel="stylesheet" href="main.css">
</head>
<body>
<div onclick="console.log('add')" id="add-btn"></div>
<main>
<header>
<h1>Welcome to DataDash</h1>
<p>The place to launch and discover datasets and API endpoints.</p>
</header>
<section id="tool-bar">
<select id="sort-btn">Sort by
<option>Option 1</option>
<option>Option 2</option>
</select>
<div class="divider"></div>
<select id="filter-btn">Filter
<optgroup label="Standard categories">
<option>Option 1</option>
<option>Option 2</option>
</optgroup>
<optgroup label="User categories">
<option>user category</option>
</optgroup>
</select>
<input type="search" name="query" id="search-entry" placeholder="Search">
<button id="search-btn">Search</button>
</section>
<section id="recents">
<h2>Recently added:</h2>
<ul class="datasets">
@@ -107,7 +127,14 @@
</aside>
</li>
</ul>
</section>
<section id="search">
<h2>Search results:</h2>
<ul class="datasets">
</ul>
</section>
</main>
</body>
</html>
</html>