From cc0653d78c7047daeb7d62062748e889ca498a32 Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Fri, 14 Jun 2024 12:48:06 +0200 Subject: [PATCH 01/17] added div --- html/index.html | 8 ++++++-- html/main.css | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/html/index.html b/html/index.html index df5a374..7b7a3f1 100644 --- a/html/index.html +++ b/html/index.html @@ -12,7 +12,11 @@

Welcome to DataDash

The place to launch and discover datasets and API endpoints.

- +
+ +

Recently added:

- +
\ No newline at end of file diff --git a/html/main.css b/html/main.css index 03cf4e5..2efda1f 100644 --- a/html/main.css +++ b/html/main.css @@ -38,7 +38,7 @@ header { } } -.dataset { +.dataset, #functionBar { padding: 1rem 2rem; background-color: var(--fg-color, darkgrey); border-radius: 1rem; From 96efd6085a26022a1fdaa880d5bd6515bf728ed2 Mon Sep 17 00:00:00 2001 From: schriefer Date: Fri, 14 Jun 2024 13:28:22 +0200 Subject: [PATCH 02/17] Add preliminay search bar --- .gitignore | 2 ++ html/index.html | 10 ++++++---- html/main.css | 22 ++++++++++++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..66f8fb5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea/ +.vscode/ diff --git a/html/index.html b/html/index.html index 7b7a3f1..5975884 100644 --- a/html/index.html +++ b/html/index.html @@ -12,11 +12,13 @@

Welcome to DataDash

The place to launch and discover datasets and API endpoints.

-
- + +

Recently added:

    diff --git a/html/main.css b/html/main.css index 2efda1f..df0f484 100644 --- a/html/main.css +++ b/html/main.css @@ -5,6 +5,7 @@ --pad-datasets: 1rem; --pad-main: 2rem; --min-card-size: 60ch; + --corner-radius: 1rem; font-size: 12pt; } @@ -25,6 +26,23 @@ header { margin-inline: .75rem; } +#tool-bar { + display: flex; + flex-direction: row; +} + +#search-bar { + background-color: var(--fg-color, darkgrey); + padding: .5rem 1rem; + width: 100%; +} + +#search-entry { + background: none; + border: none; + color: var(--text-color); +} + .datasets { padding-inline: var(--pad-datasets); display: grid; @@ -38,10 +56,10 @@ header { } } -.dataset, #functionBar { +.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; From f30a93a8ba00dec6d9715ea0436495f611ebbe95 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Tue, 11 Jun 2024 09:41:10 +0200 Subject: [PATCH 03/17] chore: Add initial project files and configurations --- .gitignore | 33 ++- .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 55 ++++ .../group3/DataDash/DataDashApplication.java | 13 + .../group3/DataDash/ServletInitializer.java | 13 + src/main/resources/application.properties | 1 + .../DataDash/DataDashApplicationTests.java | 13 + 9 files changed, 554 insertions(+), 1 deletion(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplication.java create mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/ServletInitializer.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplicationTests.java diff --git a/.gitignore b/.gitignore index 66f8fb5..549e00a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,33 @@ -.idea/ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### .vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..8f96f52 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..d7c358e --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..6f779cf --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@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 Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..cfc37c1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.0 + + + de.uni-passau.fim.PADAS.group3 + DataDash + 0.0.1-SNAPSHOT + war + DataDash + A ProductHunt like site to find datasets and APIs + + 22 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplication.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplication.java new file mode 100644 index 0000000..496e751 --- /dev/null +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplication.java @@ -0,0 +1,13 @@ +package de.uni_passau.fim.PADAS.group3.DataDash; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DataDashApplication { + + public static void main(String[] args) { + SpringApplication.run(DataDashApplication.class, args); + } + +} diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/ServletInitializer.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/ServletInitializer.java new file mode 100644 index 0000000..87f8895 --- /dev/null +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/ServletInitializer.java @@ -0,0 +1,13 @@ +package de.uni_passau.fim.PADAS.group3.DataDash; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(DataDashApplication.class); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..11b8d6e --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=DataDash diff --git a/src/test/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplicationTests.java b/src/test/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplicationTests.java new file mode 100644 index 0000000..1da58ca --- /dev/null +++ b/src/test/java/de/uni_passau/fim/PADAS/group3/DataDash/DataDashApplicationTests.java @@ -0,0 +1,13 @@ +package de.uni_passau.fim.PADAS.group3.DataDash; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DataDashApplicationTests { + + @Test + void contextLoads() { + } + +} From 268e98c5d334fd0011dae9647c9d926e57267e9f Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Tue, 11 Jun 2024 13:39:00 +0200 Subject: [PATCH 04/17] chore: Add hsqldb runtime dependency to pom.xml --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index cfc37c1..a1dd23f 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,12 @@ spring-boot-starter-test test + + + org.hsqldb + hsqldb + runtime + From 3f7ab20b6027ac9a702d10f35735750396888491 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Fri, 14 Jun 2024 13:39:02 +0200 Subject: [PATCH 05/17] chore: move templates into right location --- {html => src/main/resources/static}/main.css | 0 {html => src/main/resources/static}/sad-looking-glass.svg | 0 {html => src/main/resources/static}/triangle.svg | 0 {html => src/main/resources/templates}/index.html | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {html => src/main/resources/static}/main.css (100%) rename {html => src/main/resources/static}/sad-looking-glass.svg (100%) rename {html => src/main/resources/static}/triangle.svg (100%) rename {html => src/main/resources/templates}/index.html (100%) diff --git a/html/main.css b/src/main/resources/static/main.css similarity index 100% rename from html/main.css rename to src/main/resources/static/main.css diff --git a/html/sad-looking-glass.svg b/src/main/resources/static/sad-looking-glass.svg similarity index 100% rename from html/sad-looking-glass.svg rename to src/main/resources/static/sad-looking-glass.svg diff --git a/html/triangle.svg b/src/main/resources/static/triangle.svg similarity index 100% rename from html/triangle.svg rename to src/main/resources/static/triangle.svg diff --git a/html/index.html b/src/main/resources/templates/index.html similarity index 100% rename from html/index.html rename to src/main/resources/templates/index.html From af68a840d3a63e8367c701806792ba1d56ef5dce Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Fri, 14 Jun 2024 12:48:06 +0200 Subject: [PATCH 06/17] added div --- src/main/resources/static/main.css | 2 +- src/main/resources/templates/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index df0f484..f66d1aa 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -56,7 +56,7 @@ header { } } -.dataset { +.dataset, #functionBar { padding: 1rem 2rem; background-color: var(--fg-color, darkgrey); border-radius: var(--corner-radius); diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 5975884..d4b06bd 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -116,4 +116,4 @@
- \ No newline at end of file + From 2d44e4d5a3832a167271184b6e0a80c5bc9ffb0d Mon Sep 17 00:00:00 2001 From: schriefer Date: Fri, 14 Jun 2024 13:28:22 +0200 Subject: [PATCH 07/17] Add preliminay search bar --- src/main/resources/static/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index f66d1aa..df0f484 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -56,7 +56,7 @@ header { } } -.dataset, #functionBar { +.dataset { padding: 1rem 2rem; background-color: var(--fg-color, darkgrey); border-radius: var(--corner-radius); From 25728f6bc051e02a86affae8bedb771a2cc0ca3c Mon Sep 17 00:00:00 2001 From: Elias Schriefer Date: Fri, 14 Jun 2024 15:02:17 +0200 Subject: [PATCH 08/17] Add looking glass icon --- .gitignore | 3 +++ src/main/resources/static/looking-glass.svg | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 src/main/resources/static/looking-glass.svg diff --git a/.gitignore b/.gitignore index 549e00a..47ba3ef 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ build/ ### VS Code ### .vscode/ + +### Live Server directory ### +html/ diff --git a/src/main/resources/static/looking-glass.svg b/src/main/resources/static/looking-glass.svg new file mode 100644 index 0000000..0f7790e --- /dev/null +++ b/src/main/resources/static/looking-glass.svg @@ -0,0 +1,2 @@ + + From 9431c2bb71b6657a50f317e3caf163c96916cc57 Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Fri, 14 Jun 2024 15:30:50 +0200 Subject: [PATCH 09/17] added searchbar --- src/main/resources/static/main.css | 26 ++++++++++++++++++------- src/main/resources/templates/index.html | 1 + 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index df0f484..62eb72d 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -29,12 +29,14 @@ header { #tool-bar { display: flex; flex-direction: row; + float: right; } #search-bar { background-color: var(--fg-color, darkgrey); padding: .5rem 1rem; width: 100%; + border-radius: 1.5rem; } #search-entry { @@ -75,27 +77,37 @@ header { align-items: center; gap: .5em; } - -.upvote-btn, .downvote-btn { - background: url(triangle.svg) no-repeat; +/* Buttons */ +.upvote-btn, .downvote-btn, .search-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; +} + +:is(.upvote-btn, .downvote-btn, .search-btn):is(:hover, :focus-visible) { filter: brightness(1.5); } -:is(.upvote-btn, .downvote-btn):active { +:is(.upvote-btn, .downvote-btn, .search-btn):active { filter: brightness(1.75); } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index d4b06bd..7654302 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -16,6 +16,7 @@
From e41e9f022b3c052b0d2b8c89634f9a3adf25f56f Mon Sep 17 00:00:00 2001 From: Elias Schriefer Date: Fri, 14 Jun 2024 16:07:48 +0200 Subject: [PATCH 10/17] Add search results section --- src/main/resources/templates/index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 7654302..138e19b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -115,6 +115,13 @@ + + From 148035ed0dc98baf12d7879c3d4f349ee24b5e8f Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Fri, 14 Jun 2024 16:51:55 +0200 Subject: [PATCH 11/17] improved toolbar, implemented filter --- src/main/resources/static/filter.svg | 49 +++++++++++++++++++++++++ src/main/resources/static/main.css | 18 +++++---- src/main/resources/templates/index.html | 11 +++++- 3 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/static/filter.svg diff --git a/src/main/resources/static/filter.svg b/src/main/resources/static/filter.svg new file mode 100644 index 0000000..d90e5c0 --- /dev/null +++ b/src/main/resources/static/filter.svg @@ -0,0 +1,49 @@ + + + + diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index 62eb72d..706751a 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -30,12 +30,9 @@ header { display: flex; flex-direction: row; float: right; -} - -#search-bar { + gap: .5rem; background-color: var(--fg-color, darkgrey); padding: .5rem 1rem; - width: 100%; border-radius: 1.5rem; } @@ -44,6 +41,9 @@ header { border: none; color: var(--text-color); } +#search-entry:focus-visible { + outline: none; +} .datasets { padding-inline: var(--pad-datasets); @@ -78,7 +78,7 @@ header { gap: .5em; } /* Buttons */ -.upvote-btn, .downvote-btn, .search-btn { +.upvote-btn, .downvote-btn, .search-btn, .filter-btn { background: var(--icon-url) no-repeat; background-size: contain; border: none; @@ -103,11 +103,15 @@ header { --icon-url: url(looking-glass.svg); --icon-size: 1rem; } +.filter-btn{ + --icon-url: url(filter.svg); + --icon-size: 1rem; +} -:is(.upvote-btn, .downvote-btn, .search-btn):is(:hover, :focus-visible) { +:is(.upvote-btn, .downvote-btn, .search-btn, .filter-btn):is(:hover, :focus-visible) { filter: brightness(1.5); } -:is(.upvote-btn, .downvote-btn, .search-btn):active { +:is(.upvote-btn, .downvote-btn, .search-btn, .filter-btn):active { filter: brightness(1.75); } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 7654302..b65b530 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -14,10 +14,17 @@
-
From 5a682e1800b63e2849d08f8a66b945a08475a76e Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Mon, 17 Jun 2024 15:11:16 +0200 Subject: [PATCH 12/17] basic implementation of add button --- src/main/resources/static/main.css | 9 +++++++++ src/main/resources/templates/index.html | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index 706751a..d3c8a35 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -7,11 +7,13 @@ --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 { @@ -26,6 +28,13 @@ header { margin-inline: .75rem; } +#add-btn { + position: fixed; + top: 0; + left: 0; + z-index: 1; +} + #tool-bar { display: flex; flex-direction: row; diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index cc670ee..efc3f69 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -7,6 +7,10 @@ + + + + +

Welcome to DataDash

From b721973d05b99121b64310f029571aa2984ea475 Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Mon, 17 Jun 2024 15:42:20 +0200 Subject: [PATCH 13/17] implemented sort-by, implemented divider, fixed class/id in css --- src/main/resources/static/main.css | 20 ++++++-- src/main/resources/static/sort.svg | 61 +++++++++++++++++++++++++ src/main/resources/templates/index.html | 29 +++++++----- 3 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/static/sort.svg diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index d3c8a35..1f1581a 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -87,7 +87,7 @@ header { gap: .5em; } /* Buttons */ -.upvote-btn, .downvote-btn, .search-btn, .filter-btn { +.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn { background: var(--icon-url) no-repeat; background-size: contain; border: none; @@ -108,19 +108,29 @@ header { transform: rotate(180deg); } -.search-btn { +#search-btn { --icon-url: url(looking-glass.svg); --icon-size: 1rem; } -.filter-btn{ +#filter-btn { --icon-url: url(filter.svg); --icon-size: 1rem; } -:is(.upvote-btn, .downvote-btn, .search-btn, .filter-btn):is(:hover, :focus-visible) { +#sort-btn { + --icon-url: url(sort.svg); + --icon-size: 1rem; +} + +.divider { + width: .05rem; + background-color: #222; +} + +:is(.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn):is(:hover, :focus-visible) { filter: brightness(1.5); } -:is(.upvote-btn, .downvote-btn, .search-btn, .filter-btn):active { +:is(.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn):active { filter: brightness(1.75); } diff --git a/src/main/resources/static/sort.svg b/src/main/resources/static/sort.svg new file mode 100644 index 0000000..a259268 --- /dev/null +++ b/src/main/resources/static/sort.svg @@ -0,0 +1,61 @@ + + + + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index efc3f69..995a140 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ DataDash - + @@ -18,17 +18,22 @@
- - - + +
+ + +
From 1fe7a2ca29238dd85c0dbf4022602c7ce98c9859 Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Mon, 17 Jun 2024 15:49:50 +0200 Subject: [PATCH 14/17] changed css path to be correct --- src/main/resources/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 995a140..b1677be 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ DataDash - + From a7b479074ad4de89c5055b82433e4a93b9090fdc Mon Sep 17 00:00:00 2001 From: Elias Schriefer Date: Mon, 17 Jun 2024 22:43:59 +0200 Subject: [PATCH 15/17] Add content adding page --- src/main/resources/static/add.css | 133 ++++++++++++++++++++++++++ src/main/resources/templates/add.html | 58 +++++++++++ 2 files changed, 191 insertions(+) create mode 100644 src/main/resources/static/add.css create mode 100644 src/main/resources/templates/add.html diff --git a/src/main/resources/static/add.css b/src/main/resources/static/add.css new file mode 100644 index 0000000..4361843 --- /dev/null +++ b/src/main/resources/static/add.css @@ -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); +} diff --git a/src/main/resources/templates/add.html b/src/main/resources/templates/add.html new file mode 100644 index 0000000..d8472c1 --- /dev/null +++ b/src/main/resources/templates/add.html @@ -0,0 +1,58 @@ + + + + + + DataDash – Add dataset/API + + + +
+
+

Add new DataDash content

+
+ +
+

+ 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. +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + \ No newline at end of file From d5889341e6fa1cd633f8e914cf2ec2be1ab0d794 Mon Sep 17 00:00:00 2001 From: J-Klinke Date: Tue, 18 Jun 2024 11:43:14 +0200 Subject: [PATCH 16/17] proper add button implementation --- src/main/resources/static/add-button-mask.svg | 105 ++++++++++++++++++ src/main/resources/static/main.css | 17 ++- src/main/resources/templates/index.html | 5 +- 3 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/static/add-button-mask.svg diff --git a/src/main/resources/static/add-button-mask.svg b/src/main/resources/static/add-button-mask.svg new file mode 100644 index 0000000..221de76 --- /dev/null +++ b/src/main/resources/static/add-button-mask.svg @@ -0,0 +1,105 @@ + + + + + diff --git a/src/main/resources/static/main.css b/src/main/resources/static/main.css index 1f1581a..0711eca 100644 --- a/src/main/resources/static/main.css +++ b/src/main/resources/static/main.css @@ -29,12 +29,19 @@ header { } #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; @@ -50,6 +57,7 @@ header { border: none; color: var(--text-color); } + #search-entry:focus-visible { outline: none; } @@ -124,13 +132,14 @@ header { .divider { width: .05rem; - background-color: #222; + height: 1rem; + background-color: var(--bg-color); } -:is(.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn):is(:hover, :focus-visible) { +: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, #search-btn, #filter-btn, #sort-btn):active { +:is(.upvote-btn, .downvote-btn, #search-btn, #filter-btn, #sort-btn, #add-btn):active { filter: brightness(1.75); } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index b1677be..172c714 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -7,10 +7,7 @@ - - - + - +

Welcome to DataDash

From 96a7aa4a514af33e0eed991eee92dacd61223655 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Tue, 18 Jun 2024 12:33:20 +0200 Subject: [PATCH 17/17] chore: Update pom.xml with swagger dependencie --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index a1dd23f..68a734d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,20 +22,29 @@ org.springframework.boot spring-boot-starter-data-jpa + org.springframework.boot spring-boot-starter-thymeleaf + org.springframework.boot spring-boot-starter-web + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.0.2 + + org.springframework.boot spring-boot-starter-tomcat provided + org.springframework.boot spring-boot-starter-test