initial commit
This commit is contained in:
walamana
commit
2d458f08f3
5
.idea/.gitignore
vendored
Normal file
5
.idea/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
|
||||||
|
</state>
|
||||||
|
</component>
|
||||||
12
.idea/minis-new.iml
Normal file
12
.idea/minis-new.iml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="WEB_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
8
.idea/modules.xml
Normal file
8
.idea/modules.xml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/minis-new.iml" filepath="$PROJECT_DIR$/.idea/minis-new.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
7
.idea/vcs.xml
Normal file
7
.idea/vcs.xml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/private/minis-backend" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
11
package.json
Normal file
11
package.json
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"name": "minis-new",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC"
|
||||||
|
}
|
||||||
36
private/minis-backend/.gitignore
vendored
Normal file
36
private/minis-backend/.gitignore
vendored
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
.gradle
|
||||||
|
build/
|
||||||
|
!gradle/wrapper/gradle-wrapper.jar
|
||||||
|
!**/src/main/**/build/
|
||||||
|
!**/src/test/**/build/
|
||||||
|
|
||||||
|
### STS ###
|
||||||
|
.apt_generated
|
||||||
|
.classpath
|
||||||
|
.factorypath
|
||||||
|
.project
|
||||||
|
.settings
|
||||||
|
.springBeans
|
||||||
|
.sts4-cache
|
||||||
|
bin/
|
||||||
|
!**/src/main/**/bin/
|
||||||
|
!**/src/test/**/bin/
|
||||||
|
|
||||||
|
### IntelliJ IDEA ###
|
||||||
|
.idea
|
||||||
|
*.iws
|
||||||
|
*.iml
|
||||||
|
*.ipr
|
||||||
|
out/
|
||||||
|
!**/src/main/**/out/
|
||||||
|
!**/src/test/**/out/
|
||||||
|
|
||||||
|
### NetBeans ###
|
||||||
|
/nbproject/private/
|
||||||
|
/nbbuild/
|
||||||
|
/dist/
|
||||||
|
/nbdist/
|
||||||
|
/.nb-gradle/
|
||||||
|
|
||||||
|
### VS Code ###
|
||||||
|
.vscode/
|
||||||
46
private/minis-backend/build.gradle.kts
Normal file
46
private/minis-backend/build.gradle.kts
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
val ktor_version: String by project
|
||||||
|
val kotlin_version: String by project
|
||||||
|
val logback_version: String by project
|
||||||
|
|
||||||
|
val exposed_version: String by project
|
||||||
|
val h2_version: String by project
|
||||||
|
plugins {
|
||||||
|
kotlin("jvm") version "1.9.0"
|
||||||
|
id("io.ktor.plugin") version "2.3.3"
|
||||||
|
kotlin("plugin.serialization") version "1.9.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "de.walamana"
|
||||||
|
version = "0.0.1"
|
||||||
|
|
||||||
|
application {
|
||||||
|
mainClass.set("de.walamana.ApplicationKt")
|
||||||
|
|
||||||
|
val isDevelopment: Boolean = project.ext.has("development")
|
||||||
|
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation("io.ktor:ktor-server-core-jvm")
|
||||||
|
implementation("io.ktor:ktor-server-auth-jvm")
|
||||||
|
implementation("io.ktor:ktor-server-auth-jwt-jvm")
|
||||||
|
implementation("io.ktor:ktor-server-sessions-jvm")
|
||||||
|
implementation("io.ktor:ktor-server-host-common-jvm")
|
||||||
|
implementation("io.ktor:ktor-server-cors-jvm")
|
||||||
|
implementation("io.ktor:ktor-server-content-negotiation-jvm")
|
||||||
|
implementation("io.ktor:ktor-serialization-kotlinx-json-jvm")
|
||||||
|
implementation("org.jetbrains.exposed:exposed-core:$exposed_version")
|
||||||
|
implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
|
||||||
|
implementation("com.h2database:h2:$h2_version")
|
||||||
|
implementation("io.ktor:ktor-server-netty-jvm")
|
||||||
|
implementation("ch.qos.logback:logback-classic:$logback_version")
|
||||||
|
|
||||||
|
implementation("at.favre.lib:bcrypt:0.10.2")
|
||||||
|
|
||||||
|
testImplementation("io.ktor:ktor-server-tests-jvm")
|
||||||
|
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
|
||||||
|
}
|
||||||
6
private/minis-backend/gradle.properties
Normal file
6
private/minis-backend/gradle.properties
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
ktor_version=2.3.3
|
||||||
|
kotlin_version=1.9.0
|
||||||
|
logback_version=1.2.11
|
||||||
|
kotlin.code.style=official
|
||||||
|
exposed_version=0.41.1
|
||||||
|
h2_version=2.1.214
|
||||||
BIN
private/minis-backend/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
private/minis-backend/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
5
private/minis-backend/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
5
private/minis-backend/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
234
private/minis-backend/gradlew
vendored
Executable file
234
private/minis-backend/gradlew
vendored
Executable file
@ -0,0 +1,234 @@
|
|||||||
|
#!/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/master/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
|
||||||
|
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
|
||||||
|
# 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"'
|
||||||
|
|
||||||
|
# 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
|
||||||
|
which java >/dev/null 2>&1 || 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
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
|
case $MAX_FD in #(
|
||||||
|
max*)
|
||||||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
|
warn "Could not query maximum file descriptor limit"
|
||||||
|
esac
|
||||||
|
case $MAX_FD in #(
|
||||||
|
'' | soft) :;; #(
|
||||||
|
*)
|
||||||
|
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
|
||||||
|
|
||||||
|
# Collect all arguments for the java command;
|
||||||
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
# double quotes to make sure that they get re-expanded; and
|
||||||
|
# * put everything else in single quotes, so that it's not re-expanded.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# 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" "$@"
|
||||||
89
private/minis-backend/gradlew.bat
vendored
Normal file
89
private/minis-backend/gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
@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=.
|
||||||
|
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%" == "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%"=="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!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
1
private/minis-backend/settings.gradle.kts
Normal file
1
private/minis-backend/settings.gradle.kts
Normal file
@ -0,0 +1 @@
|
|||||||
|
rootProject.name = "minis-backend"
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
package de.walamana
|
||||||
|
|
||||||
|
import de.walamana.plugins.*
|
||||||
|
import de.walamana.views.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.engine.*
|
||||||
|
import io.ktor.server.netty.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
|
||||||
|
//fun main() {
|
||||||
|
// embeddedServer(Netty, port = 8080, host = "0.0.0.0", module = Application::module)
|
||||||
|
// .start(wait = true)
|
||||||
|
//}
|
||||||
|
|
||||||
|
fun main(args: Array<String>): Unit = EngineMain.main(args)
|
||||||
|
|
||||||
|
fun Application.module() {
|
||||||
|
configureSecurity()
|
||||||
|
configureHTTP()
|
||||||
|
configureSerialization()
|
||||||
|
configureDatabases()
|
||||||
|
|
||||||
|
routing {
|
||||||
|
route("/api") {
|
||||||
|
configureMinistrantenRoutes()
|
||||||
|
configureGottesdiensteRoutes()
|
||||||
|
configureMarksView()
|
||||||
|
configurePlanRoutes()
|
||||||
|
configureAuthenticationRoutes()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,75 @@
|
|||||||
|
package de.walamana.models
|
||||||
|
|
||||||
|
import de.walamana.plugins.DateAsLong
|
||||||
|
import de.walamana.plugins.dbQuery
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import org.jetbrains.exposed.sql.*
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||||
|
import java.util.Date
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class Gottesdienst(
|
||||||
|
val id: Int,
|
||||||
|
val name: String,
|
||||||
|
val date: DateAsLong,
|
||||||
|
val attendance: DateAsLong,
|
||||||
|
val planId: Int
|
||||||
|
)
|
||||||
|
|
||||||
|
object Gottesdienste : Table() {
|
||||||
|
val id = integer("id").autoIncrement()
|
||||||
|
val name = varchar("name", 128).default("")
|
||||||
|
val date = long("date")
|
||||||
|
val attendance = long("attendance")
|
||||||
|
val planId = integer("planId")
|
||||||
|
|
||||||
|
override val primaryKey = PrimaryKey(id, planId)
|
||||||
|
}
|
||||||
|
|
||||||
|
object GottesdiensteDao {
|
||||||
|
|
||||||
|
private fun resultRowToGottesdienst(row: ResultRow) = Gottesdienst(
|
||||||
|
row[Gottesdienste.id],
|
||||||
|
row[Gottesdienste.name],
|
||||||
|
Date(row[Gottesdienste.date]),
|
||||||
|
Date(row[Gottesdienste.attendance]),
|
||||||
|
row[Gottesdienste.planId]
|
||||||
|
)
|
||||||
|
|
||||||
|
suspend fun allGottesdienste(): List<Gottesdienst> = dbQuery {
|
||||||
|
Gottesdienste.selectAll().map(::resultRowToGottesdienst)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getGottesdiensteForPlan(planId: Int): List<Gottesdienst> = dbQuery {
|
||||||
|
Gottesdienste.select { Gottesdienste.planId eq planId }.map(::resultRowToGottesdienst)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun createGottesdienst(name: String, date: Date, attendance: Date, planId: Int): Gottesdienst? = dbQuery {
|
||||||
|
val statement = Gottesdienste.insert {
|
||||||
|
it[Gottesdienste.name] = name
|
||||||
|
it[Gottesdienste.date] = date.time
|
||||||
|
it[Gottesdienste.attendance] = attendance.time
|
||||||
|
it[Gottesdienste.planId] = planId
|
||||||
|
}
|
||||||
|
statement.resultedValues?.singleOrNull()?.let(::resultRowToGottesdienst)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun deleteGottesdienst(id: Int): Boolean = dbQuery {
|
||||||
|
Gottesdienste.deleteWhere { Gottesdienste.id eq id } > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun updateGottesdienst(
|
||||||
|
id: Int,
|
||||||
|
name: String? = null,
|
||||||
|
date: Date? = null,
|
||||||
|
attendance: Date? = null,
|
||||||
|
planId: Int? = null
|
||||||
|
): Boolean = dbQuery {
|
||||||
|
Gottesdienste.update({ Gottesdienste.id eq id }) {
|
||||||
|
if (name != null) it[Gottesdienste.name] = name
|
||||||
|
if (date != null) it[Gottesdienste.date] = date.time
|
||||||
|
if (attendance != null) it[Gottesdienste.attendance] = attendance.time
|
||||||
|
if (planId != null) it[Gottesdienste.planId] = planId
|
||||||
|
} > 0
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
package de.walamana.models
|
||||||
|
|
||||||
|
import de.walamana.plugins.dbQuery
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import org.jetbrains.exposed.sql.*
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class Mark(
|
||||||
|
val mid: Int,
|
||||||
|
val gid: Int,
|
||||||
|
val value: Int
|
||||||
|
)
|
||||||
|
|
||||||
|
object Marks : Table() {
|
||||||
|
val mid = integer("mid")
|
||||||
|
.references(Ministranten.id);
|
||||||
|
val gid = integer("gid")
|
||||||
|
.references(Gottesdienste.id);
|
||||||
|
val value = integer("value");
|
||||||
|
|
||||||
|
override val primaryKey = PrimaryKey(mid, gid)
|
||||||
|
}
|
||||||
|
|
||||||
|
object MarksDao {
|
||||||
|
|
||||||
|
private fun resultRowToMark(row: ResultRow) = Mark(
|
||||||
|
row[Marks.mid],
|
||||||
|
row[Marks.gid],
|
||||||
|
row[Marks.value]
|
||||||
|
)
|
||||||
|
|
||||||
|
suspend fun allMarksForPlan(planId: Int): List<Mark> = dbQuery {
|
||||||
|
Gottesdienste.join(Marks, JoinType.INNER, onColumn = Marks.gid, otherColumn = Gottesdienste.id)
|
||||||
|
.select { Gottesdienste.planId eq planId }
|
||||||
|
.map(::resultRowToMark)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun setMark(ministrantId: Int, gottesdienstId: Int, value: Int): Boolean = dbQuery {
|
||||||
|
Marks.insert {
|
||||||
|
it[Marks.mid] = ministrantId
|
||||||
|
it[Marks.gid] = gottesdienstId
|
||||||
|
it[Marks.value] = value
|
||||||
|
}.resultedValues?.isNotEmpty() ?: false
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun removeMark(ministrantId: Int, gottesdienstId: Int): Boolean = dbQuery {
|
||||||
|
Marks.deleteWhere {
|
||||||
|
(Marks.gid eq gottesdienstId) and
|
||||||
|
(Marks.mid eq ministrantId)
|
||||||
|
} > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,108 @@
|
|||||||
|
package de.walamana.models
|
||||||
|
|
||||||
|
import de.walamana.plugins.*
|
||||||
|
import kotlinx.serialization.Contextual
|
||||||
|
import kotlinx.serialization.KSerializer
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import kotlinx.serialization.descriptors.PrimitiveKind
|
||||||
|
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
|
||||||
|
import kotlinx.serialization.descriptors.SerialDescriptor
|
||||||
|
import kotlinx.serialization.encoding.Decoder
|
||||||
|
import kotlinx.serialization.encoding.Encoder
|
||||||
|
import org.jetbrains.exposed.sql.*
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class Ministrant(
|
||||||
|
val id: Int,
|
||||||
|
val username: String,
|
||||||
|
val passwordHash: String,
|
||||||
|
val firstname: String,
|
||||||
|
val lastname: String,
|
||||||
|
val birthday: DateAsLong,
|
||||||
|
val privileges: CommaSeperatedStringList
|
||||||
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class SimplifiedMinistrant(
|
||||||
|
val id: Int,
|
||||||
|
val firstname: String,
|
||||||
|
val lastname: String
|
||||||
|
)
|
||||||
|
|
||||||
|
object Ministranten : Table() {
|
||||||
|
val id = integer("id").autoIncrement()
|
||||||
|
val username = varchar("username", 128)
|
||||||
|
val passwordHash = varchar("passwordHash", 1024)
|
||||||
|
val firstname = varchar("firstname", 128)
|
||||||
|
val lastname = varchar("lastname", 128)
|
||||||
|
val birthday = long("birthday")
|
||||||
|
val privileges = varchar("privileges", 1024)
|
||||||
|
|
||||||
|
override val primaryKey = PrimaryKey(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
object MinistrantenDao {
|
||||||
|
private fun resultRowToMinistrant(row: ResultRow, showPasswordHash: Boolean = false) = Ministrant (
|
||||||
|
row[Ministranten.id],
|
||||||
|
row[Ministranten.username],
|
||||||
|
if(showPasswordHash) row[Ministranten.passwordHash] else "",
|
||||||
|
row[Ministranten.firstname],
|
||||||
|
row[Ministranten.lastname],
|
||||||
|
Date(row[Ministranten.birthday]),
|
||||||
|
row[Ministranten.privileges].split(",")
|
||||||
|
)
|
||||||
|
|
||||||
|
suspend fun allMinistranten(): List<Ministrant> = dbQuery {
|
||||||
|
Ministranten.selectAll().map(::resultRowToMinistrant)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun simplifiedMinistranten(): List<SimplifiedMinistrant> = dbQuery {
|
||||||
|
Ministranten.selectAll().map { row ->
|
||||||
|
SimplifiedMinistrant(row[Ministranten.id], row[Ministranten.firstname], row[Ministranten.lastname])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getMinistrant(username: String, showPasswordHash: Boolean = false): Ministrant? = dbQuery {
|
||||||
|
Ministranten.select(Ministranten.username eq username).map {
|
||||||
|
resultRowToMinistrant(it, showPasswordHash)
|
||||||
|
}.firstOrNull()
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun createMinistrant(username: String, passwordHash: String, firstname: String, lastname: String, birthday: Date, privileges: List<String>) = dbQuery {
|
||||||
|
val statement = Ministranten.insert {
|
||||||
|
it[Ministranten.username] = username
|
||||||
|
it[Ministranten.passwordHash] = ""
|
||||||
|
it[Ministranten.firstname] = firstname
|
||||||
|
it[Ministranten.lastname] = lastname
|
||||||
|
it[Ministranten.birthday] = birthday.time
|
||||||
|
it[Ministranten.privileges] = privileges.joinToString(",")
|
||||||
|
}
|
||||||
|
Security.setPassword(username, passwordHash)
|
||||||
|
statement.resultedValues?.singleOrNull()?.let(::resultRowToMinistrant)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun deleteMinistrant(id: Int): Boolean = dbQuery {
|
||||||
|
Ministranten.deleteWhere { Ministranten.id eq id } > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun updateMinistrant(
|
||||||
|
id: Int,
|
||||||
|
username: String? = null,
|
||||||
|
passwordHash: String? = null,
|
||||||
|
firstname: String? = null,
|
||||||
|
lastname: String? = null,
|
||||||
|
birthday: Date? = null,
|
||||||
|
privileges: List<String>? = null
|
||||||
|
) = dbQuery{
|
||||||
|
Ministranten.update({Ministranten.id eq id}) {
|
||||||
|
if(username != null) it[Ministranten.username] = username
|
||||||
|
if(passwordHash != null) it[Ministranten.passwordHash] = passwordHash
|
||||||
|
if(firstname != null) it[Ministranten.firstname] = firstname
|
||||||
|
if(lastname != null) it[Ministranten.lastname] = lastname
|
||||||
|
if(birthday != null) it[Ministranten.birthday] = birthday.time
|
||||||
|
if(privileges != null) it[Ministranten.privileges] = privileges.joinToString(",")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
package de.walamana.plugins
|
||||||
|
|
||||||
|
import de.walamana.models.Gottesdienste
|
||||||
|
import de.walamana.models.Marks
|
||||||
|
import de.walamana.models.Ministranten
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import org.jetbrains.exposed.sql.*
|
||||||
|
import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
|
||||||
|
fun Application.configureDatabases() {
|
||||||
|
val driverClassName = "org.h2.Driver"
|
||||||
|
val jdbcURL = "jdbc:h2:file:./build/db"
|
||||||
|
val database = Database.connect(jdbcURL, driverClassName)
|
||||||
|
|
||||||
|
transaction {
|
||||||
|
SchemaUtils.create(Gottesdienste)
|
||||||
|
SchemaUtils.create(Ministranten)
|
||||||
|
SchemaUtils.create(Marks)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun <T> dbQuery(block: suspend () -> T): T =
|
||||||
|
newSuspendedTransaction(Dispatchers.IO) { block() }
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
package de.walamana.plugins
|
||||||
|
|
||||||
|
import io.ktor.http.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.plugins.cors.routing.*
|
||||||
|
|
||||||
|
fun Application.configureHTTP() {
|
||||||
|
install(CORS) {
|
||||||
|
allowMethod(HttpMethod.Options)
|
||||||
|
allowMethod(HttpMethod.Put)
|
||||||
|
allowMethod(HttpMethod.Delete)
|
||||||
|
allowMethod(HttpMethod.Patch)
|
||||||
|
allowMethod(HttpMethod.Options)
|
||||||
|
allowHeader(HttpHeaders.Authorization)
|
||||||
|
allowHeader(HttpHeaders.AccessControlAllowOrigin)
|
||||||
|
allowNonSimpleContentTypes = true
|
||||||
|
// allowHeader("MyCustomHeader")
|
||||||
|
anyHost() // @TODO: Don't do this in production if possible. Try to limit it.
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,102 @@
|
|||||||
|
package de.walamana.plugins
|
||||||
|
|
||||||
|
import at.favre.lib.crypto.bcrypt.BCrypt
|
||||||
|
import com.auth0.jwt.JWT
|
||||||
|
import com.auth0.jwt.algorithms.Algorithm
|
||||||
|
import com.auth0.jwt.interfaces.Payload
|
||||||
|
import de.walamana.models.Ministrant
|
||||||
|
import de.walamana.models.MinistrantenDao
|
||||||
|
import io.ktor.http.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.auth.*
|
||||||
|
import io.ktor.server.auth.jwt.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import io.ktor.server.sessions.*
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
|
const val SALT_ROUNDS = 10;
|
||||||
|
data class JWTEnvironment(
|
||||||
|
val secret: String,
|
||||||
|
val issuer: String,
|
||||||
|
val audience: String,
|
||||||
|
)
|
||||||
|
|
||||||
|
fun Application.configureSecurity() {
|
||||||
|
val jwtEnv = getJWTEnvironment()
|
||||||
|
authentication {
|
||||||
|
jwt() {
|
||||||
|
verifier(
|
||||||
|
JWT
|
||||||
|
.require(Algorithm.HMAC256(jwtEnv.secret))
|
||||||
|
.withAudience(jwtEnv.audience)
|
||||||
|
.withIssuer(jwtEnv.issuer)
|
||||||
|
.build()
|
||||||
|
)
|
||||||
|
validate { credential ->
|
||||||
|
if (credential.payload.audience.contains(jwtEnv.audience)) JWTPrincipal(credential.payload) else null
|
||||||
|
}
|
||||||
|
challenge { _, _ ->
|
||||||
|
call.respond(HttpStatusCode.Unauthorized, hashMapOf("msg" to "Token is not valid or has expired"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Application.getJWTEnvironment(): JWTEnvironment{
|
||||||
|
|
||||||
|
val secret = environment.config.property("jwt.secret").getString()
|
||||||
|
val issuer = environment.config.property("jwt.issuer").getString()
|
||||||
|
val audience = environment.config.property("jwt.audience").getString()
|
||||||
|
return JWTEnvironment(secret, issuer, audience)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Payload.username() = getClaim("username").asString()
|
||||||
|
fun Payload.mid() = getClaim("id").asInt()
|
||||||
|
|
||||||
|
|
||||||
|
object Security {
|
||||||
|
suspend fun authenticateUser(application: Application, username: String, password: String): Ministrant? {
|
||||||
|
if(username == "admin") {
|
||||||
|
val adminPw = application.environment.config.property("admin.password").getString()
|
||||||
|
if(adminPw == password) {
|
||||||
|
val allMinis = MinistrantenDao.allMinistranten().map { it.username }
|
||||||
|
return Ministrant(
|
||||||
|
0, "admin", "", "admin", "admin", Date(), allMinis
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
val ministrant = MinistrantenDao.getMinistrant(username, true)
|
||||||
|
?: return null
|
||||||
|
|
||||||
|
if(!BCrypt.verifyer().verify(password.toCharArray(), ministrant.passwordHash).verified) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return ministrant
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun setPassword(username: String, password: String): Boolean {
|
||||||
|
val ministrant = MinistrantenDao.getMinistrant(username) ?: return false
|
||||||
|
|
||||||
|
val hash = BCrypt.withDefaults().hashToString(SALT_ROUNDS, password.toCharArray())
|
||||||
|
|
||||||
|
print(hash)
|
||||||
|
|
||||||
|
MinistrantenDao.updateMinistrant(ministrant.id, passwordHash = hash)
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createToken(jwtEnv: JWTEnvironment, ministrant: Ministrant) = JWT.create()
|
||||||
|
.withAudience(jwtEnv.audience)
|
||||||
|
.withIssuer(jwtEnv.issuer)
|
||||||
|
.withClaim("username", ministrant.username)
|
||||||
|
.withClaim("id", ministrant.id)
|
||||||
|
.withExpiresAt(Date(System.currentTimeMillis() + 1000*60*60))
|
||||||
|
.sign(Algorithm.HMAC256(jwtEnv.secret))
|
||||||
|
}
|
||||||
@ -0,0 +1,66 @@
|
|||||||
|
package de.walamana.plugins
|
||||||
|
|
||||||
|
import io.ktor.serialization.kotlinx.json.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.plugins.contentnegotiation.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import kotlinx.serialization.KSerializer
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import kotlinx.serialization.descriptors.PrimitiveKind
|
||||||
|
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
|
||||||
|
import kotlinx.serialization.descriptors.SerialDescriptor
|
||||||
|
import kotlinx.serialization.encoding.Decoder
|
||||||
|
import kotlinx.serialization.encoding.Encoder
|
||||||
|
import kotlinx.serialization.json.Json
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
fun Application.configureSerialization() {
|
||||||
|
install(ContentNegotiation) {
|
||||||
|
json(Json {
|
||||||
|
prettyPrint = true
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
routing {
|
||||||
|
get("/json/kotlinx-serialization") {
|
||||||
|
println("Test")
|
||||||
|
// call.respond("Test")
|
||||||
|
call.respond(mapOf("hello" to "world"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
typealias CommaSeperatedStringList = @Serializable(StringListAsCommaSeperatedString::class) List<String>;
|
||||||
|
|
||||||
|
object StringListAsCommaSeperatedString : KSerializer<List<String>> {
|
||||||
|
override val descriptor: SerialDescriptor
|
||||||
|
= PrimitiveSerialDescriptor("List<String>", PrimitiveKind.STRING)
|
||||||
|
|
||||||
|
override fun deserialize(decoder: Decoder): List<String> {
|
||||||
|
return decoder.decodeString().split(",")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serialize(encoder: Encoder, value: List<String>) {
|
||||||
|
encoder.encodeString(value.joinToString(","))
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
typealias DateAsLong = @Serializable(DateAsLongSerializer::class) Date
|
||||||
|
object DateAsLongSerializer : KSerializer<Date> {
|
||||||
|
override val descriptor: SerialDescriptor
|
||||||
|
= PrimitiveSerialDescriptor("Date", PrimitiveKind.LONG)
|
||||||
|
|
||||||
|
override fun serialize(encoder: Encoder, value: Date) {
|
||||||
|
encoder.encodeLong(value.time)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun deserialize(decoder: Decoder): Date {
|
||||||
|
return Date(decoder.decodeLong())
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package de.walamana.plugins
|
||||||
|
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import org.jetbrains.exposed.sql.*
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class ExposedUser(val name: String, val age: Int)
|
||||||
|
class UserService(private val database: Database) {
|
||||||
|
object Users : Table() {
|
||||||
|
val id = integer("id").autoIncrement()
|
||||||
|
val name = varchar("name", length = 50)
|
||||||
|
val age = integer("age")
|
||||||
|
|
||||||
|
override val primaryKey = PrimaryKey(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
transaction(database) {
|
||||||
|
SchemaUtils.create(Users)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun <T> dbQuery(block: suspend () -> T): T =
|
||||||
|
newSuspendedTransaction(Dispatchers.IO) { block() }
|
||||||
|
|
||||||
|
suspend fun create(user: ExposedUser): Int = dbQuery {
|
||||||
|
Users.insert {
|
||||||
|
it[name] = user.name
|
||||||
|
it[age] = user.age
|
||||||
|
}[Users.id]
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun read(id: Int): ExposedUser? {
|
||||||
|
return dbQuery {
|
||||||
|
Users.select { Users.id eq id }
|
||||||
|
.map { ExposedUser(it[Users.name], it[Users.age]) }
|
||||||
|
.singleOrNull()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun update(id: Int, user: ExposedUser) {
|
||||||
|
dbQuery {
|
||||||
|
Users.update({ Users.id eq id }) {
|
||||||
|
it[name] = user.name
|
||||||
|
it[age] = user.age
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun delete(id: Int) {
|
||||||
|
dbQuery {
|
||||||
|
Users.deleteWhere { Users.id.eq(id) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
package de.walamana.service
|
||||||
|
|
||||||
|
import de.walamana.models.*
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class Plan (
|
||||||
|
val gottesdienste: List<Gottesdienst>,
|
||||||
|
val ministranten: List<SimplifiedMinistrant>,
|
||||||
|
val marks: List<Mark>
|
||||||
|
)
|
||||||
|
|
||||||
|
object PlanDao {
|
||||||
|
|
||||||
|
suspend fun constructPlan(planId: Int): Plan {
|
||||||
|
val gottesdienste = GottesdiensteDao.getGottesdiensteForPlan(planId)
|
||||||
|
val ministranten = MinistrantenDao.simplifiedMinistranten()
|
||||||
|
val marks = MarksDao.allMarksForPlan(planId)
|
||||||
|
|
||||||
|
return Plan(gottesdienste, ministranten, marks)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
package de.walamana.views
|
||||||
|
|
||||||
|
import at.favre.lib.crypto.bcrypt.BCrypt
|
||||||
|
import com.auth0.jwt.JWT
|
||||||
|
import com.auth0.jwt.algorithms.Algorithm
|
||||||
|
import de.walamana.models.MinistrantenDao
|
||||||
|
import de.walamana.plugins.Security
|
||||||
|
import de.walamana.plugins.getJWTEnvironment
|
||||||
|
import de.walamana.plugins.mid
|
||||||
|
import de.walamana.plugins.username
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.auth.*
|
||||||
|
import io.ktor.server.auth.jwt.*
|
||||||
|
import io.ktor.server.request.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import java.util.*
|
||||||
|
import kotlin.math.max
|
||||||
|
import kotlin.math.min
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class AuthenticationRequest(
|
||||||
|
val username: String,
|
||||||
|
val password: String
|
||||||
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class AuthenticationResult(
|
||||||
|
val success: Boolean,
|
||||||
|
val token: String? = null
|
||||||
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class AuthenticationUpdateRequest(
|
||||||
|
val newPassword: String
|
||||||
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class PasswordResetRequest(
|
||||||
|
val username: String
|
||||||
|
)
|
||||||
|
|
||||||
|
fun Route.configureAuthenticationRoutes() {
|
||||||
|
route("/auth") {
|
||||||
|
post {
|
||||||
|
val request = call.receive<AuthenticationRequest>()
|
||||||
|
val jwtEnv = application.getJWTEnvironment();
|
||||||
|
|
||||||
|
val ministrant = Security.authenticateUser(application, request.username, request.password)
|
||||||
|
if(ministrant == null){
|
||||||
|
call.respond(AuthenticationResult(false))
|
||||||
|
return@post
|
||||||
|
}
|
||||||
|
|
||||||
|
val token = Security.createToken(jwtEnv, ministrant)
|
||||||
|
|
||||||
|
call.respond(AuthenticationResult(true, token.toString()))
|
||||||
|
}
|
||||||
|
|
||||||
|
authenticate {
|
||||||
|
put("update") {
|
||||||
|
val principal = call.principal<JWTPrincipal>()!!
|
||||||
|
val request = call.receive<AuthenticationUpdateRequest>()
|
||||||
|
|
||||||
|
Security.setPassword(principal.payload.username(), request.newPassword)
|
||||||
|
|
||||||
|
call.respond(hashMapOf("success" to true))
|
||||||
|
}
|
||||||
|
post("reset") {
|
||||||
|
val principal = call.principal<JWTPrincipal>()!!
|
||||||
|
if(principal.payload.username() != "admin") {
|
||||||
|
// TODO: fail
|
||||||
|
return@post
|
||||||
|
}
|
||||||
|
val request = call.receive<PasswordResetRequest>()
|
||||||
|
val newPassword = BCrypt.withDefaults()
|
||||||
|
.hash(Math.random().toInt() * 3 + 4, Math.random().toString().toCharArray())
|
||||||
|
.toString().substring(3..10);
|
||||||
|
|
||||||
|
Security.setPassword(request.username, newPassword)
|
||||||
|
|
||||||
|
call.respond(hashMapOf("password" to newPassword))
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,47 @@
|
|||||||
|
package de.walamana.views
|
||||||
|
|
||||||
|
import de.walamana.models.Gottesdienst
|
||||||
|
import de.walamana.models.Gottesdienste
|
||||||
|
import de.walamana.models.GottesdiensteDao
|
||||||
|
import io.ktor.http.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.request.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import io.ktor.server.util.*
|
||||||
|
|
||||||
|
fun Route.configureGottesdiensteRoutes() {
|
||||||
|
route("/gottesdienste") {
|
||||||
|
get {
|
||||||
|
val data = GottesdiensteDao.allGottesdienste()
|
||||||
|
call.respond(data)
|
||||||
|
}
|
||||||
|
put {
|
||||||
|
val data = call.receive<Gottesdienst>()
|
||||||
|
val gottesdienst = GottesdiensteDao.createGottesdienst(
|
||||||
|
data.name,
|
||||||
|
data.date,
|
||||||
|
data.attendance,
|
||||||
|
data.planId
|
||||||
|
)
|
||||||
|
call.respond(mapOf("id" to gottesdienst?.id))
|
||||||
|
}
|
||||||
|
patch {
|
||||||
|
// TODO: Access only by admin
|
||||||
|
val data = call.receive<Gottesdienst>()
|
||||||
|
val changed = GottesdiensteDao.updateGottesdienst(
|
||||||
|
data.id,
|
||||||
|
data.name,
|
||||||
|
data.date,
|
||||||
|
data.attendance,
|
||||||
|
data.planId
|
||||||
|
)
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
delete {
|
||||||
|
val id = call.request.queryParameters["id"]?.toInt() ?: TODO("fail")
|
||||||
|
GottesdiensteDao.deleteGottesdienst(id)
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
package de.walamana.views
|
||||||
|
|
||||||
|
import de.walamana.models.*
|
||||||
|
import io.ktor.http.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.request.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import io.ktor.server.util.*
|
||||||
|
|
||||||
|
fun Route.configureMarksView() {
|
||||||
|
route("/marks") {
|
||||||
|
get {
|
||||||
|
val data = MarksDao.allMarksForPlan(call.receiveParameters().getOrFail("id").toInt())
|
||||||
|
call.respond(data)
|
||||||
|
}
|
||||||
|
put {
|
||||||
|
val data = call.receive<Mark>()
|
||||||
|
val mark = MarksDao.setMark(
|
||||||
|
data.mid,
|
||||||
|
data.gid,
|
||||||
|
data.value
|
||||||
|
)
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
patch {
|
||||||
|
// TODO: Access only by admin
|
||||||
|
val data = call.receive<Mark>()
|
||||||
|
val changed = MarksDao.setMark(
|
||||||
|
data.mid,
|
||||||
|
data.gid,
|
||||||
|
data.value
|
||||||
|
)
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
delete {
|
||||||
|
GottesdiensteDao.deleteGottesdienst(call.receiveParameters().getOrFail("id").toInt())
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
package de.walamana.views
|
||||||
|
|
||||||
|
import de.walamana.models.Ministrant
|
||||||
|
import de.walamana.models.MinistrantenDao
|
||||||
|
import io.ktor.http.*
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.request.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import io.ktor.server.util.*
|
||||||
|
|
||||||
|
fun Route.configureMinistrantenRoutes() {
|
||||||
|
route("/ministranten") {
|
||||||
|
get {
|
||||||
|
val data = MinistrantenDao.allMinistranten();
|
||||||
|
call.respond(data)
|
||||||
|
}
|
||||||
|
put {
|
||||||
|
val data = call.receive<Ministrant>()
|
||||||
|
val ministrant = MinistrantenDao.createMinistrant(
|
||||||
|
data.username,
|
||||||
|
data.passwordHash,
|
||||||
|
data.firstname,
|
||||||
|
data.lastname,
|
||||||
|
data.birthday,
|
||||||
|
data.privileges
|
||||||
|
)
|
||||||
|
call.respond(mapOf("id" to ministrant?.id))
|
||||||
|
}
|
||||||
|
patch {
|
||||||
|
// TODO: Access only by admin
|
||||||
|
val data = call.receive<Ministrant>()
|
||||||
|
val changed = MinistrantenDao.updateMinistrant(
|
||||||
|
data.id,
|
||||||
|
data.username,
|
||||||
|
data.passwordHash,
|
||||||
|
data.firstname,
|
||||||
|
data.lastname,
|
||||||
|
data.birthday,
|
||||||
|
data.privileges
|
||||||
|
)
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
delete {
|
||||||
|
val id = call.request.queryParameters["id"]?.toInt() ?: TODO("fail")
|
||||||
|
MinistrantenDao.deleteMinistrant(id)
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
package de.walamana.views
|
||||||
|
|
||||||
|
import de.walamana.service.PlanDao
|
||||||
|
import io.ktor.server.application.*
|
||||||
|
import io.ktor.server.request.*
|
||||||
|
import io.ktor.server.response.*
|
||||||
|
import io.ktor.server.routing.*
|
||||||
|
import io.ktor.server.util.*
|
||||||
|
|
||||||
|
fun Route.configurePlanRoutes() {
|
||||||
|
route("/plan") {
|
||||||
|
get {
|
||||||
|
val id = call.parameters.getOrFail("id").toInt()
|
||||||
|
val plan = PlanDao.constructPlan(id);
|
||||||
|
call.respond(plan)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
20
private/minis-backend/src/main/resources/application.conf
Normal file
20
private/minis-backend/src/main/resources/application.conf
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
ktor {
|
||||||
|
development = true
|
||||||
|
deployment {
|
||||||
|
port = 8080
|
||||||
|
}
|
||||||
|
application {
|
||||||
|
modules = [ de.walamana.ApplicationKt.module ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jwt {
|
||||||
|
secret = ${SECRET}
|
||||||
|
issuer = "http://0.0.0.0:8080/"
|
||||||
|
audience = "http://0.0.0.0:8080/"
|
||||||
|
realm = "mini-data"
|
||||||
|
}
|
||||||
|
|
||||||
|
admin {
|
||||||
|
password = ${ADMIN}
|
||||||
|
}
|
||||||
12
private/minis-backend/src/main/resources/logback.xml
Normal file
12
private/minis-backend/src/main/resources/logback.xml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<configuration>
|
||||||
|
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
|
<encoder>
|
||||||
|
<pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
<root level="trace">
|
||||||
|
<appender-ref ref="STDOUT"/>
|
||||||
|
</root>
|
||||||
|
<logger name="org.eclipse.jetty" level="INFO"/>
|
||||||
|
<logger name="io.netty" level="INFO"/>
|
||||||
|
</configuration>
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Hello Ktor!</h1>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
package de.walamana
|
||||||
|
|
||||||
|
import de.walamana.plugins.*
|
||||||
|
import io.ktor.client.request.*
|
||||||
|
import io.ktor.client.statement.*
|
||||||
|
import io.ktor.http.*
|
||||||
|
import io.ktor.server.testing.*
|
||||||
|
import kotlin.test.*
|
||||||
|
|
||||||
|
class ApplicationTest {
|
||||||
|
@Test
|
||||||
|
fun testRoot() = testApplication {
|
||||||
|
// application {
|
||||||
|
// configureRouting()
|
||||||
|
// }
|
||||||
|
// client.get("/").apply {
|
||||||
|
// assertEquals(HttpStatusCode.OK, status)
|
||||||
|
// assertEquals("Hello World!", bodyAsText())
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
}
|
||||||
28
public/.gitignore
vendored
Normal file
28
public/.gitignore
vendored
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
node_modules
|
||||||
|
.DS_Store
|
||||||
|
dist
|
||||||
|
dist-ssr
|
||||||
|
coverage
|
||||||
|
*.local
|
||||||
|
|
||||||
|
/cypress/videos/
|
||||||
|
/cypress/screenshots/
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
3
public/.vscode/extensions.json
vendored
Normal file
3
public/.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
|
||||||
|
}
|
||||||
40
public/README.md
Normal file
40
public/README.md
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
# minis-new
|
||||||
|
|
||||||
|
This template should help get you started developing with Vue 3 in Vite.
|
||||||
|
|
||||||
|
## Recommended IDE Setup
|
||||||
|
|
||||||
|
[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
|
||||||
|
|
||||||
|
## Type Support for `.vue` Imports in TS
|
||||||
|
|
||||||
|
TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin) to make the TypeScript language service aware of `.vue` types.
|
||||||
|
|
||||||
|
If the standalone TypeScript plugin doesn't feel fast enough to you, Volar has also implemented a [Take Over Mode](https://github.com/johnsoncodehk/volar/discussions/471#discussioncomment-1361669) that is more performant. You can enable it by the following steps:
|
||||||
|
|
||||||
|
1. Disable the built-in TypeScript Extension
|
||||||
|
1) Run `Extensions: Show Built-in Extensions` from VSCode's command palette
|
||||||
|
2) Find `TypeScript and JavaScript Language Features`, right click and select `Disable (Workspace)`
|
||||||
|
2. Reload the VSCode window by running `Developer: Reload Window` from the command palette.
|
||||||
|
|
||||||
|
## Customize configuration
|
||||||
|
|
||||||
|
See [Vite Configuration Reference](https://vitejs.dev/config/).
|
||||||
|
|
||||||
|
## Project Setup
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm install
|
||||||
|
```
|
||||||
|
|
||||||
|
### Compile and Hot-Reload for Development
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm run dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Type-Check, Compile and Minify for Production
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm run build
|
||||||
|
```
|
||||||
1
public/env.d.ts
vendored
Normal file
1
public/env.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/// <reference types="vite/client" />
|
||||||
15
public/index.html
Normal file
15
public/index.html
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<link rel="icon" href="/favicon.ico">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Vite App</title>
|
||||||
|
<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" rel="stylesheet" />
|
||||||
|
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="app"></div>
|
||||||
|
<script type="module" src="/src/main.ts"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
2391
public/package-lock.json
generated
Normal file
2391
public/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
27
public/package.json
Normal file
27
public/package.json
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"name": "minis-new",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"private": true,
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "run-p type-check build-only",
|
||||||
|
"preview": "vite preview",
|
||||||
|
"build-only": "vite build",
|
||||||
|
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"vue": "^3.3.4",
|
||||||
|
"vue-router": "^4.2.4"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@tsconfig/node18": "^18.2.0",
|
||||||
|
"@types/node": "^18.17.0",
|
||||||
|
"@vitejs/plugin-vue": "^4.2.3",
|
||||||
|
"@vue/tsconfig": "^0.4.0",
|
||||||
|
"less": "^4.2.0",
|
||||||
|
"npm-run-all": "^4.1.5",
|
||||||
|
"typescript": "~5.1.6",
|
||||||
|
"vite": "^4.4.6",
|
||||||
|
"vue-tsc": "^1.8.6"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
public/public/favicon.ico
Normal file
BIN
public/public/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
15
public/src/App.vue
Normal file
15
public/src/App.vue
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { RouterLink, RouterView } from 'vue-router'
|
||||||
|
import HelloWorld from './components/HelloWorld.vue'
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<header>
|
||||||
|
Header
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<RouterView />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="less">
|
||||||
|
</style>
|
||||||
0
public/src/assets/base.css
Normal file
0
public/src/assets/base.css
Normal file
1
public/src/assets/logo.svg
Normal file
1
public/src/assets/logo.svg
Normal file
@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
|
||||||
|
After Width: | Height: | Size: 276 B |
25
public/src/assets/main.css
Normal file
25
public/src/assets/main.css
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
@import './base.css';
|
||||||
|
|
||||||
|
html, body {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon, i:not(.icon) {
|
||||||
|
font-family: 'Material Symbols Outlined';
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
font-size: 24px;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: normal;
|
||||||
|
text-transform: none;
|
||||||
|
display: inline-block;
|
||||||
|
white-space: nowrap;
|
||||||
|
word-wrap: normal;
|
||||||
|
direction: ltr;
|
||||||
|
-moz-font-feature-settings: 'liga';
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filled {
|
||||||
|
font-variation-settings: "FILL" 1;
|
||||||
|
}
|
||||||
41
public/src/components/HelloWorld.vue
Normal file
41
public/src/components/HelloWorld.vue
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
defineProps<{
|
||||||
|
msg: string
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="greetings">
|
||||||
|
<h1 class="green">{{ msg }}</h1>
|
||||||
|
<h3>
|
||||||
|
You’ve successfully created a project with
|
||||||
|
<a href="https://vitejs.dev/" target="_blank" rel="noopener">Vite</a> +
|
||||||
|
<a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>. What's next?
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
h1 {
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 2.6rem;
|
||||||
|
position: relative;
|
||||||
|
top: -10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
font-size: 1.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.greetings h1,
|
||||||
|
.greetings h3 {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1024px) {
|
||||||
|
.greetings h1,
|
||||||
|
.greetings h3 {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
51
public/src/components/Input.vue
Normal file
51
public/src/components/Input.vue
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
value: any,
|
||||||
|
label?: string,
|
||||||
|
disabled?: boolean,
|
||||||
|
type?: string
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits(["update:value"])
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="input">
|
||||||
|
<label v-if="label">{{ label }}</label>
|
||||||
|
<input
|
||||||
|
:value="value"
|
||||||
|
@input="$emit('update:value', $event.target.value)"
|
||||||
|
:type="props.type ? props.type : 'text'"
|
||||||
|
:disabled="disabled">
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="less">
|
||||||
|
|
||||||
|
.input {
|
||||||
|
display: inline-block;
|
||||||
|
label {
|
||||||
|
display: block;
|
||||||
|
padding-left: 15px;
|
||||||
|
font-size: 14px;
|
||||||
|
color: #727272;
|
||||||
|
}
|
||||||
|
input {
|
||||||
|
font-family: sans-serif;
|
||||||
|
width: calc(100% - 30px);
|
||||||
|
min-width: 0px;
|
||||||
|
outline: none;
|
||||||
|
margin: 0 10px;
|
||||||
|
padding: 5px 5px;
|
||||||
|
color: #121212;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
font-size: 14px;
|
||||||
|
&:not(:disabled){
|
||||||
|
border: 1px solid #cecece;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
198
public/src/components/Plan.vue
Normal file
198
public/src/components/Plan.vue
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import {API} from "@/views/api";
|
||||||
|
|
||||||
|
import {onMounted, reactive, ref} from "vue";
|
||||||
|
import type {Gottesdienst, Mark, PlanModel, SimplifiedMinistrant} from "@/models/models";
|
||||||
|
import Input from "@/components/Input.vue";
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
gottesdienste: Gottesdienst[],
|
||||||
|
ministranten: SimplifiedMinistrant[]
|
||||||
|
marks: Mark[],
|
||||||
|
edit: boolean
|
||||||
|
}>()
|
||||||
|
const emit = defineEmits(["toggleMark", "added", "delete"])
|
||||||
|
|
||||||
|
const data = reactive({
|
||||||
|
godi: {}
|
||||||
|
})
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
window.addEventListener("keypress", ev => {
|
||||||
|
if(ev.key == "Enter" && props.add){
|
||||||
|
emit("added", data.godi)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
function getIconForMark(gid, mid) {
|
||||||
|
const mark = getMark(gid, mid).value
|
||||||
|
switch (mark) {
|
||||||
|
case -1:
|
||||||
|
return "remove";
|
||||||
|
case 0:
|
||||||
|
return "question_mark";
|
||||||
|
case 1:
|
||||||
|
return "close"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function getClassForMark(gid, mid) {
|
||||||
|
const mark = getMark(gid, mid).value
|
||||||
|
switch (mark) {
|
||||||
|
case -1:
|
||||||
|
return "minus";
|
||||||
|
case 0:
|
||||||
|
return "neutral";
|
||||||
|
case 1:
|
||||||
|
return "cross"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
function two(s){
|
||||||
|
return (s < 10 ? "0" : "") + s
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatDay(time) {
|
||||||
|
let date = new Date(time)
|
||||||
|
return two(date.getDate()) + "." + two(date.getMonth() + 1) + "."
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatTime(time) {
|
||||||
|
let date = new Date(time)
|
||||||
|
return two(date.getHours()) + ":" + two(date.getMinutes())
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatWeekday(time) {
|
||||||
|
let date = new Date(time)
|
||||||
|
switch(date.getDay()) {
|
||||||
|
case 1: return "Mo";
|
||||||
|
case 2: return "Di";
|
||||||
|
case 3: return "Mi";
|
||||||
|
case 4: return "Do";
|
||||||
|
case 5: return "Fr";
|
||||||
|
case 6: return "Sa";
|
||||||
|
case 0: return "So"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getMark(gid, mid) {
|
||||||
|
const mark = props.marks.find(mark => mark.mid == mid && mark.gid == gid)
|
||||||
|
return mark ? mark : {gid, mid, value: 0}
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleMark(gid, mid) {
|
||||||
|
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
|
||||||
|
<table>
|
||||||
|
|
||||||
|
<thead>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th v-for="godi in props.gottesdienste"><i @click="$emit('delete', godi.id)">delete</i></th>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th v-for="godi in props.gottesdienste">{{ godi.name }}</th>
|
||||||
|
<th class="edit" v-if="props.edit"><Input v-model:value="data.godi.name"/></th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th v-for="godi in props.gottesdienste">{{ formatDay(godi.date) }}</th>
|
||||||
|
<th class="edit" v-if="props.edit"><Input v-model:value="data.godi.date" type="date"/></th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th v-for="godi in props.gottesdienste">{{ formatTime(godi.date) }}</th>
|
||||||
|
<th class="edit" v-if="props.edit"><Input v-model:value="data.godi.time" type="time"/></th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th v-for="godi in props.gottesdienste">{{ formatTime(godi.attendance) }}</th>
|
||||||
|
<th class="edit" v-if="props.edit"><Input v-model:value="data.godi.attendance" type="time"/></th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th v-for="godi in props.gottesdienste">{{ formatWeekday(godi.date) }}</th>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
|
||||||
|
<tr v-for="mini in props.ministranten" class="ministrant">
|
||||||
|
<td>{{mini.firstname}} {{mini.lastname}}</td>
|
||||||
|
<td
|
||||||
|
v-for="godi in props.gottesdienste"
|
||||||
|
class="mark"
|
||||||
|
:class="getClassForMark(godi.id, mini.id)"
|
||||||
|
@click="$emit('toggleMark', godi.id, mini.id)">
|
||||||
|
<i class="icon"> {{getIconForMark(godi.id, mini.id)}} </i>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="less">
|
||||||
|
|
||||||
|
th.edit {
|
||||||
|
text-align: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
table{
|
||||||
|
border-spacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ministrant{
|
||||||
|
min-height: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mark {
|
||||||
|
text-align: center;
|
||||||
|
vertical-align: center;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
min-width: 100px;
|
||||||
|
height: 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
user-select: none;
|
||||||
|
|
||||||
|
i {
|
||||||
|
border-radius: 100%;
|
||||||
|
padding: 1px;
|
||||||
|
font-size: 20px;
|
||||||
|
margin: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.minus i {
|
||||||
|
background: #f92626;
|
||||||
|
color: #690b0b;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.cross i{
|
||||||
|
background: #15bf15;
|
||||||
|
color: #045b04;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.neutral i{
|
||||||
|
color: #c0c0c0;
|
||||||
|
font-variation-settings: "wght" 350;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tr:nth-child(5n) td{
|
||||||
|
border-bottom: 1px solid black;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
86
public/src/components/TheWelcome.vue
Normal file
86
public/src/components/TheWelcome.vue
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import WelcomeItem from './WelcomeItem.vue'
|
||||||
|
import DocumentationIcon from './icons/IconDocumentation.vue'
|
||||||
|
import ToolingIcon from './icons/IconTooling.vue'
|
||||||
|
import EcosystemIcon from './icons/IconEcosystem.vue'
|
||||||
|
import CommunityIcon from './icons/IconCommunity.vue'
|
||||||
|
import SupportIcon from './icons/IconSupport.vue'
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<WelcomeItem>
|
||||||
|
<template #icon>
|
||||||
|
<DocumentationIcon />
|
||||||
|
</template>
|
||||||
|
<template #heading>Documentation</template>
|
||||||
|
|
||||||
|
Vue’s
|
||||||
|
<a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
|
||||||
|
provides you with all information you need to get started.
|
||||||
|
</WelcomeItem>
|
||||||
|
|
||||||
|
<WelcomeItem>
|
||||||
|
<template #icon>
|
||||||
|
<ToolingIcon />
|
||||||
|
</template>
|
||||||
|
<template #heading>Tooling</template>
|
||||||
|
|
||||||
|
This project is served and bundled with
|
||||||
|
<a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
|
||||||
|
recommended IDE setup is
|
||||||
|
<a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a> +
|
||||||
|
<a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>. If
|
||||||
|
you need to test your components and web pages, check out
|
||||||
|
<a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a> and
|
||||||
|
<a href="https://on.cypress.io/component" target="_blank">Cypress Component Testing</a>.
|
||||||
|
|
||||||
|
<br />
|
||||||
|
|
||||||
|
More instructions are available in <code>README.md</code>.
|
||||||
|
</WelcomeItem>
|
||||||
|
|
||||||
|
<WelcomeItem>
|
||||||
|
<template #icon>
|
||||||
|
<EcosystemIcon />
|
||||||
|
</template>
|
||||||
|
<template #heading>Ecosystem</template>
|
||||||
|
|
||||||
|
Get official tools and libraries for your project:
|
||||||
|
<a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
|
||||||
|
<a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
|
||||||
|
<a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
|
||||||
|
<a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
|
||||||
|
you need more resources, we suggest paying
|
||||||
|
<a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
|
||||||
|
a visit.
|
||||||
|
</WelcomeItem>
|
||||||
|
|
||||||
|
<WelcomeItem>
|
||||||
|
<template #icon>
|
||||||
|
<CommunityIcon />
|
||||||
|
</template>
|
||||||
|
<template #heading>Community</template>
|
||||||
|
|
||||||
|
Got stuck? Ask your question on
|
||||||
|
<a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>, our official
|
||||||
|
Discord server, or
|
||||||
|
<a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
|
||||||
|
>StackOverflow</a
|
||||||
|
>. You should also subscribe to
|
||||||
|
<a href="https://news.vuejs.org" target="_blank" rel="noopener">our mailing list</a> and follow
|
||||||
|
the official
|
||||||
|
<a href="https://twitter.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
|
||||||
|
twitter account for latest news in the Vue world.
|
||||||
|
</WelcomeItem>
|
||||||
|
|
||||||
|
<WelcomeItem>
|
||||||
|
<template #icon>
|
||||||
|
<SupportIcon />
|
||||||
|
</template>
|
||||||
|
<template #heading>Support Vue</template>
|
||||||
|
|
||||||
|
As an independent project, Vue relies on community backing for its sustainability. You can help
|
||||||
|
us by
|
||||||
|
<a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
|
||||||
|
</WelcomeItem>
|
||||||
|
</template>
|
||||||
87
public/src/components/WelcomeItem.vue
Normal file
87
public/src/components/WelcomeItem.vue
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
<template>
|
||||||
|
<div class="item">
|
||||||
|
<i>
|
||||||
|
<slot name="icon"></slot>
|
||||||
|
</i>
|
||||||
|
<div class="details">
|
||||||
|
<h3>
|
||||||
|
<slot name="heading"></slot>
|
||||||
|
</h3>
|
||||||
|
<slot></slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.item {
|
||||||
|
margin-top: 2rem;
|
||||||
|
display: flex;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.details {
|
||||||
|
flex: 1;
|
||||||
|
margin-left: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
display: flex;
|
||||||
|
place-items: center;
|
||||||
|
place-content: center;
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
font-size: 1.2rem;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-bottom: 0.4rem;
|
||||||
|
color: var(--color-heading);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1024px) {
|
||||||
|
.item {
|
||||||
|
margin-top: 0;
|
||||||
|
padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
top: calc(50% - 25px);
|
||||||
|
left: -26px;
|
||||||
|
position: absolute;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
background: var(--color-background);
|
||||||
|
border-radius: 8px;
|
||||||
|
width: 50px;
|
||||||
|
height: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:before {
|
||||||
|
content: ' ';
|
||||||
|
border-left: 1px solid var(--color-border);
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
bottom: calc(50% + 25px);
|
||||||
|
height: calc(50% - 25px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:after {
|
||||||
|
content: ' ';
|
||||||
|
border-left: 1px solid var(--color-border);
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: calc(50% + 25px);
|
||||||
|
height: calc(50% - 25px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:first-of-type:before {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:last-of-type:after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
7
public/src/components/icons/IconCommunity.vue
Normal file
7
public/src/components/icons/IconCommunity.vue
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<template>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
|
||||||
|
<path
|
||||||
|
d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
7
public/src/components/icons/IconDocumentation.vue
Normal file
7
public/src/components/icons/IconDocumentation.vue
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<template>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
|
||||||
|
<path
|
||||||
|
d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
7
public/src/components/icons/IconEcosystem.vue
Normal file
7
public/src/components/icons/IconEcosystem.vue
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<template>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
|
||||||
|
<path
|
||||||
|
d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
7
public/src/components/icons/IconSupport.vue
Normal file
7
public/src/components/icons/IconSupport.vue
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<template>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
|
||||||
|
<path
|
||||||
|
d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
19
public/src/components/icons/IconTooling.vue
Normal file
19
public/src/components/icons/IconTooling.vue
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
|
||||||
|
<template>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
aria-hidden="true"
|
||||||
|
role="img"
|
||||||
|
class="iconify iconify--mdi"
|
||||||
|
width="24"
|
||||||
|
height="24"
|
||||||
|
preserveAspectRatio="xMidYMid meet"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
|
||||||
|
fill="currentColor"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
11
public/src/main.ts
Normal file
11
public/src/main.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import './assets/main.css'
|
||||||
|
|
||||||
|
import { createApp } from 'vue'
|
||||||
|
import App from './App.vue'
|
||||||
|
import router from './router'
|
||||||
|
|
||||||
|
const app = createApp(App)
|
||||||
|
|
||||||
|
app.use(router)
|
||||||
|
|
||||||
|
app.mount('#app')
|
||||||
25
public/src/models/models.ts
Normal file
25
public/src/models/models.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
export interface Gottesdienst {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
date: Date
|
||||||
|
attendance: Date
|
||||||
|
planId: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SimplifiedMinistrant {
|
||||||
|
id: number,
|
||||||
|
firstname: string,
|
||||||
|
lastname: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Mark {
|
||||||
|
mid: number,
|
||||||
|
gid: number,
|
||||||
|
value: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PlanModel {
|
||||||
|
gottesdienste: Array<Gottesdienst>,
|
||||||
|
ministranten: Array<SimplifiedMinistrant>,
|
||||||
|
marks: Array<Mark>
|
||||||
|
}
|
||||||
15
public/src/router/index.ts
Normal file
15
public/src/router/index.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { createRouter, createWebHistory } from 'vue-router'
|
||||||
|
import HomeView from '../views/PlanView.vue'
|
||||||
|
|
||||||
|
const router = createRouter({
|
||||||
|
history: createWebHistory(import.meta.env.BASE_URL),
|
||||||
|
routes: [
|
||||||
|
{
|
||||||
|
path: '/',
|
||||||
|
name: 'home',
|
||||||
|
component: HomeView
|
||||||
|
},
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
export default router
|
||||||
93
public/src/views/PlanView.vue
Normal file
93
public/src/views/PlanView.vue
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import {computed, onMounted, reactive, ref} from "vue";
|
||||||
|
import Plan from "@/components/Plan.vue";
|
||||||
|
import {API} from "@/views/api";
|
||||||
|
import type {PlanModel} from "@/models/models";
|
||||||
|
|
||||||
|
const plan = reactive<PlanModel>({
|
||||||
|
gottesdienste: [],
|
||||||
|
ministranten: [],
|
||||||
|
marks: []
|
||||||
|
})
|
||||||
|
|
||||||
|
const sortedGottesdienste = computed(() => {
|
||||||
|
return plan.gottesdienste.sort((a, b) => {
|
||||||
|
console.log(a, b)
|
||||||
|
return a.date - b.date
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
async function addGodi(data) {
|
||||||
|
console.log(data)
|
||||||
|
let date = Date.parse(data.date + "T" + data.time);
|
||||||
|
let attendance = data.attendance && data.attendance != ""
|
||||||
|
? Date.parse(data.date + "T" + data.attendance)
|
||||||
|
: (date - 1000*60*30)
|
||||||
|
console.log(date, attendance, data.date + "T" + data.attendance)
|
||||||
|
let newGodi = await API.addGottesdienst(
|
||||||
|
data.name,
|
||||||
|
new Date(date),
|
||||||
|
new Date(attendance),
|
||||||
|
0
|
||||||
|
)
|
||||||
|
console.log(newGodi)
|
||||||
|
plan.gottesdienste.push(newGodi)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deleteGottedienst(id) {
|
||||||
|
let deleted = await API.deleteGottesdienst(id)
|
||||||
|
if(deleted) {
|
||||||
|
let index = plan.gottesdienste.findIndex(godi => godi.id == id)
|
||||||
|
plan.gottesdienste.splice(index, 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
let fetchedPlan = await API.getPlan(0)
|
||||||
|
plan.gottesdienste = fetchedPlan.gottesdienste
|
||||||
|
plan.ministranten = fetchedPlan.ministranten
|
||||||
|
plan.marks = fetchedPlan.marks
|
||||||
|
})
|
||||||
|
|
||||||
|
function toggleMark(gid, mid) {
|
||||||
|
// TODO: track changes
|
||||||
|
let existingMark = plan.marks.find(mark => mark.mid == mid && mark.gid == gid);
|
||||||
|
if(existingMark) {
|
||||||
|
existingMark.value = ((existingMark.value + 2) % 3) - 1
|
||||||
|
console.log(existingMark.value.valueOf())
|
||||||
|
}else{
|
||||||
|
const mark = {
|
||||||
|
gid, mid, value: 1
|
||||||
|
}
|
||||||
|
plan.marks.push(mark)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<main>
|
||||||
|
|
||||||
|
<Plan
|
||||||
|
:gottesdienste="sortedGottesdienste"
|
||||||
|
:ministranten="plan.ministranten"
|
||||||
|
:marks="plan.marks"
|
||||||
|
:edit="false"
|
||||||
|
@added="addGodi"
|
||||||
|
@delete="deleteGottedienst"
|
||||||
|
@toggle-mark="toggleMark">
|
||||||
|
|
||||||
|
</Plan>
|
||||||
|
|
||||||
|
<button @click="addGodi">Add random Gottesdienst</button>
|
||||||
|
|
||||||
|
</main>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<style scoped lang="less">
|
||||||
|
</style>
|
||||||
64
public/src/views/api.ts
Normal file
64
public/src/views/api.ts
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
import type {Gottesdienst} from "@/models/models";
|
||||||
|
|
||||||
|
|
||||||
|
const API_ENDPOINT = "http://0.0.0.0:8080/api"
|
||||||
|
|
||||||
|
async function api(endpoint: string, method: string = "GET", body?: any ) {
|
||||||
|
let isJson = (typeof body == "object")
|
||||||
|
return fetch(API_ENDPOINT + endpoint, {
|
||||||
|
method: method,
|
||||||
|
body: isJson ? JSON.stringify(body) : body,
|
||||||
|
headers: {
|
||||||
|
Accept: "application/json",
|
||||||
|
"Content-Type": (isJson ? "application/json" : "text/plain"),
|
||||||
|
"Access-Control-Allow-Origin": "*"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export namespace API {
|
||||||
|
|
||||||
|
export async function getPlan(id: number) {
|
||||||
|
return api(`/plan?id=${id}`).then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
return {
|
||||||
|
gottesdienste: data.gottesdienste,
|
||||||
|
ministranten: data.ministranten,
|
||||||
|
marks: data.marks
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatGottesdienste(data: any): Array<Gottesdienst>{
|
||||||
|
return data.map(json => {
|
||||||
|
json["date"] = new Date(json["date"])
|
||||||
|
json["attendance"] = new Date(json["attendance"])
|
||||||
|
return json as Gottesdienst
|
||||||
|
}) as Array<Gottesdienst>
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function addGottesdienst(
|
||||||
|
name: string = "",
|
||||||
|
date: Date,
|
||||||
|
attendance: Date = new Date(date.getTime() - 1000*60*30),
|
||||||
|
planId: number
|
||||||
|
){
|
||||||
|
return api("/gottesdienste", "PUT", {
|
||||||
|
id: 0, name, date: date.getTime(), attendance: attendance.getTime(), planId
|
||||||
|
}).then(res => res.json())
|
||||||
|
.then(json => {
|
||||||
|
return {
|
||||||
|
id: json.id, name, date, attendance, planId
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteGottesdienst(id) {
|
||||||
|
return api("/gottesdienste?id=" + id, "DELETE")
|
||||||
|
.then(data => data.status == 200)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
12
public/tsconfig.app.json
Normal file
12
public/tsconfig.app.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"extends": "@vue/tsconfig/tsconfig.dom.json",
|
||||||
|
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
|
||||||
|
"exclude": ["src/**/__tests__/*"],
|
||||||
|
"compilerOptions": {
|
||||||
|
"composite": true,
|
||||||
|
"baseUrl": ".",
|
||||||
|
"paths": {
|
||||||
|
"@/*": ["./src/*"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
public/tsconfig.json
Normal file
11
public/tsconfig.json
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"files": [],
|
||||||
|
"references": [
|
||||||
|
{
|
||||||
|
"path": "./tsconfig.node.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "./tsconfig.app.json"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
16
public/tsconfig.node.json
Normal file
16
public/tsconfig.node.json
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"extends": "@tsconfig/node18/tsconfig.json",
|
||||||
|
"include": [
|
||||||
|
"vite.config.*",
|
||||||
|
"vitest.config.*",
|
||||||
|
"cypress.config.*",
|
||||||
|
"nightwatch.conf.*",
|
||||||
|
"playwright.config.*"
|
||||||
|
],
|
||||||
|
"compilerOptions": {
|
||||||
|
"composite": true,
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "Bundler",
|
||||||
|
"types": ["node"]
|
||||||
|
}
|
||||||
|
}
|
||||||
16
public/vite.config.ts
Normal file
16
public/vite.config.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { fileURLToPath, URL } from 'node:url'
|
||||||
|
|
||||||
|
import { defineConfig } from 'vite'
|
||||||
|
import vue from '@vitejs/plugin-vue'
|
||||||
|
|
||||||
|
// https://vitejs.dev/config/
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [
|
||||||
|
vue(),
|
||||||
|
],
|
||||||
|
resolve: {
|
||||||
|
alias: {
|
||||||
|
'@': fileURLToPath(new URL('./src', import.meta.url))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
Loading…
Reference in New Issue
Block a user