commit 2b3816c341b896106cb928c825c1f80344087b20 Author: Friedel Schön <[email protected]> Date: Sat, 7 Sep 2024 17:50:09 +0200 first commit Diffstat:
49 files changed, 1482 insertions(+), 0 deletions(-)
diff --git a/.gitattributes b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/.vscode/settings.json b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "interactive" +} +\ No newline at end of file diff --git a/build.gradle b/build.gradle @@ -0,0 +1,42 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.4/userguide/building_java_projects.html in the Gradle documentation. + */ + + +plugins { + id 'java' + id 'application' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'redis.clients:jedis:4.3.1' // reddis server + implementation 'org.mariadb.jdbc:mariadb-java-client:3.3.1' // MariaDB-driver for JavaDB + + implementation "com.sparkjava:spark-core:2.9.4" // spark-java +// implementation "com.ftpix:sparknotation:1.17" // spark-java annotation like @SparkGet(...) + + implementation "org.slf4j:slf4j-simple:2.0.9" // slf4j implementation + + implementation 'com.google.code.gson:gson:2.10.1' // json library + + implementation "javax.persistence:javax.persistence-api:2.2" // orm (idk man) + + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3' // unit test +} + +application { + // Define the main class for the application. + mainClass = 'circuhub.App' +} + +tasks.named('test') { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differ. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +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/gradlew.bat b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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/settings.gradle b/settings.gradle @@ -0,0 +1,8 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.4/userguide/building_swift_projects.html in the Gradle documentation. + */ + +rootProject.name = 'circuhub' diff --git a/src/main/java/circuhub/App.java b/src/main/java/circuhub/App.java @@ -0,0 +1,27 @@ +package circuhub; + +import static spark.Spark.path; + +import java.sql.Connection; +import java.sql.DriverManager; + +import circuhub.controller.Controller; +import circuhub.controller.UserController; + +//@SparkController +public class App { + public static void main(String[] args) throws Exception { + Class.forName("org.mariadb.jdbc.Driver"); + + Connection con = DriverManager + .getConnection("jdbc:mariadb://localhost:3306/circuhub?user=root&password=pizza123"); + + Controller[] controllers = new Controller[] { + new UserController(con) + }; + + for (Controller controller : controllers) { + path(controller.prefix(), controller); + } + } +} diff --git a/src/main/java/circuhub/controller/Controller.java b/src/main/java/circuhub/controller/Controller.java @@ -0,0 +1,54 @@ +package circuhub.controller; + +import java.util.HashMap; +import java.util.Map; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import circuhub.controller.ResponseStatus.ResponseException; +import spark.Response; +import spark.RouteGroup; +import static spark.Spark.exception; + +public abstract class Controller implements Runnable, RouteGroup { + private static final Gson gson = new GsonBuilder() + .setPrettyPrinting() + .create(); + + private String wrapStatus(Response res, ResponseStatus code, Map<String, Object> value) { + res.status(code.http); + return gson.toJson(new HashMap<String, Object>() { + { + put("status", Map.of( + "code", code.code, + "message", code.message)); + putAll(value); + } + }); + } + + public String render(Response res, ResponseStatus error) { + return wrapStatus(res, error, Map.of()); + } + + public String render(Response res, Map<String, Object> value) { + return wrapStatus(res, ResponseStatus.SUCCESS, value); + } + + public String render(Response res, ResponseStatus error, Map<String, Object> value) { + return wrapStatus(res, error, value); + } + + @Override + public void addRoutes() { + exception(ResponseException.class, + (exc, req, res) -> res.body(render(res, exc.status))); + exception(Exception.class, + (exc, req, res) -> res.body(render(res, ResponseStatus.INTERNAL_ERROR))); + + run(); + } + + public abstract String prefix(); +} diff --git a/src/main/java/circuhub/controller/ResponseStatus.java b/src/main/java/circuhub/controller/ResponseStatus.java @@ -0,0 +1,33 @@ +package circuhub.controller; + +public enum ResponseStatus { + SUCCESS(0, 200, "success"), + INTERNAL_ERROR(1, 500, "internal error"), + UNKNOWN_USER(2, 404, "user not found"), + TOKEN_REQUIRED(3, 401, "token required"), + TOKEN_INVALID(4, 403, "token invalid"), + MALFORMATTED_ID(5, 400, "malformatted id"), + PARAMETER_REQUIRED(6, 400, "parameter missing"); + + public static class ResponseException extends RuntimeException { + public final ResponseStatus status; + + private ResponseException(ResponseStatus status) { + this.status = status; + } + } + + public final int code; + public final int http; + public final String message; + + private ResponseStatus(int code, int http, String message) { + this.code = code; + this.http = http; + this.message = message; + } + + public RuntimeException toException() { + return new ResponseException(this); + } +} diff --git a/src/main/java/circuhub/controller/UserController.java b/src/main/java/circuhub/controller/UserController.java @@ -0,0 +1,124 @@ +package circuhub.controller; + +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import static spark.Spark.*; + +public class UserController extends Controller { + public static final int TOKEN_SIZE = 32; + public static final String TOKEN_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + + private final Connection conn; + private final Map<String, Integer> tokens = new HashMap<>(); + + public UserController(Connection conn) { + this.conn = conn; + } + + private static String bytesToHex(byte[] bytes) { + final String HEX_ARRAY = "0123456789abcdef"; + char[] hexChars = new char[bytes.length * 2]; + for (int j = 0; j < bytes.length; j++) { + int v = bytes[j] & 0xFF; + hexChars[j * 2] = HEX_ARRAY.charAt(v >>> 4); + hexChars[j * 2 + 1] = HEX_ARRAY.charAt(v & 0x0F); + } + + return new String(hexChars); + } + + private String hashPassword(String plain) throws UnsupportedEncodingException, NoSuchAlgorithmException { + byte[] hashedPassword = MessageDigest.getInstance("MD5") + .digest(plain.getBytes("UTF-8")); + + return bytesToHex(hashedPassword); + } + + private String randomString(String chars, int size) { + return new Random().ints(0, chars.length()) + .limit(size) + .mapToObj(chars::charAt) + .collect(StringBuilder::new, StringBuilder::append, StringBuilder::append) + .toString(); + } + + private int param2userID(String requestedID, String token) { + if (requestedID.equals("@self")) { + if (token == null) + throw ResponseStatus.TOKEN_REQUIRED.toException(); + if (tokens.containsKey(token)) + throw ResponseStatus.TOKEN_INVALID.toException(); + return tokens.get(token); + } + try { + return Integer.parseInt(requestedID); + } catch (NumberFormatException exc) { + throw ResponseStatus.MALFORMATTED_ID.toException(); + } + } + + @Override + public String prefix() { + return "/api/user"; + } + + @Override + public void run() { + post("/login", (req, res) -> { + String username = req.queryParams("username"); + String password = req.queryParams("password"); + + if (username == null || password == null) + throw ResponseStatus.PARAMETER_REQUIRED.toException(); + + String hashedPassword = hashPassword(password); + + PreparedStatement stmt = conn.prepareStatement("SELECT id FROM user WHERE username=? AND password=?"); + stmt.setString(1, username); + stmt.setString(2, hashedPassword); + + ResultSet result = stmt.executeQuery(); + + if (!result.next()) + return render(res, ResponseStatus.UNKNOWN_USER); + + int id = stmt.getResultSet().getInt(1); + + String token = randomString(TOKEN_CHARS, TOKEN_SIZE); + + tokens.put(token, id); + + return render(res, Map.of("token", token, "user_id", id)); + }); + + // /api/user/53 + // /api/user/@self + get("/:id", (req, res) -> { + int id = param2userID(req.params(":id"), req.queryParams("token")); + + PreparedStatement stmt = conn.prepareStatement( + "SELECT username, institution, institution_role, created_at FROM user WHERE id=?"); + stmt.setInt(1, id); + + ResultSet result = stmt.executeQuery(); + + if (!result.next()) + return render(res, ResponseStatus.UNKNOWN_USER); + + return render(res, Map.of( + "id", id, + "username", result.getString(1), + "institution", result.getInt(2), + "institution_role", result.getInt(3), + "created_at", result.getDate(4))); + }); + } +} diff --git a/src/main/java/circuhub/entity/Institution.java b/src/main/java/circuhub/entity/Institution.java @@ -0,0 +1,28 @@ +package circuhub.entity; + +import javax.persistence.*; +import java.sql.Timestamp; + +@Entity +public class Institution { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private Integer name; + + private String description; + + private String address1; + + private String address2; + + private Integer zipcode; + + private String place; + + private String country; // Note: Using a String for the country code + + private Timestamp createdAt; +} +\ No newline at end of file diff --git a/src/main/java/circuhub/entity/InstitutionContact.java b/src/main/java/circuhub/entity/InstitutionContact.java @@ -0,0 +1,24 @@ +package circuhub.entity; + +import javax.persistence.*; + +@Entity +public class InstitutionContact { + + @Id + @ManyToOne + @JoinColumn(name = "institution") + private Institution institution; + + @ManyToOne + @JoinColumn(name = "user") + private User user; // Note: Optional relationship + + private String name; + + private String function; + + private String email; + + private String phone; +} +\ No newline at end of file diff --git a/src/main/java/circuhub/entity/Resource.java b/src/main/java/circuhub/entity/Resource.java @@ -0,0 +1,25 @@ +package circuhub.entity; + +import javax.persistence.*; + +@Entity +public class Resource { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + @ManyToOne + @JoinColumn(name = "institution") + private Institution institution; + + @ManyToOne + @JoinColumn(name = "resource_type") + private ResourceType type; + + @ManyToOne + @JoinColumn(name = "resource_category") + private ResourceCategory category; + + private Double value; +} diff --git a/src/main/java/circuhub/entity/ResourceCategory.java b/src/main/java/circuhub/entity/ResourceCategory.java @@ -0,0 +1,18 @@ +package circuhub.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class ResourceCategory { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private String name; + + private String description; +} diff --git a/src/main/java/circuhub/entity/ResourceType.java b/src/main/java/circuhub/entity/ResourceType.java @@ -0,0 +1,18 @@ +package circuhub.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class ResourceType { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private String name; + + private String description; +} diff --git a/src/main/java/circuhub/entity/User.java b/src/main/java/circuhub/entity/User.java @@ -0,0 +1,28 @@ +package circuhub.entity; + +import javax.persistence.*; +import java.sql.Timestamp; + +@Entity +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private String username; + + private String password; // Note: Consider using a more secure method for password storage + + private Integer institution; + + @Enumerated(EnumType.STRING) + private InstitutionRole institutionRole; + + private Timestamp createdAt; +} + +enum InstitutionRole { + admin, + data_inserter +} diff --git a/src/main/resources/circuhub.zip b/src/main/resources/circuhub.zip Binary files differ. diff --git a/src/main/resources/css/header.css b/src/main/resources/css/header.css @@ -0,0 +1,54 @@ +header { + position: fixed; + z-index: 100; + width: 100%; + top: 0; + left: 0; + display: flex; + + justify-content: space-between; + background-color: #56d445; + color: white; + padding: 0 10px; + box-sizing: border-box; + border-bottom: 2px solid #31a73b; +} + +header h1 { + display: inline-block; + font-size: 17pt; +} + +header #subtitle { + color: #56d445; + background-color: white; + padding: 0 5px; + border-radius: 5px; + font-family: serif; + margin-left: 10px; +} + +header #links:before { + content: ""; + display: inline-block; + height: 100%; + vertical-align: middle; +} + +header #links a { + font-size: 15pt; +} + +header a { + margin: 0 10px; + text-decoration: none; + color: white; +} + +header a:active { + color: white; +} + +header #links #login { + font-weight: bold; +} +\ No newline at end of file diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css @@ -0,0 +1,147 @@ +body { + padding: 0; + margin: 0; +} + +main { + margin-top: 60px; + background-color: #fff; + min-height: calc(100vh - 60px); + justify-content: space-between; +} + +#sidebar { + position: fixed; + background-color: #bff3b8; + padding: 10px; + height: 100%; + width: 300px; + float: left; + border-right: 1px solid black; +} + +#sidebar tr { + margin: 0 5px; +} + +#sidebar #zipcode-view { + text-align: center; +} + +#results { + margin-left: 325px; + display: grid; + grid-template-columns: 50% 50%; + max-height: 200px; +} + +.substainable { + border: 2px solid green; +} + +.substainable p { + border: 2px solid green; + background: green; + color: white; +} + +.non-substainable { + border: 2px solid black; +} + +.non-substainable p { + border: 2px solid black; +} + +#results div { + padding: 10px; + margin: 20px; + border-radius: 5px; + text-align: center; + cursor: pointer; +} + +#results img { + width: 250px; +} + +#results span { + font-style: italic; + display: inline-block; +} + +#results p { + margin-top: 5px; + font-size: 15pt; +} + +#logo-preview { + background-color: white; + padding: 10px; + width: 70%; + border: 1px solid black; +} + +#resources { + margin-left: 325px; + padding-top: 10px; +} + +#resources .resource { + padding: 10px; + margin: 20px; + border: 2px solid black; + border-radius: 5px; + display: grid; + grid-template-columns: 30% 70%; +} + +#resources input[type=number], +#resources input[type=entry] { + background: inherit; + border: none; + border-bottom: 1px solid black; +} + +.resource-foto-frame { + border-top: 2px solid black; + grid-column: span 2; + display: flex; + overflow-x: auto; + padding-top: 5px; +} + +.resource-foto { + flex: 0 0 auto; + margin-right: 10px; +} + +.resource-foto img { + max-height: 200px; + width: auto; + max-width: 100%; + display: block; +} + +.resource-foto-empty { + flex: 0 0 auto; + display: flex; + align-items: center; + justify-content: center; + background-color: #ccc; + cursor: pointer; + padding: 10px; +} + +.resource-foto-empty:hover { + background-color: #ddd; +} + +.resource-foto-empty::before { + content: '+'; + font-size: 20px; +} + +.resource-owner { + width: 100%; +} +\ No newline at end of file diff --git a/src/main/resources/img/aa-en-hunze.png b/src/main/resources/img/aa-en-hunze.png Binary files differ. diff --git a/src/main/resources/img/assen.png b/src/main/resources/img/assen.png Binary files differ. diff --git a/src/main/resources/img/border-odoorn.png b/src/main/resources/img/border-odoorn.png Binary files differ. diff --git a/src/main/resources/img/border-odoorn.svg b/src/main/resources/img/border-odoorn.svg @@ -0,0 +1,25 @@ +<svg width="255" height="92" viewBox="0 0 255 92" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M27.5851 72.0151L33.5424 46.3696C10.2311 47.4058 0 51.2915 0 51.2915L17.872 91.3139C37.0391 80.8226 53.4865 75.1236 77.4454 72.6627C74.3372 71.756 71.229 70.8494 68.5094 69.9427C55.9472 66.9637 42.2194 67.2228 27.5851 72.0151Z" fill="#E9B718"/> +<path d="M97.9057 65.2788C92.3368 64.1131 87.6746 62.5588 83.6599 60.7455C89.3582 60.7455 95.5745 59.0617 102.05 54.658C98.5532 54.7875 94.1499 54.1399 89.4877 53.1037C88.9697 52.9742 88.5811 52.8446 88.0631 52.7151C87.9336 52.7151 87.9336 52.7151 87.8041 52.7151C88.7106 52.3266 97.7762 48.959 115.001 55.1761C115.001 55.1761 109.302 55.1761 104.77 58.4141C121.735 59.4503 128.858 51.5494 128.858 51.5494C128.21 52.3266 120.569 52.3266 114.483 49.8656C98.9417 43.6486 90.0057 49.0885 86.509 52.197C77.4435 49.7361 67.9895 45.8504 62.4207 43.0009C52.0601 37.82 44.5487 33.1572 30.8209 31.3439C24.475 30.5668 17.6111 30.5668 6.60303 32.5096C49.0814 33.0277 50.8945 64.5017 91.4303 74.4749C125.102 82.6348 142.715 63.4655 142.715 63.4655C142.715 63.4655 124.714 70.9778 97.9057 65.2788Z" fill="#522980"/> +<path d="M83.9208 10.1021C83.2732 10.1021 83.0142 10.3612 83.0142 11.2678L82.7552 14.5059C81.7191 14.8945 80.0355 15.1535 78.7405 15.1535C75.5028 15.1535 73.4307 13.0812 73.4307 9.97261C73.4307 8.02977 74.2077 6.21645 75.6323 5.05075C76.9274 3.88505 78.611 3.36696 81.0716 3.36696C81.2011 3.36696 81.5896 3.36696 82.2372 3.36696H82.4962C82.7552 3.36696 83.0142 3.23743 83.1437 3.10791H83.4027C83.2732 3.88505 83.1437 4.92123 83.1437 5.95741C83.1437 6.08693 83.1437 6.21645 83.1437 6.4755H82.2372C82.3667 6.21645 82.3667 5.95741 82.3667 5.69836C82.3667 5.43932 82.2372 5.18027 82.2372 5.05075C81.9781 4.7917 80.9421 4.53266 79.906 4.53266C77.1864 4.53266 75.3733 6.60502 75.3733 9.71356C75.3733 12.5631 76.9274 14.3764 79.388 14.3764C80.0355 14.3764 80.8126 14.2469 81.3306 14.1173C81.3306 13.9878 81.3306 13.8583 81.3306 13.7288C81.3306 13.4697 81.3306 12.8221 81.4601 11.9154L81.5896 11.0088V10.8793C81.5896 10.7497 81.5896 10.7497 81.4601 10.7497C81.4601 10.7497 81.3306 10.7497 80.9421 10.6202H80.2946H79.7765H79.388L79.906 9.84309C80.5536 9.84309 80.8126 9.84309 81.2011 9.84309C81.5896 9.84309 81.7191 9.84309 82.7552 9.84309C83.5322 9.84309 83.6617 9.84309 84.1798 9.71356L83.9208 10.1021Z" fill="#E9B718"/> +<path d="M86.8998 10.4912C87.1588 8.67785 87.9359 7.25311 88.5834 7.25311C88.8424 7.25311 89.1014 7.51215 89.1014 7.90072C89.1014 8.9369 88.1949 9.97308 86.8998 10.4912ZM90.9145 12.6931C90.526 13.0816 90.267 13.2111 90.008 13.4702C89.6194 13.7292 89.1014 13.8588 88.7129 13.8588C87.6768 13.8588 86.8998 12.6931 86.8998 11.1388V11.0093C87.9358 10.6207 88.5834 10.2321 89.1014 9.71403C90.008 8.9369 90.526 8.15976 90.526 7.38263C90.526 6.60549 90.008 6.0874 89.3604 6.0874C87.2883 6.0874 85.3457 8.80738 85.3457 11.7864C85.3457 13.8588 86.2523 15.0245 87.8063 15.0245C88.8424 15.0245 90.008 14.5064 90.526 13.8588C90.6555 13.5997 90.785 13.2111 90.9145 12.6931Z" fill="#E9B718"/> +<path d="M92.0808 7.51153C92.4693 7.12297 92.5988 6.99344 93.1169 6.7344C93.7644 6.34583 94.1529 6.21631 94.4119 6.21631C94.6709 6.21631 94.8004 6.47535 94.8004 6.86392C94.8004 7.25249 94.6709 8.41819 94.4119 9.58389H94.5414C95.0595 8.41819 95.3185 7.9001 96.0955 7.25249C96.7431 6.60488 97.5201 6.21631 98.0381 6.21631C98.5562 6.21631 98.9447 6.60488 98.9447 7.51153C98.9447 8.02962 98.8152 8.67724 98.6857 9.58389H98.8152C99.2037 8.67724 99.5922 8.02962 100.11 7.51153C100.758 6.86392 101.664 6.34583 102.182 6.34583C102.83 6.34583 103.218 6.7344 103.218 7.64106C103.218 7.77058 103.218 8.02962 103.218 8.28867L103.089 9.58389L102.959 11.2677C102.83 11.9153 102.83 12.4334 102.83 12.822C102.83 13.4696 102.959 13.7286 103.348 13.7286C103.736 13.7286 103.995 13.5991 104.643 12.9515C104.514 13.34 104.384 13.4696 104.254 13.7286C103.736 14.2467 102.83 14.8943 102.182 14.8943C101.405 14.8943 101.017 14.3762 101.017 13.2105C101.017 12.6924 101.017 12.1743 101.146 11.3972L101.405 9.58389C101.535 9.0658 101.535 8.54771 101.535 8.41819C101.535 7.9001 101.405 7.77058 101.146 7.77058C100.758 7.77058 100.24 8.15915 99.7217 8.67724C99.4627 9.0658 99.0742 9.58389 98.9447 9.97246C98.8152 10.361 98.8152 10.4906 98.6857 11.9153L98.5562 13.5991C98.5562 13.8581 98.5562 14.1172 98.5562 14.2467C98.5562 14.5057 98.5562 14.6353 98.8152 14.7648L96.8726 15.1534C97.0021 15.0238 97.0021 14.7648 97.0021 14.5057L97.3906 8.80676V8.54771C97.3906 7.9001 97.2611 7.64106 97.0021 7.64106C96.6136 7.64106 95.966 8.15915 95.448 8.80676C95.189 9.19533 94.9299 9.71342 94.8004 10.2315C94.6709 10.4906 94.6709 11.0086 94.5414 11.7858L94.4119 13.8581C94.4119 13.9877 94.4119 13.9877 94.4119 14.1172C94.4119 14.5058 94.5414 14.6353 94.6709 14.7648L92.5988 15.0238C92.5988 14.8943 92.7283 14.8943 92.7283 14.8943C92.7283 14.7648 92.8578 14.3762 92.8578 13.5991L93.1169 8.80676C93.1169 8.41819 93.1169 8.02962 93.1169 7.9001C93.1169 7.64106 92.9873 7.64106 92.8578 7.64106C92.7283 7.64106 92.7283 7.64106 92.5988 7.77058C92.2103 8.02962 92.0808 8.15915 91.8218 8.41819L92.0808 7.51153Z" fill="#E9B718"/> +<path d="M110.73 13.8588C110.212 14.5064 109.046 15.0245 108.01 15.0245C106.456 15.0245 105.55 13.8588 105.55 11.7864C105.55 8.80738 107.492 6.0874 109.565 6.0874C110.342 6.0874 110.73 6.60549 110.73 7.38263C110.73 8.15976 110.212 9.06642 109.306 9.71403C108.787 10.1026 108.01 10.4912 107.104 11.0093V11.1388C107.104 12.6931 107.881 13.8588 108.917 13.8588C109.306 13.8588 109.694 13.7292 110.212 13.4702C110.601 13.2111 110.73 13.0816 111.119 12.6931C110.989 13.2111 110.86 13.5997 110.73 13.8588ZM109.176 7.90072C109.176 7.51215 109.046 7.25311 108.658 7.25311C107.881 7.25311 107.233 8.67785 106.974 10.4912C108.399 9.97308 109.176 8.9369 109.176 7.90072Z" fill="#E9B718"/> +<path d="M113.838 10.4912C114.097 8.67785 114.874 7.25311 115.522 7.25311C115.781 7.25311 116.04 7.51215 116.04 7.90072C116.04 8.9369 115.133 9.97308 113.838 10.4912ZM117.982 12.6931C117.594 13.0816 117.335 13.2111 117.076 13.4702C116.687 13.7292 116.169 13.8588 115.781 13.8588C114.745 13.8588 113.968 12.6931 113.968 11.1388V11.0093C115.004 10.6207 115.651 10.2321 116.169 9.71403C117.076 8.9369 117.594 8.15976 117.594 7.38263C117.594 6.60549 117.076 6.0874 116.428 6.0874C114.356 6.0874 112.414 8.80738 112.414 11.7864C112.414 13.8588 113.32 15.0245 114.874 15.0245C115.91 15.0245 117.076 14.5064 117.594 13.8588C117.723 13.5997 117.853 13.2111 117.982 12.6931Z" fill="#E9B718"/> +<path d="M119.017 7.38263C119.276 7.12358 119.406 6.99406 119.924 6.73501C120.571 6.34645 121.089 6.0874 121.348 6.0874C121.607 6.0874 121.737 6.34645 121.737 6.73501C121.737 6.99406 121.607 7.64167 121.478 8.67785L121.348 9.45499H121.478C121.737 8.80737 121.996 8.41881 122.384 7.90072C123.161 6.86454 124.068 6.21692 124.974 6.21692C125.751 6.21692 126.01 6.60549 126.01 7.64167C126.01 8.03024 126.01 8.54833 125.881 9.71403L125.622 11.3978C125.492 12.0454 125.492 12.5635 125.492 12.8226C125.492 13.4702 125.622 13.7292 126.01 13.7292C126.01 13.7292 126.14 13.7292 126.27 13.7292C126.529 13.5997 126.788 13.4702 127.306 13.0816L127.565 12.9521C127.435 13.4702 127.306 13.5997 127.176 13.7292C126.529 14.3768 125.622 14.8949 125.104 14.8949C124.456 14.8949 124.068 14.2473 124.068 13.3407C124.068 13.0816 124.068 12.8226 124.197 11.6569L124.456 9.45499C124.456 9.06642 124.586 8.80738 124.586 8.54833C124.586 7.7712 124.456 7.51215 124.068 7.51215C123.809 7.51215 123.291 7.77119 122.902 8.15976C122.514 8.67785 122.125 9.32546 121.866 9.97308C121.737 10.3616 121.737 10.7502 121.607 11.6569L121.478 13.8588V13.9883C121.478 14.3768 121.478 14.5064 121.737 14.6359L119.794 15.0245C119.924 14.7654 119.924 14.6359 119.924 14.2473L120.312 8.15976C120.312 8.03024 120.312 7.90072 120.312 7.77119C120.312 7.64167 120.183 7.51215 120.183 7.51215C119.924 7.51215 119.406 7.7712 119.017 8.28929V7.38263Z" fill="#E9B718"/> +<path d="M128.084 7.38281C129.12 6.60567 129.379 6.34662 129.897 5.95806C130.415 5.56949 130.545 5.31044 131.063 4.92188H131.322C131.192 5.18092 131.192 5.18092 131.192 5.43997C131.063 5.82853 131.063 6.08758 130.933 6.60567H131.322C132.876 6.60567 133.264 6.60567 133.523 6.34662C133.135 7.3828 132.617 7.64185 131.581 7.64185C131.322 7.64185 131.322 7.64185 130.804 7.64185C130.804 8.15994 130.674 8.54851 130.674 8.80755C130.545 10.1028 130.415 11.398 130.415 12.0456C130.415 13.2113 130.674 13.7294 131.322 13.7294C131.84 13.7294 132.487 13.4704 133.135 12.9523C133.005 13.4704 132.876 13.5999 132.746 13.7294C132.617 13.8589 132.487 13.9885 132.099 14.2475C131.451 14.6361 130.933 14.8951 130.415 14.8951C129.379 14.8951 128.861 14.118 128.861 12.6932C128.861 12.4342 128.861 11.6571 128.991 11.139C129.12 9.58469 129.12 9.0666 129.379 7.51233H127.955L128.084 7.38281Z" fill="#E9B718"/> +<path d="M135.722 10.4912C135.981 8.67785 136.758 7.25311 137.406 7.25311C137.665 7.25311 137.924 7.51215 137.924 7.90072C137.924 8.9369 137.017 9.97308 135.722 10.4912ZM139.866 12.6931C139.478 13.0816 139.219 13.2111 138.96 13.4702C138.571 13.7292 138.053 13.8588 137.665 13.8588C136.629 13.8588 135.852 12.6931 135.852 11.1388V11.0093C136.888 10.6207 137.535 10.2321 138.053 9.71403C138.96 8.9369 139.478 8.15976 139.478 7.38263C139.478 6.60549 138.96 6.0874 138.312 6.0874C136.24 6.0874 134.298 8.80738 134.298 11.7864C134.298 13.8588 135.204 15.0245 136.758 15.0245C137.794 15.0245 138.96 14.5064 139.478 13.8588C139.607 13.5997 139.737 13.2111 139.866 12.6931Z" fill="#E9B718"/> +<path d="M149.841 8.28882L150.1 4.01457C151.783 4.14409 152.819 4.92123 152.819 6.21645C152.819 7.51168 151.913 8.28882 150.488 8.28882C150.1 8.28882 150.1 8.28882 149.841 8.28882ZM146.603 14.8945C146.992 14.7649 147.251 14.7649 147.769 14.7649C147.898 14.7649 148.028 14.7649 148.287 14.7649C148.675 14.7649 149.064 14.7649 149.323 14.7649L150.229 14.8945C150.488 14.8945 150.877 14.8945 151.006 14.8945C152.042 14.8945 152.56 14.7649 153.337 14.3764C153.726 14.1173 154.114 13.8583 154.373 13.5992C154.891 13.0812 155.28 12.1745 155.28 11.3974C155.28 10.1021 154.503 9.06595 153.208 8.67738C152.819 8.54786 152.56 8.54786 151.913 8.41834V8.54786L152.172 8.41834C152.949 8.15929 153.208 8.02977 153.596 7.77072C154.114 7.25263 154.503 6.60502 154.503 5.82789C154.503 4.7917 153.855 3.88505 152.949 3.49648C152.172 3.23743 151.395 3.10791 150.1 3.10791C149.193 3.10791 147.898 3.23743 147.251 3.23743C146.992 3.23743 146.862 3.36696 146.733 3.49648C146.603 3.626 146.474 3.88505 146.344 4.14409C146.733 4.01457 147.38 3.88505 148.028 3.88505C148.157 3.88505 148.287 3.88505 148.546 3.88505L148.157 11.7859C148.157 12.4335 148.028 13.0812 148.028 13.4697C148.028 13.5992 147.898 13.7288 147.898 13.7288C147.769 13.9878 147.51 14.1173 147.251 14.1173H147.121L146.603 14.8945ZM149.711 9.06595C151.913 9.19547 153.337 10.3612 153.337 12.045C153.337 13.3402 152.56 13.9878 151.136 13.9878C150.359 13.9878 149.711 13.8583 149.582 13.7288C149.452 13.7288 149.452 13.5992 149.452 13.4697V13.3402L149.711 9.06595Z" fill="#522980"/> +<path d="M161.494 10.3616C161.494 12.434 160.976 13.7292 159.94 13.7292C159.033 13.7292 158.515 12.5635 158.515 10.7502C158.515 8.67785 159.163 7.25311 160.069 7.25311C161.106 7.25311 161.494 8.41881 161.494 10.3616ZM163.178 9.45499C163.178 7.38263 162.271 6.0874 160.976 6.0874C158.904 6.0874 157.091 8.67785 157.091 11.6569C157.091 13.7292 157.997 15.0245 159.422 15.0245C161.494 15.0245 163.178 12.434 163.178 9.45499Z" fill="#522980"/> +<path d="M165.639 15.0238C165.639 14.7648 165.639 14.7648 165.769 14.3762L166.157 7.9001V7.77058C166.157 7.51153 166.028 7.51153 165.898 7.51153C165.639 7.51153 165.121 7.77058 164.733 8.15915C164.862 7.77058 164.862 7.64106 164.862 7.64106C164.862 7.51153 164.992 7.38201 165.121 7.38201C165.38 7.25249 165.769 6.99344 166.287 6.60488C166.676 6.34583 167.064 6.21631 167.323 6.21631C167.582 6.21631 167.712 6.34583 167.712 6.7344C167.712 6.99344 167.582 7.64106 167.453 8.54771C167.453 8.93628 167.323 9.45437 167.194 10.2315H167.323C167.582 9.0658 167.712 8.67723 168.1 8.02962C168.618 7.12297 169.525 6.34583 170.043 6.34583C170.302 6.34583 170.431 6.47535 170.431 6.60488C170.431 6.86392 170.172 7.38201 169.913 7.77058C169.784 8.02962 169.525 8.15915 169.395 8.28867C169.266 8.28867 169.266 8.28867 169.007 8.28867H168.877C168.1 8.28867 167.453 9.71341 167.323 11.9153L167.194 13.8581V13.9877C167.194 14.3762 167.194 14.5057 167.323 14.6353L165.639 15.0238Z" fill="#522980"/> +<path d="M176.001 7.38263C175.871 7.64167 175.871 7.64167 175.871 7.90072C175.742 8.15976 175.742 8.41881 175.742 8.67785C175.742 8.80737 175.742 9.06642 175.612 9.58451V10.1026C175.483 10.6207 175.483 11.2683 175.353 11.5273C175.224 11.9159 174.835 12.3045 174.447 12.5635C174.317 12.693 174.188 12.6931 174.058 12.6931C173.281 12.6931 172.763 11.6569 172.763 10.3616C172.763 8.54833 173.67 7.38263 175.224 7.38263C175.483 7.2531 175.612 7.2531 176.001 7.38263ZM173.411 13.7292H173.281L172.763 13.8588C171.597 14.3768 170.95 14.6359 170.432 15.0245C170.043 15.2835 169.784 15.5425 169.655 15.8016C169.396 16.1902 169.266 16.7082 169.266 17.0968C169.266 18.6511 171.079 19.9463 173.411 19.9463C175.742 19.9463 177.296 18.2625 177.296 15.9311C177.296 15.6721 177.296 15.154 177.166 14.7654V14.1178C177.166 13.9883 177.166 13.5997 177.037 13.0816C177.037 12.434 177.037 12.0454 177.037 11.7864C177.037 9.97308 177.296 7.51215 177.684 6.60549C177.814 6.34645 177.943 6.21692 178.202 6.0874H177.943H177.425H176.778H176.648C175.224 6.0874 174.188 6.34645 173.281 6.99406C172.116 7.90072 171.338 9.32546 171.338 11.0093C171.338 12.5635 171.986 13.5997 172.893 13.5997C173.022 13.7292 173.152 13.5997 173.411 13.7292ZM175.612 11.5273C175.612 12.175 175.483 12.5635 175.483 12.9521C175.483 13.2111 175.483 13.4702 175.483 13.5997C175.483 13.9883 175.483 14.3768 175.612 14.7654L175.742 15.413C175.871 15.9311 175.871 16.3197 175.871 16.5787C175.871 16.7082 175.871 16.9673 175.871 17.0968C175.871 18.2625 175.224 19.0397 174.058 19.0397C172.893 19.0397 171.468 18.2625 170.95 17.3559C170.82 17.0968 170.691 16.8378 170.691 16.5787C170.691 16.1902 170.82 15.8016 171.209 15.413C171.597 15.0245 171.727 14.8949 172.634 14.5064L173.281 14.1178C174.317 13.5997 174.706 13.2111 175.224 12.6931C175.353 12.3045 175.483 12.0454 175.612 11.5273Z" fill="#522980"/> +<path d="M181.181 10.4912C181.44 8.67785 182.217 7.25311 182.865 7.25311C183.124 7.25311 183.383 7.51215 183.383 7.90072C183.383 8.9369 182.605 9.97308 181.181 10.4912ZM185.325 12.6931C184.937 13.0816 184.678 13.2111 184.419 13.4702C184.03 13.7292 183.512 13.8588 183.124 13.8588C182.087 13.8588 181.31 12.6931 181.31 11.1388V11.0093C182.346 10.6207 182.994 10.2321 183.512 9.71403C184.419 8.9369 184.937 8.15976 184.937 7.38263C184.937 6.60549 184.419 6.0874 183.771 6.0874C181.699 6.0874 179.756 8.80738 179.756 11.7864C179.756 13.8588 180.533 15.0245 182.217 15.0245C183.253 15.0245 184.419 14.5064 184.937 13.8588C185.066 13.5997 185.196 13.2111 185.325 12.6931Z" fill="#522980"/> +<path d="M187.139 15.0238C187.139 14.7648 187.139 14.7648 187.268 14.3762L187.657 7.9001V7.77058C187.657 7.51153 187.527 7.51153 187.398 7.51153C187.139 7.51153 186.621 7.77058 186.232 8.15915C186.362 7.77058 186.362 7.64106 186.362 7.64106C186.362 7.51153 186.491 7.38201 186.621 7.38201C186.88 7.25249 187.268 6.99344 187.786 6.60488C188.175 6.34583 188.563 6.21631 188.822 6.21631C189.081 6.21631 189.211 6.34583 189.211 6.7344C189.211 6.99344 189.081 7.64106 188.952 8.54771C188.952 8.93628 188.822 9.45437 188.693 10.2315H188.822C189.081 9.0658 189.211 8.67723 189.599 8.02962C190.117 7.12297 191.024 6.34583 191.542 6.34583C191.801 6.34583 191.93 6.47535 191.93 6.60488C191.93 6.86392 191.671 7.38201 191.412 7.77058C191.283 8.02962 191.024 8.15915 190.894 8.28867C190.765 8.28867 190.765 8.28867 190.506 8.28867H190.376C189.599 8.28867 188.952 9.71341 188.822 11.9153L188.693 13.8581V13.9877C188.693 14.3762 188.693 14.5057 188.822 14.6353L187.139 15.0238Z" fill="#522980"/> +<path d="M193.612 9.84449C194.13 9.84449 194.389 9.84449 194.648 9.84449H196.591H197.497H198.145H198.792C199.051 9.84449 199.44 9.84449 199.958 9.71497C200.476 9.71497 200.606 9.71497 200.865 9.58545C200.476 10.2331 200.347 10.4921 200.088 10.6216C199.958 10.7511 199.569 10.8807 199.31 10.8807C199.051 10.8807 198.663 10.8807 198.145 10.8807H198.015H196.85H195.814C193.871 10.8807 193.612 10.8807 193.224 11.0102L193.612 9.84449Z" fill="#522980"/> +<path d="M212.651 8.93655C212.651 11.786 210.967 13.9879 208.765 13.9879C206.564 13.9879 204.88 11.9156 204.88 9.1956C204.88 6.3461 206.564 4.27374 208.765 4.27374C210.967 4.14422 212.651 6.21658 212.651 8.93655ZM214.464 8.28894C214.464 5.30992 212.392 2.97852 209.413 2.97852C205.787 2.97852 202.938 5.95753 202.938 9.84321C202.938 12.9518 205.01 15.1536 207.988 15.1536C211.615 15.1536 214.464 12.1746 214.464 8.28894Z" fill="#522980"/> +<path d="M220.94 7.25327C220.94 7.77136 220.81 8.0304 220.81 8.41897L220.681 9.97324C220.681 10.6209 220.551 11.0094 220.551 11.398C220.422 11.9161 220.033 12.5637 219.645 12.9523C219.386 13.3408 219.126 13.4703 218.738 13.4703C218.09 13.4703 217.702 12.5637 217.702 11.0094C217.702 9.32563 218.09 7.90088 218.738 7.38279C218.997 7.12374 219.386 7.12374 220.033 7.12374C220.163 7.12374 220.422 7.12374 220.551 7.12374L220.94 7.25327ZM219.645 1.55427C220.033 1.42475 220.292 1.42475 220.681 1.42475C221.069 1.42475 221.199 1.42475 221.199 1.81332V1.94284L220.94 6.21708H220.81C220.422 6.21708 219.774 6.34661 219.386 6.34661C218.997 6.47613 218.608 6.60565 218.349 6.73517C217.054 7.64183 216.277 9.58467 216.277 11.9161C216.277 13.7294 216.925 14.8951 217.961 14.8951C219.127 14.8951 220.422 13.5999 220.81 11.9161H220.94V12.0456C220.94 12.4342 220.81 12.6932 220.81 13.0818C220.81 14.377 221.069 15.0246 221.846 15.0246C222.364 15.0246 223.012 14.6361 223.659 13.9884C223.789 13.8589 223.918 13.7294 224.048 13.4703C224.048 13.3408 224.177 13.2113 224.177 13.0818C223.53 13.5999 223.141 13.7294 222.882 13.7294C222.494 13.7294 222.235 12.9523 222.235 11.2685C222.235 10.1028 222.364 9.1961 222.494 5.69899C222.753 2.46093 222.753 1.42475 222.882 0.777135C223.012 0.388568 223.012 0.259045 223.141 0C222.623 0.129523 222.494 0.259045 221.976 0.388568C221.328 0.51809 221.199 0.647613 220.292 0.777135H219.904L219.645 1.55427Z" fill="#522980"/> +<path d="M229.358 10.3616C229.358 12.434 228.84 13.7292 227.804 13.7292C226.897 13.7292 226.379 12.5635 226.379 10.7502C226.379 8.67785 227.026 7.25311 228.063 7.25311C228.969 7.25311 229.358 8.41881 229.358 10.3616ZM231.041 9.45499C231.041 7.38263 230.135 6.0874 228.84 6.0874C226.767 6.0874 224.954 8.67785 224.954 11.6569C224.954 13.7292 225.861 15.0245 227.285 15.0245C229.358 15.0245 231.041 12.434 231.041 9.45499Z" fill="#522980"/> +<path d="M237.386 10.3616C237.386 12.434 236.868 13.7292 235.832 13.7292C234.926 13.7292 234.408 12.5635 234.408 10.7502C234.408 8.67785 235.055 7.25311 235.962 7.25311C236.868 7.25311 237.386 8.41881 237.386 10.3616ZM239.07 9.45499C239.07 7.38263 238.163 6.0874 236.868 6.0874C234.796 6.0874 232.983 8.67785 232.983 11.6569C232.983 13.7292 233.89 15.0245 235.314 15.0245C237.257 15.0245 239.07 12.434 239.07 9.45499Z" fill="#522980"/> +<path d="M241.402 15.0238C241.402 14.7648 241.402 14.7648 241.532 14.3762L241.92 7.9001V7.77058C241.92 7.51153 241.791 7.51153 241.661 7.51153C241.402 7.51153 240.884 7.77058 240.496 8.15915C240.625 7.77058 240.625 7.64106 240.625 7.64106C240.625 7.51153 240.755 7.38201 240.884 7.38201C241.143 7.25249 241.532 6.99344 242.05 6.60488C242.438 6.34583 242.827 6.21631 243.086 6.21631C243.345 6.21631 243.474 6.34583 243.474 6.7344C243.474 6.99344 243.345 7.64106 243.215 8.54771C243.215 8.93628 243.086 9.45437 242.956 10.2315H243.086C243.345 9.0658 243.474 8.67723 243.863 8.02962C244.381 7.12297 245.287 6.34583 245.805 6.34583C246.064 6.34583 246.194 6.47535 246.194 6.60488C246.194 6.86392 245.935 7.38201 245.676 7.77058C245.546 8.02962 245.287 8.15915 245.158 8.28867C245.028 8.28867 245.028 8.28867 244.769 8.28867H244.64C243.863 8.28867 243.215 9.71341 243.086 11.9153L242.956 13.8581V13.9877C242.956 14.3762 242.956 14.5057 243.086 14.6353L241.402 15.0238Z" fill="#522980"/> +<path d="M246.712 7.38263C246.971 7.12358 247.1 6.99406 247.618 6.73501C248.266 6.34645 248.784 6.0874 249.043 6.0874C249.302 6.0874 249.431 6.34645 249.431 6.73501C249.431 6.99406 249.302 7.64167 249.172 8.67785L249.043 9.45499H249.172C249.431 8.67785 249.69 8.28929 250.079 7.90072C250.856 6.86454 251.762 6.34645 252.539 6.34645C253.316 6.34645 253.575 6.73501 253.575 7.77119C253.575 8.15976 253.575 8.67785 253.446 9.84356L253.316 11.5273C253.187 12.175 253.187 12.6931 253.187 12.9521C253.187 13.5997 253.316 13.8588 253.705 13.8588H253.834C254.093 13.7292 254.352 13.5997 254.87 13.2111L255 13.0816C254.87 13.5997 254.87 13.7292 254.611 13.8588C253.964 14.5064 253.057 15.0245 252.539 15.0245C251.892 15.0245 251.374 14.3768 251.374 13.4702C251.374 13.2111 251.374 12.9521 251.503 11.7864L251.762 9.58451C251.762 9.19594 251.892 8.9369 251.892 8.67785C251.892 7.90072 251.762 7.64167 251.374 7.64167C251.115 7.64167 250.597 7.90072 250.208 8.28929C249.82 8.80738 249.431 9.45499 249.172 10.1026C249.043 10.4912 249.043 10.8797 248.913 11.7864L248.784 13.9883C248.784 14.3768 248.784 14.5064 249.043 14.6359L247.1 15.0245C247.23 14.7654 247.23 14.6359 247.23 14.2473L247.618 8.15976C247.618 8.03024 247.618 7.90072 247.618 7.77119C247.618 7.64167 247.489 7.51215 247.489 7.51215C247.23 7.51215 246.712 7.7712 246.323 8.28929L246.712 7.38263Z" fill="#522980"/> +</svg> diff --git a/src/main/resources/img/coevorden.png b/src/main/resources/img/coevorden.png Binary files differ. diff --git a/src/main/resources/img/de-wolden.png b/src/main/resources/img/de-wolden.png Binary files differ. diff --git a/src/main/resources/img/eemsdelta.png b/src/main/resources/img/eemsdelta.png Binary files differ. diff --git a/src/main/resources/img/emmen.png b/src/main/resources/img/emmen.png Binary files differ. diff --git a/src/main/resources/img/gft1.jpg b/src/main/resources/img/gft1.jpg Binary files differ. diff --git a/src/main/resources/img/gft2.jpg b/src/main/resources/img/gft2.jpg Binary files differ. diff --git a/src/main/resources/img/groningen.png b/src/main/resources/img/groningen.png Binary files differ. diff --git a/src/main/resources/img/het-hogeland.png b/src/main/resources/img/het-hogeland.png Binary files differ. diff --git a/src/main/resources/img/meppel.png b/src/main/resources/img/meppel.png Binary files differ. diff --git a/src/main/resources/img/midden-drenthe.png b/src/main/resources/img/midden-drenthe.png Binary files differ. diff --git a/src/main/resources/img/midden-groningen.png b/src/main/resources/img/midden-groningen.png Binary files differ. diff --git a/src/main/resources/img/noordenveld.png b/src/main/resources/img/noordenveld.png Binary files differ. diff --git a/src/main/resources/img/oldambt.png b/src/main/resources/img/oldambt.png Binary files differ. diff --git a/src/main/resources/img/pekela.png b/src/main/resources/img/pekela.png Binary files differ. diff --git a/src/main/resources/img/stadskanaal.png b/src/main/resources/img/stadskanaal.png Binary files differ. diff --git a/src/main/resources/img/tynaarlo.png b/src/main/resources/img/tynaarlo.png Binary files differ. diff --git a/src/main/resources/img/veendam.png b/src/main/resources/img/veendam.png Binary files differ. diff --git a/src/main/resources/img/westerkwartier.png b/src/main/resources/img/westerkwartier.png Binary files differ. diff --git a/src/main/resources/img/westerveld.png b/src/main/resources/img/westerveld.png Binary files differ. diff --git a/src/main/resources/img/westerwolde.png b/src/main/resources/img/westerwolde.png Binary files differ. diff --git a/src/main/resources/index.html b/src/main/resources/index.html @@ -0,0 +1,151 @@ +<!doctype html> +<html lang="en"> + +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + <meta name="description" content=""> + <meta name="author" content=""> + <link rel="icon" href="img/favicon.ico"> + + <title>circu_hub</title> + + <link href="css/style.css" rel="stylesheet"> + <link href="css/header.css" rel="stylesheet"> +</head> + +<body> + <header> + <a href="index.html"> + <h1 id="title">CIRCU-HUB <span id="subtitle">nederland</span></h1> + </a> + <!-- spacing --> + <span id="links"> + <a href="#">Grondstoffenaanbod</a> + <a href="#">Over CIRCU-HUB</a> + <a href="#">Contact</a> + <a href="preferences.html" id="login">Inloggen</a> + </span> + </header> + <main> + <div id="sidebar"> + <table> + <form> + <tr> + <td colspan="2"> + <h2>Zoeken:</h2> + </td> + </tr> + <tr> + <td>Grondstof:</td> + <td><input type="entry" id="resource" /></td> + </tr> + <tr> + <td>Provincie:</td> + <td><select id="province"> + <option>-- selecteer iets --</option> + <option>Drenthe</option> + <option>Flevoland</option> + <option>Friesland</option> + <option>Gelderland</option> + <option>Groningen</option> + <option>Limburg</option> + <option>Noord-Brabant</option> + <option>Noord-Holland</option> + <option>Overijsel</option> + <option>Utrecht</option> + <option>Zeeland</option> + <option>Zuid-Holland</option> + </select></td> + </tr> + <tr> + <td>Postcode:</td> + <td><input type="entry" id="zipcode" /></td> + </tr> + <tr> + <td>Afstand tot</td> + <td><input type="range" id="zipcode-range" min="0" max="100" value="25" /></td> + </tr> + <tr> + <td></td> + <td><span id="zipcode-view">25km</span></td> + </tr> + <tr> + <td>Duurzaam?</td> + <td><input type="checkbox" id="is-sustainable" /></td> + </tr> + <tr> + <td>Is Pilot?</td> + <td><input type="checkbox" id="is-pilot" /></td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Zoeken" /></td> + </tr> + </form> + </table> + </div> + <div id="results"> + </div> + </main> + + <script type="text/javascript"> + const muncipalities = [ + "aa-en-hunze.png", + "assen.png", + "border-odoorn.png", + "coevorden.png", + "de-wolden.png", + "eemsdelta.png", + "emmen.png", + "groningen.png", + "het-hogeland.png", + "meppel.png", + "midden-drenthe.png", + "midden-groningen.png", + "noordenveld.png", + "oldambt.png", + "pekela.png", + "stadskanaal.png", + "tynaarlo.png", + "veendam.png", + "westerkwartier.png", + "westerveld.png", + "westerwolde.png", + ]; + + const resources = [ + { type: "Groente-Fruit-Tuin", category: "Natuurafval" }, + { type: "Plasic-Metaal-Drankverpakkingen", category: "Productiematerieel" }, + { type: "Papier", category: "Productiematerieel" }, + { type: "Klein Chemisch Afval", category: "Chemisch Afval" }, + { type: "Textiel", category: "Textiel" }, + { type: "Wit- en Bruingoed", category: "Electronica" }, + { type: "Restafval", category: "Restafval" }, + { type: "Gips", category: "Bouw- en Sloop" }, + { type: "Piepschuim", category: "Bouw- en Sloop" }, + ]; + + let resultElement = document.getElementById("results"); + + for (let img of muncipalities) { + let type = Math.floor(Math.random() * resources.length); + let html = `<div onclick='window.location.href="portfolio.html"' class="resource ${Math.random() > 0.7 ? 'substainable' : 'non-substainable'}">\n`; + if (resources[type].category != resources[type].type) + html += `<span>${resources[type].category} →</span>\n`; + else + html += '<span></span>' + html += `<p>${resources[type].type}</p><img src="img/${img}" />\n`; + html += `</div>\n`; + + resultElement.innerHTML += html; + } + + document.querySelector("#zipcode-range").addEventListener("input", (e) => { + let val = e.target.value; + document.querySelector("#zipcode-view").innerHTML = val + "km"; + }); + </script> +</body> + +</html> +\ No newline at end of file diff --git a/src/main/resources/portfolio.html b/src/main/resources/portfolio.html @@ -0,0 +1,126 @@ +<!doctype html> +<html lang="nl"> + +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + <meta name="description" content=""> + <meta name="author" content=""> + <link rel="icon" href="img/favicon.ico"> + + <title>circu_hub</title> + + <link href="css/style.css" rel="stylesheet"> + <link href="css/header.css" rel="stylesheet"> +</head> + +<body> + <header> + <a href="index.html"> + <h1 id="title">CIRCU-HUB <span id="subtitle">nederland</span></h1> + </a> + <!-- spacing --> + <span id="links"> + <a href="#">Grondstoffenaanbod</a> + <a href="#">Over CIRCU-HUB</a> + <a href="#">Contact</a> + <a href="preferences.html" id="login">Inloggen</a> + </span> + </header> + <main> + <div id="sidebar"> + <table> + <form> + <tr> + <td colspan="2"> + <h2>Portfolio:</h2> + </td> + </tr> + <tr> + <td>Naam:</td> + <td>Gemeente Assen</td> + </tr> + <tr> + <td colspan="2"><img id="logo-preview" src="img/assen.png" /></td> + </tr> + <tr> + <td>Address:</td> + <td>Van Doornestraat 11</td> + </tr> + <tr> + <td>Postcode:</td> + <td>9403AN Assen</td> + </tr> + </form> + </table> + </div> + <div id="resources"> + <div class="resource"> + <h1>Groente-Fruit-Tuin</h1> + <table> + <tr> + <td>Hoeveelheid:</td> + <td>124ton</td> + </tr> + <tr> + <td>Vervuiling:</td> + <td>12%</td> + </tr> + <tr> + <td>Inzamelmethode:</td> + <td> + <input type="checkbox" id="huis-aan-huis" disabled checked /> + <label for="huis-aan-huis">Huis-aan-Huis</label><br> + <input type="checkbox" id="wijkcontainer" disabled /> + <label for="wijkcontainer">Wijkcontainer</label><br> + <input type="checkbox" id="milieustraat" disabled checked /> + <label for="milieustraat">Milieustraat</label> + </td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Bewerken" /></td> + </tr> + </table> + <div>Voorbeelden van het afvalstroom:</div> + <div class="resource-foto-frame"> + <div class="resource-foto"> + <img src="img/gft1.jpg" alt="Image 1"> + </div> + <div class="resource-foto"> + <img src="img/gft2.jpg" alt="Image 2"> + </div> + </div> + </div> + <div class="resource"> + <h1>Piepschuim</h1> + <table> + <tr> + <td>Hoeveelheid:</td> + <td>53ton</td> + </tr> + <tr> + <td>Vervuiling:</td> + <td>3%</td> + </tr> + <tr> + <td>Inzamelmethode:</td> + <td> + <input type="checkbox" id="huis-aan-huis" disabled /> + <label for="huis-aan-huis">Huis-aan-Huis</label><br> + <input type="checkbox" id="wijkcontainer" disabled /> + <label for="wijkcontainer">Wijkcontainer</label><br> + <input type="checkbox" id="milieustraat" disabled checked /> + <label for="milieustraat">Milieustraat</label> + </td> + </tr> + </table> + <div>Voorbeelden van het afvalstroom:</div> + <div class="resource-foto-frame"> + </div> + </div> + </div> + </main> +</body> + +</html> +\ No newline at end of file diff --git a/src/main/resources/preferences.html b/src/main/resources/preferences.html @@ -0,0 +1,176 @@ +<!doctype html> +<html lang="nl"> + +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + <meta name="description" content=""> + <meta name="author" content=""> + <link rel="icon" href="img/favicon.ico"> + + <title>circu_hub</title> + + <link href="css/style.css" rel="stylesheet"> + <link href="css/header.css" rel="stylesheet"> +</head> + +<body> + <header> + <a href="index.html"> + <h1 id="title">CIRCU-HUB <span id="subtitle">nederland</span></h1> + </a> + <!-- spacing --> + <span id="links"> + <a href="#">Grondstoffenaanbod</a> + <a href="#">Over CIRCU-HUB</a> + <a href="#">Contact</a> + <a href="preferences.html" id="login">Inloggen</a> + </span> + </header> + <main> + <div id="sidebar"> + <table> + <form> + <tr> + <td colspan="2"> + <h2>Voorkeuren:</h2> + </td> + </tr> + <tr> + <td>Naam:</td> + <td><input type="entry" id="name" /></td> + </tr> + <tr> + <td>Logo:</td> + <td><input type="file" id="logo" /></td> + </tr> + <tr> + <td colspan="2"><img id="logo-preview" src="img/groningen.png" /></td> + </tr> + <tr> + <td>Address:</td> + <td><input type="entry" id="address1" /></td> + </tr> + <tr> + <td></td> + <td><input type="entry" id="address2" /></td> + </tr> + <tr> + <td>Postcode:</td> + <td><input type="entry" id="zipcode" /></td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Aanpassen" /></td> + </tr> + </form> + </table> + </div> + <div id="resources"> + <div class="resource"> + <h1>Groente-Fruit-Tuin</h1> + <table> + <tr> + <td>Hoeveelheid:</td> + <td><input type="number" id="amount" value="143" />ton</td> + </tr> + <tr> + <td>Vervuiling:</td> + <td><input type="number" min="0" max="100" id="cleanage" value="85" />%</td> + </tr> + <tr> + <td>Inzamelmethode:</td> + <td> + <input type="checkbox" id="huis-aan-huis" checked /> + <label for="huis-aan-huis">Huis-aan-Huis</label><br> + <input type="checkbox" id="wijkcontainer" /> + <label for="wijkcontainer">Wijkcontainer</label><br> + <input type="checkbox" id="milieustraat" /> + <label for="milieustraat">Milieustraat</label> + </td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Bewerken" /></td> + </tr> + </table> + <div>Voorbeelden van het afvalstroom:</div> + <div class="resource-foto-frame"> + <div class="resource-foto"> + <img src="img/gft1.jpg" alt="Image 1"> + </div> + <div class="resource-foto"> + <img src="img/gft2.jpg" alt="Image 2"> + </div> + <div class="resource-foto-empty"></div> + </div> + </div> + <div class="resource"> + <h1>Wit- en Bruingoed</h1> + <table> + <tr> + <td>Hoeveelheid:</td> + <td><input type="number" id="amount" />ton</td> + </tr> + <tr> + <td>Vervuiling:</td> + <td><input type="number" min="0" max="100" id="cleanage" />%</td> + </tr> + <tr> + <td>Inzamelmethode:</td> + <td> + <input type="checkbox" id="huis-aan-huis" /> + <label for="huis-aan-huis">Huis-aan-Huis</label><br> + <input type="checkbox" id="wijkcontainer" /> + <label for="wijkcontainer">Wijkcontainer</label><br> + <input type="checkbox" id="milieustraat" /> + <label for="milieustraat">Milieustraat</label> + </td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Bewerken" /></td> + </tr> + </table> + <div>Voorbeelden van het afvalstroom:</div> + <div class="resource-foto-frame"> + <div class="resource-foto-empty"></div> + </div> + </div> + <div class="resource"> + <h1>Piepschuim</h1> + <table> + <tr> + <td>Hoeveelheid:</td> + <td><input type="number" id="amount" />ton</td> + </tr> + <tr> + <td>Vervuiling:</td> + <td><input type="number" min="0" max="100" id="cleanage" />%</td> + </tr> + <tr> + <td>Inzamelmethode:</td> + <td> + <input type="checkbox" id="huis-aan-huis" /> + <label for="huis-aan-huis">Huis-aan-Huis</label><br> + <input type="checkbox" id="wijkcontainer" /> + <label for="wijkcontainer">Wijkcontainer</label><br> + <input type="checkbox" id="milieustraat" /> + <label for="milieustraat">Milieustraat</label> + </td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="Bewerken" /></td> + </tr> + </table> + <div>Voorbeelden van het afvalstroom:</div> + <div class="resource-foto-frame"> + <div class="resource-foto-empty"></div> + </div> + </div> + </div> + </main> +</body> + +</html> +\ No newline at end of file
