Merge branch 'add-content-page' into 'main'

Add content adding page

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!5

.gitignore

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

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);
+}

src/main/resources/static/looking-glass.svg

@@ -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>

src/main/resources/static/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,25 @@ header {
     margin-inline: .75rem;
 }
 
+#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 {
+    background: none;
+    border: none;
+    color: var(--text-color);
+}
+
 .datasets {
     padding-inline: var(--pad-datasets);
     display: grid;
@@ -41,7 +61,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 +77,37 @@ header {
     align-items: center;
     gap: .5em;
 }
-
+/* Buttons */
-.upvote-btn, .downvote-btn {
+.upvote-btn, .downvote-btn, .search-btn {
-    background: url(triangle.svg) no-repeat;
+    background: var(--icon-url) no-repeat;
     background-size: contain;
     border: none;
-    width: 2em;
+    width: var(--icon-size);
-    height: 2em;
+    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);
 }

src/main/resources/templates/add.html

@@ -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>

src/main/resources/templates/index.html

@@ -13,6 +13,13 @@
             <p>The place to launch and discover datasets and API endpoints.</p>
         </header>
 
+        <section id="tool-bar">
+            <div id="search-bar">
+                <input type="search" name="query" id="search-entry" placeholder="Search">
+                <button class="search-btn">Search</button>
+            </div>
+        </section>
+
         <section id="recents">
             <h2>Recently added:</h2>
             <ul class="datasets">
@@ -107,7 +114,14 @@
                     </aside>
                 </li>
             </ul>
+        </section>
 
+        <section id="search">
+            <h2>Search results:</h2>
+            <ul class="datasets">
+
+            </ul>
+        </section>
     </main>
 </body>
 </html>