liosha84
@@ -109,6 +109,42 @@ docker-compose -f src/Docker/docker-compose.yml up -d
|
|||||||
```
|
```
|
||||||
- For connection from pgadmin use
|
- For connection from pgadmin use
|
||||||
hostename: **host.docker.internal**
|
hostename: **host.docker.internal**
|
||||||
|
|
||||||
|
# How to run the application in Docker with HTTPS support
|
||||||
|
|
||||||
|
To run the application in Docker with HTTPS support, follow these steps:
|
||||||
|
|
||||||
|
1. **Cerbot**
|
||||||
|
|
||||||
|
- Run this command below to get certificate and store it to volume certs.
|
||||||
|
|
||||||
|
- Expanded(readable) command example:
|
||||||
|
|
||||||
|
docker run -d \
|
||||||
|
--name certbot \
|
||||||
|
-v certs:/etc/letsencrypt \
|
||||||
|
-v certs-data:/var/lib/letsencrypt \
|
||||||
|
-p 80:80 \
|
||||||
|
-p 443:443 \
|
||||||
|
certbot/certbot \
|
||||||
|
certonly --standalone --preferred-challenges http --email youremail@gmail.com -d yourdomain.com --agree-tos
|
||||||
|
|
||||||
|
- Command to run certbot with specific domain and email:
|
||||||
|
```bash
|
||||||
|
docker run -d --name certbot -v certs:/etc/letsencrypt -v certs-data:/var/lib/letsencrypt -p 8081:80 -p 8443:443 certbot/certbot certonly --standalone --preferred-challenges http --email liosha84@gmail.com -d jambotron.run.place --agree-tos
|
||||||
|
```
|
||||||
|
- Tip: You can generate certificate to local machine used next command:
|
||||||
|
```bash
|
||||||
|
docker run -it --rm -p 8081:80 --name certbot -v "C:\certbot\etc\letsencrypt:/etc/letsencrypt" -v "C:\certbot\var\lib\letsencrypt:/var/lib/letsencrypt" certbot/certbot certonly --standalone -d jambotron.run.place
|
||||||
|
```
|
||||||
|
certificate files will be stored in `C:\certbot\etc\letsencrypt` and `C:\certbot\var\lib\letsencrypt` directories.
|
||||||
|
|
||||||
|
- If you have same trouble before running certbot, run this project
|
||||||
|
`Helper_projects/spring-boot-https-main` insted of jambotron project.
|
||||||
|
|
||||||
|
|
||||||
|
- TODO: Add cron job to renew certificate automatically.
|
||||||
|
|
||||||
### Reference Documentation
|
### Reference Documentation
|
||||||
For further reference, please consider the following sections:
|
For further reference, please consider the following sections:
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
HELP.md
|
||||||
|
.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/
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
FROM openjdk:20 as build
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . ./
|
||||||
|
RUN microdnf install findutils
|
||||||
|
RUN ./gradlew build -x test
|
||||||
|
|
||||||
|
FROM openjdk:20-jdk-slim
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build /app/build/libs/spring-boot-https-0.0.1.jar .
|
||||||
|
CMD ["java", "-jar", "spring-boot-https-0.0.1.jar"]
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
https://dev.to/beksultandev/how-to-add-https-support-to-your-spring-boot-app-2h53
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
id 'org.springframework.boot' version '3.1.5'
|
||||||
|
id 'io.spring.dependency-management' version '1.1.3'
|
||||||
|
}
|
||||||
|
|
||||||
|
group = 'dev.beksultan'
|
||||||
|
version = '0.0.1'
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = '17'
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('bootBuildImage') {
|
||||||
|
builder = 'paketobuildpacks/builder-jammy-base:latest'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('test') {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
services:
|
||||||
|
spring-boot-https:
|
||||||
|
container_name: spring-boot-https
|
||||||
|
image: beksultancs/spring-boot-https:1
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8081:80"
|
||||||
|
- "8443:443"
|
||||||
|
volumes:
|
||||||
|
- certs:/certs
|
||||||
|
environment:
|
||||||
|
- SERVER_PORT=443
|
||||||
|
- FULLCHAINPEM=/certs/live/jambotron.run.place/fullchain.pem
|
||||||
|
- PRIVKEYPEM=/certs/live/jambotron.run.place/privkey.pem
|
||||||
|
volumes:
|
||||||
|
certs:
|
||||||
|
external: true
|
||||||
Binary file not shown.
+7
@@ -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
|
||||||
+249
@@ -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" "$@"
|
||||||
@@ -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
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
rootProject.name = 'spring-boot-https'
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
package https;
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
@RestController
|
||||||
|
public class SpringBootHttpsApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(SpringBootHttpsApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/hello")
|
||||||
|
public String hello() {
|
||||||
|
return "Hello World! 🚀";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
server.ssl.enabled=true
|
||||||
|
server.ssl.certificate=${FULLCHAINPEM}
|
||||||
|
server.ssl.certificate-private-key=${PRIVKEYPEM}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
server:
|
||||||
|
ssl:
|
||||||
|
enabled: true
|
||||||
|
certificate: ${FULLCHAINPEM}
|
||||||
|
certificate-private-key: ${PRIVKEYPEM}
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
package https;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
class SpringBootHttpsApplicationTests {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void contextLoads() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+49
-1
@@ -15,6 +15,7 @@ java {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,6 +38,9 @@ dependencies {
|
|||||||
|
|
||||||
implementation 'org.springframework.ai:spring-ai-zhipuai-spring-boot-starter:1.0.0-M6'
|
implementation 'org.springframework.ai:spring-ai-zhipuai-spring-boot-starter:1.0.0-M6'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//implementation 'org.springframework.ai:spring-ai-starter-model-zhipuai'
|
//implementation 'org.springframework.ai:spring-ai-starter-model-zhipuai'
|
||||||
//implementation 'org.springframework.ai:spring-ai-zhipuai-spring-boot-starter'
|
//implementation 'org.springframework.ai:spring-ai-zhipuai-spring-boot-starter'
|
||||||
//implementation platform("org.springframework.ai:spring-ai-bom:1.0.0-SNAPSHOT")
|
//implementation platform("org.springframework.ai:spring-ai-bom:1.0.0-SNAPSHOT")
|
||||||
@@ -94,8 +98,52 @@ apply plugin: 'java'
|
|||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
tasks.register('buildAngular_dev', Exec) {
|
||||||
|
//dependsOn deleteStaticFolder
|
||||||
|
workingDir './jambotron-ui' // Path to your Angular project (e.g., './angular-app')
|
||||||
|
executable 'npm.cmd' // Use 'npm' for Unix-like systems or 'npm.cmd' for Windows
|
||||||
|
|
||||||
|
// Your Angular build command
|
||||||
|
args = ['run', 'build_dev']//do not forget build_dev used port 8080 for connect to backend rest api
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('buildAngular', Exec) {
|
||||||
|
//dependsOn deleteStaticFolder
|
||||||
|
workingDir './jambotron-ui' // Path to your Angular project (e.g., './angular-app')
|
||||||
|
executable 'npm.cmd' // Use 'npm' for Unix-like systems or 'npm.cmd' for Windows
|
||||||
|
|
||||||
|
// Your Angular build command
|
||||||
|
args = ['run', 'build']//do not forget build_dev used port 8080 for connect to backend rest api
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
tasks.register('deleteStaticFolder', Delete) {
|
||||||
|
dependsOn buildAngular
|
||||||
|
def dirName = "src/main/resources/static"
|
||||||
|
file(dirName).list().each {
|
||||||
|
f ->
|
||||||
|
delete "${dirName}/${f}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('deleteStaticFolder_dev', Delete) {
|
||||||
|
dependsOn buildAngular_dev
|
||||||
|
def dirName = "src/main/resources/static"
|
||||||
|
file(dirName).list().each {
|
||||||
|
f ->
|
||||||
|
delete "${dirName}/${f}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tasks.register('copyAngularBuild', Copy) {
|
tasks.register('copyAngularBuild', Copy) {
|
||||||
//dependsOn buildAngular
|
dependsOn deleteStaticFolder
|
||||||
|
from 'jambotron-ui/dist/jambotron-ui' // Path to your Angular dist folder
|
||||||
|
into "src/main/resources/static" // Path INSIDE the WAR
|
||||||
|
}
|
||||||
|
tasks.register('copyAngularBuild_dev', Copy) {
|
||||||
|
dependsOn deleteStaticFolder_dev
|
||||||
from 'jambotron-ui/dist/jambotron-ui' // Path to your Angular dist folder
|
from 'jambotron-ui/dist/jambotron-ui' // Path to your Angular dist folder
|
||||||
into "src/main/resources/static" // Path INSIDE the WAR
|
into "src/main/resources/static" // Path INSIDE the WAR
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@@ -20,7 +20,6 @@
|
|||||||
"outputPath": "dist/jambotron-ui",
|
"outputPath": "dist/jambotron-ui",
|
||||||
"index": "src/index.html",
|
"index": "src/index.html",
|
||||||
"main": "src/main.ts",
|
"main": "src/main.ts",
|
||||||
|
|
||||||
"polyfills": [
|
"polyfills": [
|
||||||
"zone.js"
|
"zone.js"
|
||||||
],
|
],
|
||||||
@@ -48,6 +47,12 @@
|
|||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/environments/environment.ts",
|
||||||
|
"with": "src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
],
|
||||||
"budgets": [
|
"budgets": [
|
||||||
{
|
{
|
||||||
"type": "initial",
|
"type": "initial",
|
||||||
@@ -78,6 +83,7 @@
|
|||||||
},
|
},
|
||||||
"serve": {
|
"serve": {
|
||||||
"builder": "@angular-devkit/build-angular:dev-server",
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
"buildTarget": "jambotron-ui:build:production"
|
"buildTarget": "jambotron-ui:build:production"
|
||||||
|
|||||||
@@ -4,8 +4,10 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
|
"start_prod": "ng serve --configuration production",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
"watch": "ng build --watch --configuration development",
|
"watch": "ng build --watch --configuration development",
|
||||||
|
"build_dev":"ng build --configuration development",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"serve:ssr:jambotron-ui": "node dist/jambotron-ui/server/server.mjs"
|
"serve:ssr:jambotron-ui": "node dist/jambotron-ui/server/server.mjs"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AdminModuleService } from './admin-module.service';
|
||||||
|
|
||||||
|
describe('AdminModuleService', () => {
|
||||||
|
let service: AdminModuleService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(AdminModuleService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {Observable} from 'rxjs';
|
||||||
|
import {HttpClient} from '@angular/common/http';
|
||||||
|
import {User} from '../models/user.model';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class AdminModuleService {
|
||||||
|
baseUrl = GlobalConstants.API_URL;
|
||||||
|
|
||||||
|
constructor(private http: HttpClient) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
updateUserRoles(id: any,data: User): Observable<any> {
|
||||||
|
return this.http.put(`${this.baseUrl}/users/${id}`, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,28 +1,13 @@
|
|||||||
<!--<p>admin.component works!</p>-->
|
<app-side-bar-admin
|
||||||
|
|
||||||
<app-navigation
|
|
||||||
class="pc-sidebar"
|
class="pc-sidebar"
|
||||||
[ngClass]="{
|
>
|
||||||
'navbar-collapsed': navCollapsed,
|
</app-side-bar-admin>
|
||||||
'mob-open': navCollapsedMob
|
|
||||||
}"
|
|
||||||
(NavCollapse)="this.navCollapsed = !this.navCollapsed"
|
|
||||||
/>
|
|
||||||
<app-nav-bar (NavCollapsedMob)="navMobClick()" (NavCollapse)="this.navCollapsed = !this.navCollapsed"/>
|
|
||||||
<div class="pc-container">
|
<div class="pc-container">
|
||||||
<div class="coded-wrapper">
|
|
||||||
<div class="coded-content">
|
|
||||||
<div class="coded-inner-content">
|
|
||||||
<app-breadcrumb />
|
<app-breadcrumb />
|
||||||
<div class="main-body">
|
|
||||||
<div class="page-wrapper">
|
|
||||||
<router-outlet />
|
<router-outlet />
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="pc-menu-overlay" (click)="closeMenu()" (keydown)="handleKeyDown($event)" tabindex="0"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +1,16 @@
|
|||||||
.example-container {
|
//---------------
|
||||||
width: 500px;
|
|
||||||
height: 300px;
|
|
||||||
border: 1px solid rgba(0, 0, 0, 0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
.example-sidenav-content {
|
|
||||||
display: flex;
|
|
||||||
height: 100%;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.example-sidenav {
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pc-sidebar{
|
.pc-sidebar{
|
||||||
top: 120px;
|
top: 65px;
|
||||||
|
overflow-y: auto;
|
||||||
|
background-color: rgba(153, 153, 153, 0.16);
|
||||||
|
|
||||||
|
backdrop-filter: blur(8px);
|
||||||
|
}
|
||||||
|
.pc-container{
|
||||||
|
top: 0px;
|
||||||
|
padding-left: 5px;
|
||||||
|
padding-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {MatButton} from '@angular/material/button';
|
|||||||
import { ScrollPanelModule } from 'primeng/scrollpanel';
|
import { ScrollPanelModule } from 'primeng/scrollpanel';
|
||||||
import {MenuItem} from 'primeng/api';
|
import {MenuItem} from 'primeng/api';
|
||||||
import {PanelMenu} from 'primeng/panelmenu';
|
import {PanelMenu} from 'primeng/panelmenu';
|
||||||
|
import {SideBarAdminComponent} from '../side-bar-admin.component/side-bar-admin.component';
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-admin.component',
|
selector: 'app-admin.component',
|
||||||
imports: [
|
imports: [
|
||||||
@@ -24,6 +25,7 @@ import {PanelMenu} from 'primeng/panelmenu';
|
|||||||
RouterLink,
|
RouterLink,
|
||||||
PanelMenu,
|
PanelMenu,
|
||||||
NgStyle,
|
NgStyle,
|
||||||
|
SideBarAdminComponent,
|
||||||
|
|
||||||
],
|
],
|
||||||
schemas:[CUSTOM_ELEMENTS_SCHEMA],
|
schemas:[CUSTOM_ELEMENTS_SCHEMA],
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const ADMIN_ROUTES: Routes = [
|
|||||||
|
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
path: 'welcome',
|
path: 'admin-welcome',
|
||||||
loadComponent: () => import('../admin-module/admin-welcome.component/admin-welcome.component').then((c) => c.AdminWelcomeComponent),
|
loadComponent: () => import('../admin-module/admin-welcome.component/admin-welcome.component').then((c) => c.AdminWelcomeComponent),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -17,8 +17,11 @@ const ADMIN_ROUTES: Routes = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'system',
|
path: 'system',
|
||||||
|
|
||||||
loadComponent: () => import('../admin-module/system.component/system.component').then((c) => c.SystemComponent)
|
loadComponent: () => import('../admin-module/system.component/system.component').then((c) => c.SystemComponent)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'users',
|
||||||
|
loadComponent: () => import('../admin-module/users.component/users.component').then((c) => c.UsersComponent)
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
+35
@@ -0,0 +1,35 @@
|
|||||||
|
<mat-nav-list>
|
||||||
|
<a mat-list-item routerLink="admin-welcome">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>house</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Dashboard</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<a mat-list-item routerLink="users">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>newspaper</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Users</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<a mat-list-item routerLink="settings">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>newspaper</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Settings</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<a mat-list-item routerLink="system">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>newspaper</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >System</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</mat-nav-list>
|
||||||
|
|
||||||
+14
@@ -0,0 +1,14 @@
|
|||||||
|
.entry{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
padding:0.75rem;
|
||||||
|
color: rgba(24, 255, 255, 0.96);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
a.mdc-list-item
|
||||||
|
{
|
||||||
|
|
||||||
|
background-color: rgba(24,255,255,0.04);
|
||||||
|
}
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SideBarAdminComponent } from './side-bar-admin.component';
|
||||||
|
|
||||||
|
describe('SideBarAdminComponent', () => {
|
||||||
|
let component: SideBarAdminComponent;
|
||||||
|
let fixture: ComponentFixture<SideBarAdminComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [SideBarAdminComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(SideBarAdminComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
||||||
|
import {MatListItem, MatNavList} from '@angular/material/list';
|
||||||
|
import {RouterLink} from '@angular/router';
|
||||||
|
import {MatIcon} from '@angular/material/icon';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-side-bar-admin',
|
||||||
|
imports: [
|
||||||
|
MatIcon,
|
||||||
|
MatListItem,
|
||||||
|
MatNavList,
|
||||||
|
RouterLink
|
||||||
|
],
|
||||||
|
templateUrl: './side-bar-admin.component.html',
|
||||||
|
styleUrl: './side-bar-admin.component.scss',
|
||||||
|
schemas:[CUSTOM_ELEMENTS_SCHEMA]
|
||||||
|
})
|
||||||
|
export class SideBarAdminComponent {
|
||||||
|
isCollapsed = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
<table mat-table [dataSource]="users">
|
||||||
|
@for (column of columnsSchema; track column){
|
||||||
|
<ng-container [matColumnDef]="column.key">
|
||||||
|
<th mat-header-cell *matHeaderCellDef>
|
||||||
|
{{column.label}}
|
||||||
|
</th>
|
||||||
|
<td mat-cell *matCellDef="let element">
|
||||||
|
@switch (column.type) {
|
||||||
|
@case ('list') {
|
||||||
|
<mat-form-field class="example-chip-list">
|
||||||
|
<mat-chip-grid #chipGrid aria-label="Role selection">
|
||||||
|
@for (role of element.roles; track $index) {
|
||||||
|
<mat-chip-row (removed)="remove(role,element)">
|
||||||
|
{{role.name}}
|
||||||
|
|
||||||
|
<mat-icon
|
||||||
|
matChipRemove
|
||||||
|
[attr.aria-label]="'remove ' + role.name"
|
||||||
|
>
|
||||||
|
cancel
|
||||||
|
</mat-icon>
|
||||||
|
|
||||||
|
</mat-chip-row>
|
||||||
|
}
|
||||||
|
</mat-chip-grid>
|
||||||
|
<input
|
||||||
|
name="currentRole"
|
||||||
|
placeholder="Add role..."
|
||||||
|
[matChipInputFor]="chipGrid"
|
||||||
|
[matAutocomplete]="auto"
|
||||||
|
[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
|
||||||
|
[formControl]="rolesControl"
|
||||||
|
[matChipInputAddOnBlur]="true"
|
||||||
|
(matChipInputTokenEnd)="add($event,element)"
|
||||||
|
(input)="change($event,filteredRoles(element.roles))"
|
||||||
|
/>
|
||||||
|
<mat-autocomplete [formControl]="ac"
|
||||||
|
autoActiveFirstOption
|
||||||
|
#auto
|
||||||
|
(optionSelected)="selected(element,$event); ">
|
||||||
|
@for (role of filteredRoles(element.roles); track role) {
|
||||||
|
<mat-option [value]="role">{{role.name}}</mat-option>
|
||||||
|
}
|
||||||
|
</mat-autocomplete>
|
||||||
|
</mat-form-field>
|
||||||
|
}
|
||||||
|
@default {
|
||||||
|
{{ element[column.key] }}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</td>
|
||||||
|
</ng-container>
|
||||||
|
}
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
|
||||||
|
</table>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
.example-chip-list {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { UsersComponent } from './users.component';
|
||||||
|
|
||||||
|
describe('UsersComponent', () => {
|
||||||
|
let component: UsersComponent;
|
||||||
|
let fixture: ComponentFixture<UsersComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [UsersComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(UsersComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
import {ChangeDetectionStrategy, Component, CUSTOM_ELEMENTS_SCHEMA, model} from '@angular/core';
|
||||||
|
import {UserService} from '../../services/user.service';
|
||||||
|
import {RolesService} from '../../services/roles.service';
|
||||||
|
import {Role} from '../../models/role';
|
||||||
|
import {User} from '../../models/user.model';
|
||||||
|
import {
|
||||||
|
MatCell,
|
||||||
|
MatCellDef, MatColumnDef,
|
||||||
|
MatHeaderCell, MatHeaderCellDef,
|
||||||
|
MatHeaderRow,
|
||||||
|
MatHeaderRowDef,
|
||||||
|
MatRow,
|
||||||
|
MatRowDef, MatTable
|
||||||
|
} from '@angular/material/table';
|
||||||
|
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
|
||||||
|
import {
|
||||||
|
MatAutocomplete,
|
||||||
|
MatAutocompleteSelectedEvent,
|
||||||
|
MatAutocompleteTrigger,
|
||||||
|
MatOption
|
||||||
|
} from '@angular/material/autocomplete';
|
||||||
|
import {
|
||||||
|
MatChip,
|
||||||
|
MatChipGrid,
|
||||||
|
MatChipInput,
|
||||||
|
MatChipInputEvent,
|
||||||
|
MatChipRow,
|
||||||
|
MatChipsModule
|
||||||
|
} from '@angular/material/chips';
|
||||||
|
import {MatIcon} from '@angular/material/icon';
|
||||||
|
import {COMMA, ENTER} from '@angular/cdk/keycodes';
|
||||||
|
import {MatFormField} from '@angular/material/input';
|
||||||
|
import {MatSelect, MatSelectTrigger} from '@angular/material/select';
|
||||||
|
import {AdminModuleService} from '../admin-module.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-users.component',
|
||||||
|
imports: [
|
||||||
|
MatCell,
|
||||||
|
MatCellDef,
|
||||||
|
MatHeaderCell,
|
||||||
|
MatHeaderRow,
|
||||||
|
MatHeaderRowDef,
|
||||||
|
MatRow,
|
||||||
|
MatRowDef,
|
||||||
|
MatTable,
|
||||||
|
MatColumnDef,
|
||||||
|
MatHeaderCellDef,
|
||||||
|
FormsModule,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
MatChipGrid,
|
||||||
|
MatChipRow,
|
||||||
|
MatIcon,
|
||||||
|
MatAutocompleteTrigger,
|
||||||
|
MatChipInput,
|
||||||
|
MatAutocomplete,
|
||||||
|
MatOption,
|
||||||
|
MatFormField,
|
||||||
|
MatSelect,
|
||||||
|
MatSelectTrigger,
|
||||||
|
MatChip,
|
||||||
|
MatChipsModule
|
||||||
|
],
|
||||||
|
templateUrl: './users.component.html',
|
||||||
|
styleUrl: './users.component.scss',
|
||||||
|
schemas: [CUSTOM_ELEMENTS_SCHEMA]
|
||||||
|
})
|
||||||
|
export class UsersComponent {
|
||||||
|
|
||||||
|
readonly separatorKeysCodes: number[] = [ENTER, COMMA];
|
||||||
|
allRoles:Role[] = [];
|
||||||
|
users: User[] = [];
|
||||||
|
|
||||||
|
displayedColumns: string[] = UserColumns.map((col) => col.key)
|
||||||
|
columnsSchema: any = UserColumns
|
||||||
|
|
||||||
|
readonly currentRole = model('');
|
||||||
|
|
||||||
|
rolesControl = new FormControl([]);
|
||||||
|
protected ac = new FormControl('');
|
||||||
|
|
||||||
|
constructor(private userService: UserService,
|
||||||
|
private roleService: RolesService,
|
||||||
|
private adminService:AdminModuleService) {
|
||||||
|
this.getAllRoles();
|
||||||
|
this.getUsers();
|
||||||
|
}
|
||||||
|
|
||||||
|
getAllRoles():any{
|
||||||
|
this.roleService.getAllRoles().subscribe(
|
||||||
|
(data : any) => {
|
||||||
|
this.allRoles = data;
|
||||||
|
console.log(data);
|
||||||
|
},
|
||||||
|
(err : any)=> {
|
||||||
|
this.allRoles = JSON.parse(err.error).message;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
getUsers(){
|
||||||
|
this.userService.getAdminBoard().subscribe(
|
||||||
|
(data : any) => {
|
||||||
|
this.users = data;
|
||||||
|
console.log(data);
|
||||||
|
},
|
||||||
|
(err : any)=> {
|
||||||
|
console.log(JSON.parse(err.error).message);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
filteredRoles(roles : Role[]):any {
|
||||||
|
return this.allRoles.filter(
|
||||||
|
(r:Role) => !roles.some((item) => item.id === r.id),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
change($event: Event, roles: Role[]) {
|
||||||
|
roles.filter(
|
||||||
|
(r:Role) => !roles.some((item) => item.name?.toLowerCase() === r.name?.toLowerCase()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
selected(user: User, $event: MatAutocompleteSelectedEvent) {
|
||||||
|
user.roles.push($event.option.value);
|
||||||
|
this.saveUserRoles(user);
|
||||||
|
this.currentRole.set('');
|
||||||
|
$event.option.deselect();
|
||||||
|
}
|
||||||
|
|
||||||
|
add($event: MatChipInputEvent, user:User) {
|
||||||
|
/*const value = ($event.value || '').trim();
|
||||||
|
|
||||||
|
const role = this.allRoles.find(value1 => value1.name === value);
|
||||||
|
if(role){
|
||||||
|
user.roles.push(value);
|
||||||
|
this.saveUserRoles(user);
|
||||||
|
}*/
|
||||||
|
// Clear the input value
|
||||||
|
this.currentRole.set('');
|
||||||
|
}
|
||||||
|
|
||||||
|
remove(role: any, user: User) {
|
||||||
|
const updatedRoles: Role[] = user.roles.filter(
|
||||||
|
(r: Role) => r.id !== role.id // Simple comparison with the role to remove
|
||||||
|
);
|
||||||
|
|
||||||
|
if (updatedRoles && updatedRoles.length >= 1) {
|
||||||
|
user.roles = updatedRoles;
|
||||||
|
this.saveUserRoles(user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
saveUserRoles(user:User){
|
||||||
|
this.adminService.updateUserRoles(user.id, user).subscribe(
|
||||||
|
(data:any) => {
|
||||||
|
console.log(data);
|
||||||
|
},
|
||||||
|
(err:any) => {
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const UserColumns = [
|
||||||
|
{
|
||||||
|
key: 'username',
|
||||||
|
type: 'text',
|
||||||
|
label: 'Name',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'email',
|
||||||
|
type: 'text',
|
||||||
|
label: 'Email',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'roles',
|
||||||
|
type: 'list',
|
||||||
|
label: 'Roles',
|
||||||
|
required: true,
|
||||||
|
}
|
||||||
|
];
|
||||||
@@ -17,7 +17,7 @@ export const routes: Routes = [
|
|||||||
|
|
||||||
];
|
];
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [RouterModule.forRoot(routes)],//, { useHash: true }
|
imports: [RouterModule.forRoot(routes, { useHash: true}) ],
|
||||||
exports: [RouterModule],
|
exports: [RouterModule],
|
||||||
})
|
})
|
||||||
export class AppRoutingModule {}
|
export class AppRoutingModule {}
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ export class BoardAdminComponent implements OnInit {
|
|||||||
return this.allRoles.filter(
|
return this.allRoles.filter(
|
||||||
(r:Role) => !roles.some((item) => item.id === r.id),
|
(r:Role) => !roles.some((item) => item.id === r.id),
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// private _filter(value: string): string[] {
|
// private _filter(value: string): string[] {
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import { GlobalConstants } from './global-constants';
|
||||||
|
|
||||||
|
describe('GlobalConstants', () => {
|
||||||
|
it('should create an instance', () => {
|
||||||
|
expect(new GlobalConstants()).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import {environment} from '../environments/environment';
|
||||||
|
|
||||||
|
export class GlobalConstants {
|
||||||
|
|
||||||
|
public static readonly API_URL = (() => {
|
||||||
|
// ... calculate the value and return it
|
||||||
|
|
||||||
|
if(environment.production) {
|
||||||
|
return `${environment.host_name}/api`;
|
||||||
|
}else {
|
||||||
|
return `${environment.host_name}:${environment.port}/api`;
|
||||||
|
}
|
||||||
|
|
||||||
|
})();
|
||||||
|
}
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<mat-menu #menu="matMenu">
|
<mat-menu #menu="matMenu">
|
||||||
@if (showAdminBoard) {
|
@if (showAdminBoard) {
|
||||||
<button mat-menu-item routerLink="admin/welcome">
|
<button mat-menu-item routerLink="admin/admin-welcome">
|
||||||
<mat-icon>admin_panel_settings</mat-icon>
|
<mat-icon>admin_panel_settings</mat-icon>
|
||||||
Admin Panel
|
Admin Panel
|
||||||
</button>
|
</button>
|
||||||
@@ -39,6 +39,12 @@
|
|||||||
User tools
|
User tools
|
||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
|
@if (showModeratorBoard) {
|
||||||
|
<button mat-menu-item routerLink="moderator/moderator-welcome">
|
||||||
|
<mat-icon>space_dashboard</mat-icon>
|
||||||
|
Moderator board
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
|
||||||
<button mat-menu-item routerLink="profile">
|
<button mat-menu-item routerLink="profile">
|
||||||
<mat-icon>person</mat-icon>
|
<mat-icon>person</mat-icon>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import { environment } from '../../../environments/environment';
|
|||||||
MatToolbar,
|
MatToolbar,
|
||||||
MatButton,
|
MatButton,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
IconDirective,
|
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
CommonModule,
|
CommonModule,
|
||||||
MatIcon,
|
MatIcon,
|
||||||
@@ -38,8 +38,7 @@ import { environment } from '../../../environments/environment';
|
|||||||
MatMenu,
|
MatMenu,
|
||||||
MatMenuItem,
|
MatMenuItem,
|
||||||
MatTooltip,
|
MatTooltip,
|
||||||
MatLabel,
|
MatLabel
|
||||||
MatFabButton
|
|
||||||
|
|
||||||
],
|
],
|
||||||
schemas: [ CUSTOM_ELEMENTS_SCHEMA ],
|
schemas: [ CUSTOM_ELEMENTS_SCHEMA ],
|
||||||
@@ -186,7 +185,9 @@ export class MainComponent implements OnInit{
|
|||||||
|
|
||||||
this.refreshToolbar();
|
this.refreshToolbar();
|
||||||
dialogLoginRef.close()
|
dialogLoginRef.close()
|
||||||
this.router.navigate(['main/user/user-welcome']);
|
|
||||||
|
|
||||||
|
this.router.navigate(['main/tutorials']);
|
||||||
},
|
},
|
||||||
err => {
|
err => {
|
||||||
dialogLoginRef.componentInstance.openLoginFailedSnackBar(err.error.message);
|
dialogLoginRef.componentInstance.openLoginFailedSnackBar(err.error.message);
|
||||||
@@ -232,8 +233,7 @@ export class MainComponent implements OnInit{
|
|||||||
);
|
);
|
||||||
|
|
||||||
// do something here with the data
|
// do something here with the data
|
||||||
dialogloginSubscription.unsubscribe();
|
|
||||||
dialogSubmitSubscription.unsubscribe();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,11 @@ const MAIN_ROUTES: Routes =[
|
|||||||
loadChildren: () =>
|
loadChildren: () =>
|
||||||
import('../user-module/user.module').then((m) => m.UserModule),
|
import('../user-module/user.module').then((m) => m.UserModule),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'moderator',
|
||||||
|
loadChildren: () =>
|
||||||
|
import('../moderator-module/moderator.module').then((m) => m.ModeratorModule),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: 'home',
|
path: 'home',
|
||||||
component: HomeComponent
|
component: HomeComponent
|
||||||
|
|||||||
@@ -1,6 +1,13 @@
|
|||||||
export class Tutorial {
|
export class Tutorial {
|
||||||
|
isSelected?: boolean;
|
||||||
id?: any;
|
id?: any;
|
||||||
title?: string;
|
title?: string;
|
||||||
description?: string;
|
description?: string;
|
||||||
published?: boolean;
|
published?: boolean;
|
||||||
|
created?: Date;
|
||||||
|
modified?: Date;
|
||||||
|
tobepublished?: boolean;
|
||||||
|
isEdit?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ModeratorApiService } from './moderator-api.service';
|
||||||
|
|
||||||
|
describe('ModeratorApiService', () => {
|
||||||
|
let service: ModeratorApiService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(ModeratorApiService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {HttpClient, HttpHeaders} from '@angular/common/http';
|
||||||
|
import {Observable} from 'rxjs';
|
||||||
|
import {Tutorial} from '../models/tutorial.model';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class ModeratorApiService {
|
||||||
|
baseUrl = `${GlobalConstants.API_URL}/moderator`;
|
||||||
|
|
||||||
|
|
||||||
|
constructor(private http: HttpClient) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
getBePublishedTutorials(): Observable<Tutorial[]> {
|
||||||
|
return this.http.get<Tutorial[]>(`${this.baseUrl}/tutorials`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getTutorial(id: string | null | undefined): Observable<Tutorial> {
|
||||||
|
return this.http.get<Tutorial>(`${this.baseUrl}/tutorial-get/${id}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
publish(id: any,data: any): Observable<any> {
|
||||||
|
return this.http.put(`${this.baseUrl}/tutorial-update/${id}`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<p>moderator-welcome.component works!</p>
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ModeratorWelcomeComponent } from './moderator-welcome.component';
|
||||||
|
|
||||||
|
describe('ModeratorWelcomeComponent', () => {
|
||||||
|
let component: ModeratorWelcomeComponent;
|
||||||
|
let fixture: ComponentFixture<ModeratorWelcomeComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ModeratorWelcomeComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ModeratorWelcomeComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+11
@@ -0,0 +1,11 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-moderator-welcome.component',
|
||||||
|
imports: [],
|
||||||
|
templateUrl: './moderator-welcome.component.html',
|
||||||
|
styleUrl: './moderator-welcome.component.scss'
|
||||||
|
})
|
||||||
|
export class ModeratorWelcomeComponent {
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<app-side-bar-moderator class="pc-sidebar" ></app-side-bar-moderator>
|
||||||
|
<div class="pc-container">
|
||||||
|
<router-outlet></router-outlet>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
//---------------
|
||||||
|
.pc-sidebar{
|
||||||
|
top: 65px;
|
||||||
|
overflow-y: auto;
|
||||||
|
background-color: rgba(153, 153, 153, 0.16);
|
||||||
|
|
||||||
|
backdrop-filter: blur(8px);
|
||||||
|
}
|
||||||
|
.pc-container{
|
||||||
|
top: 0px;
|
||||||
|
padding-left: 5px;
|
||||||
|
padding-right: 5px;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ModeratorComponent } from './moderator.component';
|
||||||
|
|
||||||
|
describe('ModeratorComponent', () => {
|
||||||
|
let component: ModeratorComponent;
|
||||||
|
let fixture: ComponentFixture<ModeratorComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ModeratorComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ModeratorComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import {RouterOutlet} from '@angular/router';
|
||||||
|
import {SideBarModeratorComponent} from '../side-bar-moderator.component/side-bar-moderator.component';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-moderator.component',
|
||||||
|
imports: [
|
||||||
|
RouterOutlet,
|
||||||
|
SideBarModeratorComponent,
|
||||||
|
|
||||||
|
],
|
||||||
|
templateUrl: './moderator.component.html',
|
||||||
|
styleUrl: './moderator.component.scss'
|
||||||
|
})
|
||||||
|
export class ModeratorComponent {
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import {moderatorRouting} from './moderator.routing';
|
||||||
|
import {ModeratorComponent} from './moderator.component/moderator.component';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
declarations: [],
|
||||||
|
imports: [
|
||||||
|
moderatorRouting,
|
||||||
|
ModeratorComponent,
|
||||||
|
CommonModule
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class ModeratorModule { }
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import { ModeratorRouting } from './moderator.routing';
|
||||||
|
|
||||||
|
describe('ModeratorRouting', () => {
|
||||||
|
it('should create an instance', () => {
|
||||||
|
expect(new ModeratorRouting()).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import {RouterModule, Routes} from '@angular/router';
|
||||||
|
import {UserComponent} from '../user-module/user.component/user.component';
|
||||||
|
import {ModeratorComponent} from './moderator.component/moderator.component';
|
||||||
|
|
||||||
|
const MODERATOR_ROUTES: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: ModeratorComponent,
|
||||||
|
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: 'moderator-welcome',
|
||||||
|
loadComponent: () => import('../moderator-module/moderator-welcome.component/moderator-welcome.component').then((c) => c.ModeratorWelcomeComponent),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'tutorials-list',
|
||||||
|
loadComponent: () => import('../moderator-module/tutorials-list.component/tutorials-list.component').then((c) => c.TutorialsListComponent)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'tutorial-preview',
|
||||||
|
loadComponent: () => import('../moderator-module/tutorial-preview.component/tutorial-preview.component').then((c) => c.TutorialPreviewComponent)
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
export const moderatorRouting = RouterModule.forChild(MODERATOR_ROUTES);
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
<mat-nav-list>
|
||||||
|
<a mat-list-item routerLink="moderator-welcome">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>house</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Dashboard</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<a mat-list-item routerLink="tutorials-list">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>newspaper</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Tutorials</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</mat-nav-list>
|
||||||
+14
@@ -0,0 +1,14 @@
|
|||||||
|
.entry{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
padding:0.75rem;
|
||||||
|
color: rgba(24, 255, 255, 0.96);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
a.mdc-list-item
|
||||||
|
{
|
||||||
|
|
||||||
|
background-color: rgba(24,255,255,0.04);
|
||||||
|
}
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SideBarModeratorComponent } from './side-bar-moderator.component';
|
||||||
|
|
||||||
|
describe('SideBarModeratorComponent', () => {
|
||||||
|
let component: SideBarModeratorComponent;
|
||||||
|
let fixture: ComponentFixture<SideBarModeratorComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [SideBarModeratorComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(SideBarModeratorComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
||||||
|
import {MatIcon} from '@angular/material/icon';
|
||||||
|
import {MatListItem, MatNavList} from '@angular/material/list';
|
||||||
|
import {RouterLink} from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-side-bar-moderator',
|
||||||
|
imports: [
|
||||||
|
MatIcon,
|
||||||
|
MatListItem,
|
||||||
|
MatNavList,
|
||||||
|
RouterLink
|
||||||
|
],
|
||||||
|
templateUrl: './side-bar-moderator.component.html',
|
||||||
|
styleUrl: './side-bar-moderator.component.scss',
|
||||||
|
schemas:[CUSTOM_ELEMENTS_SCHEMA]
|
||||||
|
})
|
||||||
|
export class SideBarModeratorComponent {
|
||||||
|
isCollapsed = false;
|
||||||
|
}
|
||||||
+43
@@ -0,0 +1,43 @@
|
|||||||
|
<mat-card appearance="outlined">
|
||||||
|
<mat-card-header>
|
||||||
|
<mat-card-title>Edit tutorial</mat-card-title>
|
||||||
|
</mat-card-header>
|
||||||
|
<mat-card-content >
|
||||||
|
<mat-form-field class="example-full-width">
|
||||||
|
<mat-label>Title</mat-label>
|
||||||
|
<input matInput required
|
||||||
|
[(ngModel)]="tutorial.title">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-tab-group>
|
||||||
|
<mat-tab label="Preview">
|
||||||
|
<markdown class="preview" [data]="tutorial.description"></markdown>
|
||||||
|
</mat-tab>
|
||||||
|
<mat-tab label="Edit">
|
||||||
|
<textarea class="variable-textarea" [(ngModel)]="tutorial.description"></textarea>
|
||||||
|
<markdown class="variable-binding" [data]="tutorial.description"></markdown>
|
||||||
|
</mat-tab>
|
||||||
|
|
||||||
|
<mat-tab label="Example">
|
||||||
|
<textarea class="variable-textarea" [(ngModel)]="markdown"></textarea>
|
||||||
|
<markdown class="variable-binding" [data]="markdown"></markdown>
|
||||||
|
</mat-tab>
|
||||||
|
</mat-tab-group>
|
||||||
|
</mat-card-content>
|
||||||
|
<mat-card-actions>
|
||||||
|
|
||||||
|
<button matButton (click)="publishTutorial()">Publicate</button>
|
||||||
|
@if (hasError){
|
||||||
|
<mat-error>
|
||||||
|
{{errorMessage}}
|
||||||
|
</mat-error>
|
||||||
|
}
|
||||||
|
@if(submitted) {
|
||||||
|
<h4>Tutorial was submitted successfully!</h4>
|
||||||
|
|
||||||
|
<button matButton routerLink="../tutorials-list">Back to list</button>
|
||||||
|
}
|
||||||
|
|
||||||
|
</mat-card-actions>
|
||||||
|
</mat-card>
|
||||||
|
|
||||||
|
|
||||||
+59
@@ -0,0 +1,59 @@
|
|||||||
|
.submit-form {
|
||||||
|
max-width: 400px;
|
||||||
|
margin: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
mat-card{
|
||||||
|
//margin: 20px;
|
||||||
|
}
|
||||||
|
mat-card-title{
|
||||||
|
color: cyan;
|
||||||
|
}
|
||||||
|
|
||||||
|
.example-form {
|
||||||
|
min-width: 150px;
|
||||||
|
max-width: 500px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.example-full-width {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.variable-binding,
|
||||||
|
.variable-textarea {
|
||||||
|
width: 49%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.variable-textarea {
|
||||||
|
border-radius: 5px;
|
||||||
|
box-shadow: 0 1px 2px rgba(0,0,0,.07);
|
||||||
|
min-height: 420px;
|
||||||
|
padding: 8px;
|
||||||
|
transition: all 300ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.variable-textarea:hover {
|
||||||
|
box-shadow: 0 6px 12px 3px rgba(0,0,0,.09),
|
||||||
|
0 2px 3px 1px rgba(0,0,0,.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.variable-binding {
|
||||||
|
display: block;
|
||||||
|
float: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preview {
|
||||||
|
/* display: block;
|
||||||
|
float: right;*/
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-mdc-card-outlined {
|
||||||
|
background-color: var(--mat-card-outlined-container-color, var(--mat-sys-surface));
|
||||||
|
border-radius:0;
|
||||||
|
border-width: var(--mat-card-outlined-outline-width, 1px);
|
||||||
|
border-color: var(--mat-card-outlined-outline-color, var(--mat-sys-outline-variant));
|
||||||
|
box-shadow: var(--mat-card-outlined-container-elevation, var(--mat-sys-level0));
|
||||||
|
}
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TutorialPreviewComponent } from './tutorial-preview.component';
|
||||||
|
|
||||||
|
describe('TutorialPreviewComponent', () => {
|
||||||
|
let component: TutorialPreviewComponent;
|
||||||
|
let fixture: ComponentFixture<TutorialPreviewComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TutorialPreviewComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(TutorialPreviewComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+94
@@ -0,0 +1,94 @@
|
|||||||
|
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
||||||
|
import {FormsModule} from "@angular/forms";
|
||||||
|
import {MarkdownComponent} from "ngx-markdown";
|
||||||
|
import {MatButton} from "@angular/material/button";
|
||||||
|
import {MatCard, MatCardActions, MatCardContent, MatCardHeader} from "@angular/material/card";
|
||||||
|
import {MatError, MatFormField, MatInput, MatLabel} from "@angular/material/input";
|
||||||
|
import {MatTab, MatTabGroup} from "@angular/material/tabs";
|
||||||
|
import {ActivatedRoute, RouterLink} from "@angular/router";
|
||||||
|
import {Tutorial} from '../../models/tutorial.model';
|
||||||
|
import {UserApiService} from '../../user-module/user-api.service';
|
||||||
|
import {ModeratorApiService} from '../moderator-api.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-tutorial-preview.component',
|
||||||
|
imports: [
|
||||||
|
FormsModule,
|
||||||
|
MarkdownComponent,
|
||||||
|
MatButton,
|
||||||
|
MatCard,
|
||||||
|
MatCardActions,
|
||||||
|
MatCardContent,
|
||||||
|
MatCardHeader,
|
||||||
|
MatError,
|
||||||
|
MatFormField,
|
||||||
|
MatInput,
|
||||||
|
MatLabel,
|
||||||
|
MatTab,
|
||||||
|
MatTabGroup,
|
||||||
|
RouterLink,
|
||||||
|
MatError,
|
||||||
|
MatFormField
|
||||||
|
],
|
||||||
|
templateUrl: './tutorial-preview.component.html',
|
||||||
|
styleUrl: './tutorial-preview.component.scss',
|
||||||
|
schemas: [CUSTOM_ELEMENTS_SCHEMA]
|
||||||
|
})
|
||||||
|
export class TutorialPreviewComponent {
|
||||||
|
tutorial: Tutorial = new Tutorial();
|
||||||
|
submitted = false;
|
||||||
|
hasError = false;
|
||||||
|
errorMessage = '';
|
||||||
|
markdown = `## Markdown __rulez__!
|
||||||
|
---
|
||||||
|
|
||||||
|
### Syntax highlight
|
||||||
|
\`\`\`typescript
|
||||||
|
const language = 'typescript';
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
### Lists
|
||||||
|
1. Ordered list
|
||||||
|
2. Another bullet point
|
||||||
|
- Unordered list
|
||||||
|
- Another unordered bullet
|
||||||
|
|
||||||
|
### Blockquote
|
||||||
|
> Blockquote to the max`;
|
||||||
|
|
||||||
|
private id: string | null | undefined;
|
||||||
|
|
||||||
|
constructor(private moderatorApiService: ModeratorApiService, private route: ActivatedRoute) {
|
||||||
|
|
||||||
|
this.route.queryParams
|
||||||
|
.subscribe(params => {
|
||||||
|
console.log(params);
|
||||||
|
this.id = params['id'];
|
||||||
|
console.log(this.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
this.moderatorApiService.getTutorial(this.id).subscribe(
|
||||||
|
data=>{
|
||||||
|
this.tutorial = data;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
publishTutorial(): void {
|
||||||
|
this.tutorial.published = true;
|
||||||
|
this.moderatorApiService.publish(this.id, this.tutorial)
|
||||||
|
.subscribe(
|
||||||
|
response => {
|
||||||
|
console.log(response);
|
||||||
|
this.submitted = true;
|
||||||
|
this.hasError = false;
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
|
||||||
|
this.errorMessage = error.error.message;
|
||||||
|
|
||||||
|
this.hasError = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
+44
@@ -0,0 +1,44 @@
|
|||||||
|
<table mat-table [dataSource]="dataSource">
|
||||||
|
@for (column of columnsSchema; track column){
|
||||||
|
<ng-container [matColumnDef]="column.key">
|
||||||
|
<th mat-header-cell *matHeaderCellDef>
|
||||||
|
{{column.label}}
|
||||||
|
</th>
|
||||||
|
<td mat-cell *matCellDef="let element">
|
||||||
|
@switch (column.type) {
|
||||||
|
|
||||||
|
@case('isEdit') {
|
||||||
|
<div class="btn-edit" >
|
||||||
|
<button mat-button routerLink='../tutorial-preview' [queryParams]="{id:element.id}" (click)="element.isEdit = !element.isEdit">
|
||||||
|
Preview
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@case ('boolean') {
|
||||||
|
<mat-slide-toggle
|
||||||
|
class="example-margin"
|
||||||
|
[checked]="element[column.key]"
|
||||||
|
|
||||||
|
(change)="publish(element, $event.checked)"
|
||||||
|
>
|
||||||
|
|
||||||
|
</mat-slide-toggle>
|
||||||
|
}
|
||||||
|
@case ('datetime') {
|
||||||
|
{{ element[column.key] | date: 'medium' }}
|
||||||
|
}
|
||||||
|
@default {
|
||||||
|
{{ element[column.key] }}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TutorialsListComponent } from './tutorials-list.component';
|
||||||
|
|
||||||
|
describe('TutorialsListComponent', () => {
|
||||||
|
let component: TutorialsListComponent;
|
||||||
|
let fixture: ComponentFixture<TutorialsListComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TutorialsListComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(TutorialsListComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+144
@@ -0,0 +1,144 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import {DatePipe} from "@angular/common";
|
||||||
|
import {MatButton} from "@angular/material/button";
|
||||||
|
import {
|
||||||
|
MatCell,
|
||||||
|
MatCellDef, MatColumnDef,
|
||||||
|
MatHeaderCell, MatHeaderCellDef,
|
||||||
|
MatHeaderRow,
|
||||||
|
MatHeaderRowDef,
|
||||||
|
MatRow,
|
||||||
|
MatRowDef, MatTable, MatTableDataSource
|
||||||
|
} from "@angular/material/table";
|
||||||
|
import {MatCheckbox} from "@angular/material/checkbox";
|
||||||
|
import {MatSlideToggle} from "@angular/material/slide-toggle";
|
||||||
|
import {Router, RouterLink} from "@angular/router";
|
||||||
|
import {Tutorial} from '../../models/tutorial.model';
|
||||||
|
import {EventData} from '../../_shared/event.class';
|
||||||
|
import {ModeratorApiService} from '../moderator-api.service';
|
||||||
|
import {TokenStorageService} from '../../services/token-storage.service';
|
||||||
|
import {EventBusService} from '../../_shared/event-bus.service';
|
||||||
|
import {AuthService} from '../../services/auth.service';
|
||||||
|
import {HttpHeaders} from '@angular/common/http';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-tutorials-list.component',
|
||||||
|
imports: [
|
||||||
|
DatePipe,
|
||||||
|
MatButton,
|
||||||
|
MatCell,
|
||||||
|
MatCellDef,
|
||||||
|
MatHeaderCell,
|
||||||
|
MatHeaderRow,
|
||||||
|
MatHeaderRowDef,
|
||||||
|
MatRow,
|
||||||
|
MatRowDef,
|
||||||
|
MatSlideToggle,
|
||||||
|
MatTable,
|
||||||
|
RouterLink,
|
||||||
|
MatColumnDef,
|
||||||
|
MatHeaderCellDef
|
||||||
|
],
|
||||||
|
templateUrl: './tutorials-list.component.html',
|
||||||
|
styleUrl: './tutorials-list.component.scss'
|
||||||
|
})
|
||||||
|
export class TutorialsListComponent {
|
||||||
|
displayedColumns: string[] = TutorialColumns.map((col) => col.key)
|
||||||
|
columnsSchema: any = TutorialColumns
|
||||||
|
dataSource = new MatTableDataSource<Tutorial>()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
constructor(private moderatorApiService: ModeratorApiService,
|
||||||
|
private storageService: TokenStorageService,
|
||||||
|
private eventBusService: EventBusService,
|
||||||
|
private authService: AuthService,
|
||||||
|
private router: Router
|
||||||
|
) {
|
||||||
|
this.getTutorials();
|
||||||
|
}
|
||||||
|
getTutorials(): void {
|
||||||
|
this.moderatorApiService.getBePublishedTutorials()
|
||||||
|
.subscribe(( data:Tutorial[] ) => {
|
||||||
|
this.dataSource.data = data;
|
||||||
|
console.log(data);
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
if (
|
||||||
|
(
|
||||||
|
error.status === 401
|
||||||
|
|
||||||
|
)
|
||||||
|
&& this.storageService.isLoggedIn()
|
||||||
|
) {
|
||||||
|
this.eventBusService.emit(new EventData('logout', null));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
publish(element: any, checked: boolean){
|
||||||
|
element.published = checked;
|
||||||
|
this.moderatorApiService.publish(element.id, element).subscribe(
|
||||||
|
response => {
|
||||||
|
console.log(response);
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
logout(): void {
|
||||||
|
this.authService.logout().subscribe({
|
||||||
|
next: res => {
|
||||||
|
console.log(res);
|
||||||
|
this.storageService.clean();
|
||||||
|
|
||||||
|
//window.location.reload();
|
||||||
|
this.router.navigate(['main/generate-image']).then(() => {
|
||||||
|
//window.location.reload();
|
||||||
|
})
|
||||||
|
|
||||||
|
},
|
||||||
|
error: err => {
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const TutorialColumns = [
|
||||||
|
|
||||||
|
{
|
||||||
|
key: 'title',
|
||||||
|
type: 'text',
|
||||||
|
label: 'Title',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'published',
|
||||||
|
type: 'boolean',
|
||||||
|
label: 'Is Published',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'created',
|
||||||
|
type: 'datetime',
|
||||||
|
label: 'Created Date',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'modified',
|
||||||
|
type: 'datetime',
|
||||||
|
label: 'Modified Date',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'isEdit',
|
||||||
|
type: 'isEdit',
|
||||||
|
label: '',
|
||||||
|
}
|
||||||
|
];
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
const AUTH_API = 'http://localhost:8080/api/auth/';
|
const AUTH_API = GlobalConstants.API_URL + '/auth/';
|
||||||
|
|
||||||
const httpOptions = {
|
const httpOptions = {
|
||||||
headers: new HttpHeaders({ 'Content-Type': 'application/json' })
|
headers: new HttpHeaders({ 'Content-Type': 'application/json' })
|
||||||
@@ -15,6 +16,7 @@ export class AuthService {
|
|||||||
constructor(private http: HttpClient) { }
|
constructor(private http: HttpClient) { }
|
||||||
|
|
||||||
login(username: string, password: string): Observable<any> {
|
login(username: string, password: string): Observable<any> {
|
||||||
|
console.log(AUTH_API + 'signin');
|
||||||
return this.http.post(AUTH_API + 'signin', {
|
return this.http.post(AUTH_API + 'signin', {
|
||||||
username,
|
username,
|
||||||
password
|
password
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ import { Injectable } from '@angular/core';
|
|||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { Role } from '../models/role';
|
import { Role } from '../models/role';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
const API_URL = 'http://localhost:8080/api/roles';
|
const API_URL = `${GlobalConstants.API_URL}/roles`;
|
||||||
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
|||||||
@@ -4,13 +4,14 @@ import {Observable} from 'rxjs';
|
|||||||
import {Tutorial} from '../models/tutorial.model';
|
import {Tutorial} from '../models/tutorial.model';
|
||||||
import {Bean} from '../models/Bean';
|
import {Bean} from '../models/Bean';
|
||||||
import {NameValueItem} from '../models/name-value-item';
|
import {NameValueItem} from '../models/name-value-item';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class SystemService {
|
export class SystemService {
|
||||||
|
|
||||||
baseUrl : string = 'http://localhost:8080/api/system';
|
baseUrl : string = `${GlobalConstants.API_URL}/system`;
|
||||||
constructor(private http: HttpClient) { }
|
constructor(private http: HttpClient) { }
|
||||||
|
|
||||||
getDataSourceProperties(): Observable<NameValueItem[]>{
|
getDataSourceProperties(): Observable<NameValueItem[]>{
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
|
|||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { Tutorial } from '../models/tutorial.model';
|
import { Tutorial } from '../models/tutorial.model';
|
||||||
import {text} from 'node:stream/consumers';
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
const baseUrl = 'http://localhost:8080/api/public/tutorials';
|
const baseUrl = `${GlobalConstants.API_URL}/public/tutorials`;
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
|
|||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import {User} from "../models/user.model";
|
import {User} from "../models/user.model";
|
||||||
import {Tutorial} from "../models/tutorial.model";
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
const API_URL = 'http://localhost:8080/api/users';
|
const API_URL = `${GlobalConstants.API_URL}/users`;
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {Tutorial} from '../models/tutorial.model';
|
|||||||
import {HttpClient} from '@angular/common/http';
|
import {HttpClient} from '@angular/common/http';
|
||||||
import {Image} from '../models/image';
|
import {Image} from '../models/image';
|
||||||
import {SpinnerService} from './spinner.service';
|
import {SpinnerService} from './spinner.service';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -13,7 +14,7 @@ import {SpinnerService} from './spinner.service';
|
|||||||
|
|
||||||
|
|
||||||
export class ZhipuaiImageService {
|
export class ZhipuaiImageService {
|
||||||
baseUrl : string = 'http://localhost:8080/api/zhipuai';
|
baseUrl : string = `${GlobalConstants.API_URL}/public/zhipuai`;
|
||||||
|
|
||||||
constructor(private http: HttpClient,public spinnerService: SpinnerService) {
|
constructor(private http: HttpClient,public spinnerService: SpinnerService) {
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<mat-nav-list>
|
||||||
|
<a mat-list-item routerLink="user-welcome">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>house</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Dashboard</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<a mat-list-item routerLink="tutorials-list">
|
||||||
|
<span class="entry">
|
||||||
|
<mat-icon>newspaper</mat-icon>
|
||||||
|
@if (!isCollapsed) {
|
||||||
|
<span >Tutorials</span>
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</mat-nav-list>
|
||||||
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
.entry{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
padding:0.75rem;
|
||||||
|
color: rgba(24, 255, 255, 0.96);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
a.mdc-list-item
|
||||||
|
{
|
||||||
|
|
||||||
|
background-color: rgba(24,255,255,0.04);
|
||||||
|
}
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SideBarUserComponent } from './side-bar-user.component';
|
||||||
|
|
||||||
|
describe('SideBarUserComponent', () => {
|
||||||
|
let component: SideBarUserComponent;
|
||||||
|
let fixture: ComponentFixture<SideBarUserComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [SideBarUserComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(SideBarUserComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
||||||
|
import {MatListItem, MatNavList} from '@angular/material/list';
|
||||||
|
import {RouterLink} from '@angular/router';
|
||||||
|
import {MatIcon} from '@angular/material/icon';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-side-bar-user',
|
||||||
|
imports: [
|
||||||
|
MatIcon,
|
||||||
|
MatListItem,
|
||||||
|
MatNavList,
|
||||||
|
RouterLink
|
||||||
|
],
|
||||||
|
templateUrl: './side-bar-user.component.html',
|
||||||
|
styleUrl: './side-bar-user.component.scss',
|
||||||
|
schemas:[CUSTOM_ELEMENTS_SCHEMA]
|
||||||
|
})
|
||||||
|
export class SideBarUserComponent {
|
||||||
|
isCollapsed = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
<mat-card appearance="outlined">
|
||||||
|
<mat-card-header>
|
||||||
|
<mat-card-title>Edit tutorial</mat-card-title>
|
||||||
|
</mat-card-header>
|
||||||
|
<mat-card-content >
|
||||||
|
<mat-form-field class="example-full-width">
|
||||||
|
<mat-label>Title</mat-label>
|
||||||
|
<input matInput required
|
||||||
|
[(ngModel)]="tutorial.title">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-tab-group>
|
||||||
|
<mat-tab label="Markdown text">
|
||||||
|
<textarea class="variable-textarea" [(ngModel)]="tutorial.description"></textarea>
|
||||||
|
<markdown class="variable-binding" [data]="tutorial.description"></markdown>
|
||||||
|
</mat-tab>
|
||||||
|
<mat-tab label="Result">
|
||||||
|
<markdown class="preview" [data]="tutorial.description"></markdown>
|
||||||
|
</mat-tab>
|
||||||
|
<mat-tab label="Example">
|
||||||
|
<textarea class="variable-textarea" [(ngModel)]="markdown"></textarea>
|
||||||
|
<markdown class="variable-binding" [data]="markdown"></markdown>
|
||||||
|
</mat-tab>
|
||||||
|
</mat-tab-group>
|
||||||
|
</mat-card-content>
|
||||||
|
<mat-card-actions>
|
||||||
|
|
||||||
|
<button matButton (click)="updateTutorial()">Save</button>
|
||||||
|
@if (hasError){
|
||||||
|
<mat-error>
|
||||||
|
{{errorMessage}}
|
||||||
|
</mat-error>
|
||||||
|
}
|
||||||
|
@if(submitted) {
|
||||||
|
<h4>Tutorial was submitted successfully!</h4>
|
||||||
|
<button matButton routerLink="../tutorial-add">Add new tutorial</button>
|
||||||
|
<button matButton routerLink="../tutorials-list">Back to list</button>
|
||||||
|
}
|
||||||
|
|
||||||
|
</mat-card-actions>
|
||||||
|
</mat-card>
|
||||||
|
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
.submit-form {
|
||||||
|
max-width: 400px;
|
||||||
|
margin: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
mat-card{
|
||||||
|
//margin: 20px;
|
||||||
|
}
|
||||||
|
mat-card-title{
|
||||||
|
color: cyan;
|
||||||
|
}
|
||||||
|
|
||||||
|
.example-form {
|
||||||
|
min-width: 150px;
|
||||||
|
max-width: 500px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.example-full-width {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.variable-binding,
|
||||||
|
.variable-textarea {
|
||||||
|
width: 49%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.variable-textarea {
|
||||||
|
border-radius: 5px;
|
||||||
|
box-shadow: 0 1px 2px rgba(0,0,0,.07);
|
||||||
|
min-height: 420px;
|
||||||
|
padding: 8px;
|
||||||
|
transition: all 300ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.variable-textarea:hover {
|
||||||
|
box-shadow: 0 6px 12px 3px rgba(0,0,0,.09),
|
||||||
|
0 2px 3px 1px rgba(0,0,0,.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.variable-binding {
|
||||||
|
display: block;
|
||||||
|
float: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preview {
|
||||||
|
/* display: block;
|
||||||
|
float: right;*/
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-mdc-card-outlined {
|
||||||
|
background-color: var(--mat-card-outlined-container-color, var(--mat-sys-surface));
|
||||||
|
border-radius:0;
|
||||||
|
border-width: var(--mat-card-outlined-outline-width, 1px);
|
||||||
|
border-color: var(--mat-card-outlined-outline-color, var(--mat-sys-outline-variant));
|
||||||
|
box-shadow: var(--mat-card-outlined-container-elevation, var(--mat-sys-level0));
|
||||||
|
}
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TutorialEditComponent } from './tutorial-edit.component';
|
||||||
|
|
||||||
|
describe('TutorialEditComponent', () => {
|
||||||
|
let component: TutorialEditComponent;
|
||||||
|
let fixture: ComponentFixture<TutorialEditComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TutorialEditComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(TutorialEditComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
||||||
|
import {MarkdownComponent} from 'ngx-markdown';
|
||||||
|
import {MatButton} from '@angular/material/button';
|
||||||
|
import {MatCard, MatCardActions, MatCardContent, MatCardHeader} from '@angular/material/card';
|
||||||
|
import {MatError, MatFormField, MatInput, MatLabel} from '@angular/material/input';
|
||||||
|
import {MatTab, MatTabGroup} from '@angular/material/tabs';
|
||||||
|
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
|
||||||
|
import {Tutorial} from '../../models/tutorial.model';
|
||||||
|
import {UserApiService} from '../user-api.service';
|
||||||
|
import {ActivatedRoute, Router, RouterLink} from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-tutorial-edit.component',
|
||||||
|
imports: [
|
||||||
|
MarkdownComponent,
|
||||||
|
MatButton,
|
||||||
|
MatCard,
|
||||||
|
MatCardActions,
|
||||||
|
MatCardContent,
|
||||||
|
MatCardHeader,
|
||||||
|
MatFormField,
|
||||||
|
MatInput,
|
||||||
|
MatLabel,
|
||||||
|
MatTab,
|
||||||
|
MatTabGroup,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
FormsModule,
|
||||||
|
MatFormField,
|
||||||
|
RouterLink,
|
||||||
|
MatError
|
||||||
|
],
|
||||||
|
templateUrl: './tutorial-edit.component.html',
|
||||||
|
styleUrl: './tutorial-edit.component.scss',
|
||||||
|
schemas: [CUSTOM_ELEMENTS_SCHEMA]
|
||||||
|
})
|
||||||
|
export class TutorialEditComponent {
|
||||||
|
tutorial: Tutorial = new Tutorial();
|
||||||
|
submitted = false;
|
||||||
|
hasError = false;
|
||||||
|
errorMessage = '';
|
||||||
|
markdown = `## Markdown __rulez__!
|
||||||
|
---
|
||||||
|
|
||||||
|
### Syntax highlight
|
||||||
|
\`\`\`typescript
|
||||||
|
const language = 'typescript';
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
### Lists
|
||||||
|
1. Ordered list
|
||||||
|
2. Another bullet point
|
||||||
|
- Unordered list
|
||||||
|
- Another unordered bullet
|
||||||
|
|
||||||
|
### Blockquote
|
||||||
|
> Blockquote to the max`;
|
||||||
|
private id: string | null | undefined;
|
||||||
|
|
||||||
|
constructor(private userApiService: UserApiService, private route: ActivatedRoute) {
|
||||||
|
|
||||||
|
this.route.queryParams
|
||||||
|
.subscribe(params => {
|
||||||
|
console.log(params);
|
||||||
|
this.id = params['id'];
|
||||||
|
console.log(this.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
this.userApiService.getTutorial(this.id).subscribe(
|
||||||
|
data=>{
|
||||||
|
this.tutorial = data;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
updateTutorial(): void {
|
||||||
|
this.userApiService.update(this.id, this.tutorial)
|
||||||
|
.subscribe(
|
||||||
|
response => {
|
||||||
|
console.log(response);
|
||||||
|
this.submitted = true;
|
||||||
|
this.hasError = false;
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
|
||||||
|
this.errorMessage = error.error.message;
|
||||||
|
|
||||||
|
this.hasError = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
+144
-26
@@ -1,29 +1,147 @@
|
|||||||
<p>tutorials-list.component works!</p>
|
<article class="table-header">
|
||||||
|
<button
|
||||||
<button mat-raised-button routerLink="../tutorial-add">Add tutorial</button>
|
class="button-remove-rows"
|
||||||
|
mat-button
|
||||||
<mat-list role="list">
|
(click)="removeSelectedRows()"
|
||||||
@for (tutorial of tutorials; track tutorial) {
|
>
|
||||||
<!--
|
Remove Rows
|
||||||
<mat-list-item role="listitem">
|
|
||||||
{{tutorial.title}}
|
|
||||||
|
|
||||||
|
|
||||||
<span class="spacer"></span>
|
|
||||||
<button mat-button>
|
|
||||||
<mat-icon>edit</mat-icon>
|
|
||||||
</button>
|
</button>
|
||||||
<button mat-button>
|
<button mat-raised-button routerLink="../tutorial-add">Add tutorial</button>
|
||||||
<mat-icon>delete</mat-icon>
|
|
||||||
</button>
|
</article>
|
||||||
</mat-list-item>-->
|
<table mat-table [dataSource]="dataSource">
|
||||||
<mat-option >
|
@for (column of columnsSchema; track column){
|
||||||
<div style="display:flex; justify-content: space-between">
|
<ng-container [matColumnDef]="column.key">
|
||||||
<span>{{tutorial.title}}</span>
|
<th mat-header-cell *matHeaderCellDef>
|
||||||
<span></span>
|
@switch (column.key) {
|
||||||
<span (click)="deleteOption($event, tutorial)">X</span>
|
@case ('isSelected') {
|
||||||
</div>
|
<mat-checkbox
|
||||||
</mat-option>
|
(change)="selectAll($event)"
|
||||||
|
[checked]="isAllSelected()"
|
||||||
|
[indeterminate]="!isAllSelected() && isAnySelected()"
|
||||||
|
></mat-checkbox>
|
||||||
}
|
}
|
||||||
|
@default {
|
||||||
|
{{ column.label }}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</th>
|
||||||
|
<td mat-cell *matCellDef="let element">
|
||||||
|
<!-- @if (element.isEdit) {-->
|
||||||
|
@switch (column.type) {
|
||||||
|
@case ('isSelected') {
|
||||||
|
<mat-checkbox
|
||||||
|
(change)="element.isSelected = $event.checked"
|
||||||
|
[checked]="element.isSelected"
|
||||||
|
></mat-checkbox>
|
||||||
|
}
|
||||||
|
@case('isEdit') {
|
||||||
|
<div class="btn-edit" >
|
||||||
|
<button mat-button routerLink='../tutorial-edit' [queryParams]="{id:element.id}" (click)="element.isEdit = !element.isEdit">
|
||||||
|
Edit
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
mat-button
|
||||||
|
class="button-remove"
|
||||||
|
(click)="removeRow(element.id)"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@case ('boolean') {
|
||||||
|
<mat-slide-toggle
|
||||||
|
class="example-margin"
|
||||||
|
[checked]="element[column.key]"
|
||||||
|
[disabled]="column.key !== 'tobepublished'"
|
||||||
|
(change)="publish(element, $event.checked)"
|
||||||
|
>
|
||||||
|
|
||||||
|
</mat-slide-toggle>
|
||||||
|
}
|
||||||
|
@case ('datetime') {
|
||||||
|
{{ element[column.key] | date: 'medium' }}
|
||||||
|
}
|
||||||
|
@default {
|
||||||
|
{{ element[column.key] }}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<!-- }-->
|
||||||
|
</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
}
|
||||||
|
<!--<ng-container [matColumnDef]="col.key" *ngFor="let col of columnsSchema">-->
|
||||||
|
<!--<th mat-header-cell *matHeaderCellDef [ngSwitch]="col.key">
|
||||||
|
<span *ngSwitchCase="'isSelected'">
|
||||||
|
<mat-checkbox
|
||||||
|
(change)="selectAll($event)"
|
||||||
|
[checked]="isAllSelected()"
|
||||||
|
[indeterminate]="!isAllSelected() && isAnySelected()"
|
||||||
|
></mat-checkbox>
|
||||||
|
</span>
|
||||||
|
<span *ngSwitchDefault>{{ col.label }}</span>
|
||||||
|
</th>-->
|
||||||
|
<!-- <mat-form-field-->
|
||||||
|
<!--<td mat-cell *matCellDef="let element">
|
||||||
|
<div [ngSwitch]="col.type" *ngIf="!element.isEdit">
|
||||||
|
<ng-container *ngSwitchCase="'isSelected'">
|
||||||
|
<mat-checkbox
|
||||||
|
(change)="element.isSelected = $event.checked"
|
||||||
|
[checked]="element.isSelected"
|
||||||
|
></mat-checkbox>
|
||||||
|
</ng-container>
|
||||||
|
<div class="btn-edit" *ngSwitchCase="'isEdit'">
|
||||||
|
<button mat-button (click)="element.isEdit = !element.isEdit">
|
||||||
|
Edit
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
mat-button
|
||||||
|
class="button-remove"
|
||||||
|
(click)="removeRow(element.id)"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<span *ngSwitchCase="'date'">
|
||||||
|
{{ element[col.key] | date: 'mediumDate' }}
|
||||||
|
</span>
|
||||||
|
<span *ngSwitchDefault>
|
||||||
|
{{ element[col.key] }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div [ngSwitch]="col.type" *ngIf="element.isEdit">
|
||||||
|
<div *ngSwitchCase="'isSelected'"></div>
|
||||||
|
<div class="btn-edit" *ngSwitchCase="'isEdit'">
|
||||||
|
<button
|
||||||
|
mat-button
|
||||||
|
(click)="editRow(element)"
|
||||||
|
[disabled]="disableSubmit(element.id)"
|
||||||
|
>
|
||||||
|
Done
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
class="form-input"
|
||||||
|
*ngSwitchCase="'date'"
|
||||||
|
appearance="fill"
|
||||||
|
>
|
||||||
|
<mat-label>Choose a date</mat-label>
|
||||||
|
<input
|
||||||
|
matInput
|
||||||
|
[matDatepicker]="picker"
|
||||||
|
[(ngModel)]="element[col.key]"
|
||||||
|
/>
|
||||||
|
<mat-datepicker-toggle
|
||||||
|
matSuffix
|
||||||
|
[for]="picker"
|
||||||
|
></mat-datepicker-toggle>
|
||||||
|
<mat-datepicker #picker></mat-datepicker>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</ng-container>-->
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
|
||||||
</mat-list>
|
|
||||||
|
|||||||
+11
@@ -1,3 +1,14 @@
|
|||||||
|
.table-header {
|
||||||
|
width: 90%;
|
||||||
|
margin: auto;
|
||||||
|
text-align: right;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
padding-top: 10px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
.spacer{
|
.spacer{
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
}
|
}
|
||||||
|
|||||||
+142
-17
@@ -11,29 +11,63 @@ import {EventBusService} from '../../_shared/event-bus.service';
|
|||||||
import {EventData} from '../../_shared/event.class';
|
import {EventData} from '../../_shared/event.class';
|
||||||
import {Router, RouterLink} from '@angular/router';
|
import {Router, RouterLink} from '@angular/router';
|
||||||
import {AuthService} from '../../services/auth.service';
|
import {AuthService} from '../../services/auth.service';
|
||||||
|
import {FormGroup, FormsModule, ReactiveFormsModule} from '@angular/forms';
|
||||||
|
import {
|
||||||
|
MatCell,
|
||||||
|
MatCellDef,
|
||||||
|
MatColumnDef, MatHeaderCell, MatHeaderCellDef,
|
||||||
|
MatHeaderRow,
|
||||||
|
MatHeaderRowDef,
|
||||||
|
MatRow,
|
||||||
|
MatRowDef,
|
||||||
|
MatTable,
|
||||||
|
MatTableDataSource
|
||||||
|
} from '@angular/material/table';
|
||||||
|
import {DatePipe} from '@angular/common';
|
||||||
|
import {MatCheckbox} from '@angular/material/checkbox';
|
||||||
|
import {MatSlideToggle} from '@angular/material/slide-toggle';
|
||||||
|
|
||||||
@Component({
|
|
||||||
|
@Component({
|
||||||
selector: 'app-tutorials-list.component',
|
selector: 'app-tutorials-list.component',
|
||||||
imports: [
|
imports: [
|
||||||
MatList,
|
|
||||||
MatListItem,
|
|
||||||
MatLine,
|
|
||||||
MatButton,
|
MatButton,
|
||||||
MatIcon,
|
RouterLink,
|
||||||
MatOption,
|
ReactiveFormsModule,
|
||||||
RouterLink
|
MatTable,
|
||||||
|
MatHeaderRowDef,
|
||||||
|
MatHeaderRow,
|
||||||
|
MatRowDef,
|
||||||
|
MatRow,
|
||||||
|
FormsModule,
|
||||||
|
MatColumnDef,
|
||||||
|
MatHeaderCell,
|
||||||
|
MatHeaderCellDef,
|
||||||
|
MatCellDef,
|
||||||
|
MatCheckbox,
|
||||||
|
DatePipe,
|
||||||
|
MatCell,
|
||||||
|
MatSlideToggle
|
||||||
],
|
],
|
||||||
schemas:[CUSTOM_ELEMENTS_SCHEMA],
|
schemas:[CUSTOM_ELEMENTS_SCHEMA],
|
||||||
templateUrl: './tutorials-list.component.html',
|
templateUrl: './tutorials-list.component.html',
|
||||||
styleUrl: './tutorials-list.component.scss'
|
styleUrl: './tutorials-list.component.scss'
|
||||||
})
|
})
|
||||||
export class TutorialsListComponent implements OnInit {
|
export class TutorialsListComponent implements OnInit {
|
||||||
tutorials?: Tutorial[];
|
//tutorials?: Tutorial[];
|
||||||
|
|
||||||
|
displayedColumns: string[] = TutorialColumns.map((col) => col.key)
|
||||||
|
columnsSchema: any = TutorialColumns
|
||||||
|
dataSource = new MatTableDataSource<Tutorial>()
|
||||||
|
|
||||||
|
|
||||||
constructor(private userApiService: UserApiService,
|
constructor(private userApiService: UserApiService,
|
||||||
private storageService: TokenStorageService,
|
private storageService: TokenStorageService,
|
||||||
private eventBusService: EventBusService,
|
private eventBusService: EventBusService,
|
||||||
private router: Router, private authService: AuthService) {
|
private router: Router,
|
||||||
|
private authService: AuthService
|
||||||
|
|
||||||
|
) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,14 +75,13 @@ export class TutorialsListComponent implements OnInit {
|
|||||||
this.eventBusService.on('logout', () => {
|
this.eventBusService.on('logout', () => {
|
||||||
this.logout();
|
this.logout();
|
||||||
})
|
})
|
||||||
this.retrieveTutorials();
|
this.getTutorials();
|
||||||
}
|
}
|
||||||
|
|
||||||
retrieveTutorials(): void {
|
getTutorials(): void {
|
||||||
this.userApiService.getUserAllTutorials()
|
this.userApiService.getUserAllTutorials()
|
||||||
.subscribe(
|
.subscribe(( data:Tutorial[] ) => {
|
||||||
data => {
|
this.dataSource.data = data;
|
||||||
this.tutorials = data;
|
|
||||||
console.log(data);
|
console.log(data);
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
@@ -65,9 +98,57 @@ export class TutorialsListComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteOption($event: MouseEvent, option: any) {
|
selectAll(event: any) {
|
||||||
|
this.dataSource.data = this.dataSource.data.map((item) => ({
|
||||||
|
...item,
|
||||||
|
isSelected: event.checked
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
isAllSelected() {
|
||||||
|
return this.dataSource.data.every((item) => item.isSelected)
|
||||||
|
}
|
||||||
|
|
||||||
|
isAnySelected() {
|
||||||
|
return this.dataSource.data.some((item) => item.isSelected)
|
||||||
|
}
|
||||||
|
|
||||||
|
removeSelectedRows() {
|
||||||
|
const selectedTutorials = this.dataSource.data.filter((u: Tutorial) => u.isSelected)
|
||||||
|
/*this.dialog
|
||||||
|
.open(ConfirmDialogComponent)
|
||||||
|
.afterClosed()
|
||||||
|
.subscribe((confirm) => {*/
|
||||||
|
// if (confirm) {
|
||||||
|
this.userApiService.deleteTutorials(selectedTutorials).subscribe(() => {
|
||||||
|
this.dataSource.data = this.dataSource.data.filter(
|
||||||
|
(u: Tutorial) => !u.isSelected
|
||||||
|
)
|
||||||
|
})
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
}
|
||||||
|
|
||||||
|
removeRow(id: number) {
|
||||||
|
this.userApiService.deleteTutorial(id).subscribe(() => {
|
||||||
|
this.dataSource.data = this.dataSource.data.filter(
|
||||||
|
(u: Tutorial) => u.id !== id,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
publish(element: any, checked: boolean){
|
||||||
|
element.tobepublished = checked;
|
||||||
|
this.userApiService.update(element.id, element).subscribe(
|
||||||
|
response => {
|
||||||
|
console.log(response);
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logout(): void {
|
logout(): void {
|
||||||
this.authService.logout().subscribe({
|
this.authService.logout().subscribe({
|
||||||
next: res => {
|
next: res => {
|
||||||
@@ -87,3 +168,47 @@ export class TutorialsListComponent implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const TutorialColumns = [
|
||||||
|
{
|
||||||
|
key: 'isSelected',
|
||||||
|
type: 'isSelected',
|
||||||
|
label: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'title',
|
||||||
|
type: 'text',
|
||||||
|
label: 'Title',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'published',
|
||||||
|
type: 'boolean',
|
||||||
|
label: 'Is Published',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'created',
|
||||||
|
type: 'datetime',
|
||||||
|
label: 'Created Date',
|
||||||
|
required: true,
|
||||||
|
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'modified',
|
||||||
|
type: 'datetime',
|
||||||
|
label: 'Modified Date',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'tobepublished',
|
||||||
|
type: 'boolean',
|
||||||
|
label: 'To be published',
|
||||||
|
required: true
|
||||||
|
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'isEdit',
|
||||||
|
type: 'isEdit',
|
||||||
|
label: '',
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|||||||
@@ -1,27 +1,46 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import {Observable} from 'rxjs';
|
import {forkJoin, Observable} from 'rxjs';
|
||||||
import {Tutorial} from '../models/tutorial.model';
|
import {Tutorial} from '../models/tutorial.model';
|
||||||
import {HttpClient, HttpHeaders} from '@angular/common/http';
|
import {HttpClient, HttpHeaders} from '@angular/common/http';
|
||||||
|
import {GlobalConstants} from '../global-constants';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class UserApiService {
|
export class UserApiService {
|
||||||
baseUrl = 'http://localhost:8080/api/user';
|
baseUrl = `${GlobalConstants.API_URL}/user`;
|
||||||
|
|
||||||
httpOptions = {
|
|
||||||
headers: new HttpHeaders({ 'Content-Type': 'application/json' } )
|
|
||||||
};
|
|
||||||
|
|
||||||
constructor(private http: HttpClient) {
|
constructor(private http: HttpClient) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getUserAllTutorials(): Observable<Tutorial[]> {
|
getUserAllTutorials(): Observable<Tutorial[]> {
|
||||||
return this.http.get<Tutorial[]>(`${this.baseUrl}/tutorials`, this.httpOptions);
|
return this.http.get<Tutorial[]>(`${this.baseUrl}/tutorials`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getTutorial(id: string | null | undefined): Observable<Tutorial> {
|
||||||
|
return this.http.get<Tutorial>(`${this.baseUrl}/tutorial-get/${id}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
create(data: any): Observable<any> {
|
create(data: any): Observable<any> {
|
||||||
return this.http.post(`${this.baseUrl}/tutorial-add`, data);
|
return this.http.post(`${this.baseUrl}/tutorial-add`, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
update(id: any,data: any): Observable<any> {
|
||||||
|
return this.http.put(`${this.baseUrl}/tutorial-update/${id}`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteTutorials(tutorials: Tutorial[]): Observable<Tutorial[]> {
|
||||||
|
return forkJoin(
|
||||||
|
tutorials.map((tutorial) =>
|
||||||
|
this.http.delete<Tutorial>(`${this.baseUrl}/tutorials/${tutorial.id}`)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteTutorial(id: number): Observable<Tutorial> {
|
||||||
|
return this.http.delete<Tutorial>(`${this.baseUrl}/tutorials/${id}`);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,34 +1,9 @@
|
|||||||
<app-side-bar
|
<app-side-bar-user
|
||||||
class="pc-sidebar"
|
class="pc-sidebar"
|
||||||
>
|
>
|
||||||
|
</app-side-bar-user>
|
||||||
</app-side-bar>
|
|
||||||
|
|
||||||
<div class="pc-container">
|
<div class="pc-container">
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
</div>
|
</div>
|
||||||
<!--<mat-toolbar color="primary">-->
|
|
||||||
<!-- <button mat-icon-button aria-label="Menu icon" (click)="toggleMenu()">-->
|
|
||||||
<!-- <mat-icon>menu</mat-icon>-->
|
|
||||||
<!-- </button>-->
|
|
||||||
<!-- <h1>Responsive Material Sidenavigation</h1>-->
|
|
||||||
<!--</mat-toolbar>-->
|
|
||||||
<!--<mat-sidenav-container autosize="true">-->
|
|
||||||
<!-- <mat-sidenav [ngClass]="!isCollapsed ? 'expanded' : ''" [mode]="isMobile ? 'over' : 'side'" [opened]="isMobile ? 'false' : 'true'">-->
|
|
||||||
<!-- <mat-nav-list>-->
|
|
||||||
<!-- <a mat-list-item>-->
|
|
||||||
<!-- <span class="entry">-->
|
|
||||||
<!-- <mat-icon>house</mat-icon>-->
|
|
||||||
<!-- @if (!isCollapsed) {-->
|
|
||||||
<!-- <span >Dashboard</span>-->
|
|
||||||
<!-- }-->
|
|
||||||
<!-- </span>-->
|
|
||||||
<!-- </a>-->
|
|
||||||
<!-- </mat-nav-list>-->
|
|
||||||
<!-- </mat-sidenav>-->
|
|
||||||
<!-- <mat-sidenav-content>-->
|
|
||||||
<!-- Content-->
|
|
||||||
<!-- <router-outlet></router-outlet>-->
|
|
||||||
<!-- </mat-sidenav-content>-->
|
|
||||||
<!--</mat-sidenav-container>-->
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,50 +1,13 @@
|
|||||||
|
|
||||||
mat-toolbar{
|
|
||||||
position:fixed;
|
|
||||||
top:0;
|
|
||||||
z-index: 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
mat-sidenav-container {
|
|
||||||
height:100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Move the content down so that it won't be hidden by the toolbar
|
|
||||||
mat-sidenav {
|
|
||||||
padding-top: 3.5rem;
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
@media screen and (min-width: 600px) {
|
|
||||||
padding-top: 4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.entry{
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 1rem;
|
|
||||||
padding:0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Move the content down so that it won't be hidden by the toolbar
|
|
||||||
mat-sidenav-content{
|
|
||||||
padding-top: 3.5rem;
|
|
||||||
@media screen and (min-width: 600px) {
|
|
||||||
padding-top: 4rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.expanded {
|
|
||||||
width: 250px;
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------
|
//---------------
|
||||||
.pc-sidebar{
|
.pc-sidebar{
|
||||||
top: 65px;
|
top: 65px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
background-color: rgba(153, 153, 153, 0.16);
|
||||||
|
|
||||||
|
backdrop-filter: blur(8px);
|
||||||
}
|
}
|
||||||
.pc-container{
|
.pc-container{
|
||||||
top: 0px;
|
top: 0px;
|
||||||
|
padding-left: 5px;
|
||||||
|
padding-right: 5px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {MatIcon} from '@angular/material/icon';
|
|||||||
import {BreakpointObserver} from '@angular/cdk/layout';
|
import {BreakpointObserver} from '@angular/cdk/layout';
|
||||||
import {MatToolbar} from '@angular/material/toolbar';
|
import {MatToolbar} from '@angular/material/toolbar';
|
||||||
import {MatIconButton} from '@angular/material/button';
|
import {MatIconButton} from '@angular/material/button';
|
||||||
|
import {SideBarUserComponent} from '../side-bar-user.component/side-bar-user.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-user.component',
|
selector: 'app-user.component',
|
||||||
@@ -21,7 +22,8 @@ import {MatIconButton} from '@angular/material/button';
|
|||||||
MatListItem,
|
MatListItem,
|
||||||
MatIcon,
|
MatIcon,
|
||||||
MatToolbar,
|
MatToolbar,
|
||||||
MatIconButton
|
MatIconButton,
|
||||||
|
SideBarUserComponent
|
||||||
],
|
],
|
||||||
templateUrl: './user.component.html',
|
templateUrl: './user.component.html',
|
||||||
styleUrl: './user.component.scss',
|
styleUrl: './user.component.scss',
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ const USER_ROUTES: Routes = [
|
|||||||
path: 'tutorial-add',
|
path: 'tutorial-add',
|
||||||
loadComponent: () => import('../user-module/tutorial-add.component/tutorial-add.component').then((c) => c.TutorialAddComponent)
|
loadComponent: () => import('../user-module/tutorial-add.component/tutorial-add.component').then((c) => c.TutorialAddComponent)
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'tutorial-edit',
|
||||||
|
loadComponent: () => import('../user-module/tutorial-edit.component/tutorial-edit.component').then((c) => c.TutorialEditComponent)
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: 'ai-models',
|
path: 'ai-models',
|
||||||
loadComponent: () => import('../user-module/ai-models.component/ai-models.component').then((c) => c.AiModelsComponent)
|
loadComponent: () => import('../user-module/ai-models.component/ai-models.component').then((c) => c.AiModelsComponent)
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
default_page: 'main/generate-image'
|
default_page: 'main/generate-image',
|
||||||
|
port: 8080,
|
||||||
|
fromWeb: false,
|
||||||
|
production: false,
|
||||||
|
host_name: 'http://localhost',
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export const environment = {
|
||||||
|
default_page: 'main/generate-image',
|
||||||
|
port: 8081,
|
||||||
|
production: true,
|
||||||
|
fromWeb: true,
|
||||||
|
host_name: 'https://jambotron.run.place'
|
||||||
|
};
|
||||||
@@ -1,3 +1,7 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
default_page: 'main/generate-image'
|
default_page: 'main/generate-image',
|
||||||
|
port: 8080,
|
||||||
|
production: true,
|
||||||
|
fromWeb: false,
|
||||||
|
host_name: 'http://localhost'
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
#FROM openjdk:24 AS BUILD_IMAGE
|
#FROM openjdk:24 AS BUILD_IMAGE
|
||||||
#ENV APP_HOME=/jambotron
|
|
||||||
#RUN mkdir -p $APP_HOME/src/main/java
|
#WORKDIR /jambotron/
|
||||||
#WORKDIR $APP_HOME
|
#COPY . ./
|
||||||
#COPY ./build.gradle ./gradlew ./gradlew.bat $APP_HOME/
|
#RUN microdnf install findutils
|
||||||
#COPY gradle $APP_HOME/gradle
|
#RUN ./gradlew build -x test
|
||||||
#COPY ./src/ $APP_HOME/src/
|
|
||||||
#RUN ./gradlew clean build
|
|
||||||
|
|
||||||
FROM openjdk:24
|
FROM openjdk:24
|
||||||
WORKDIR /jambotron/
|
WORKDIR /jambotron/
|
||||||
COPY './build/libs/jambotron-0.0.1-SNAPSHOT.jar' '/app/jambotron.jar'
|
COPY './build/libs/jambotron-0.0.1-SNAPSHOT.jar' '/app/jambotron.jar'
|
||||||
#COPY --from=BUILD_IMAGE '/jambotron/build/libs/jambotron-0.0.1-SNAPSHOT.jar' '/app/jambotron.jar'
|
#COPY --from=BUILD_IMAGE /jambotron/build/libs/jambotron-0.0.1-SNAPSHOT.jar .
|
||||||
EXPOSE 8080
|
#EXPOSE 8080
|
||||||
CMD ["java","-jar","/app/jambotron.jar"]
|
CMD ["java","-jar","/app/jambotron.jar"]
|
||||||
|
#CMD ["java","-jar","jambotron-0.0.1-SNAPSHOT.jar"]
|
||||||
@@ -6,19 +6,38 @@ services:
|
|||||||
context: ../../
|
context: ../../
|
||||||
dockerfile: ./src/Docker/Dockerfile
|
dockerfile: ./src/Docker/Dockerfile
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
# - "8081:80"
|
||||||
|
- "8443:443"
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres_jambotron
|
- postgres_jambotron
|
||||||
|
volumes:
|
||||||
|
- certs:/certs
|
||||||
|
# env_file: "webapp.env"
|
||||||
environment:
|
environment:
|
||||||
SPRING_DATASOURCE_URL: jdbc:postgresql://ep-red-breeze-a2cxhq5f.eu-central-1.pg.koyeb.app:5432/jambotronDB
|
SERVER_PORT: 443
|
||||||
SPRING_DATASOURCE_USERNAME: koyeb-adm
|
FULLCHAINPEM: /certs/live/jambotron.run.place/fullchain.pem
|
||||||
SPRING_DATASOURCE_PASSWORD: npg_HfFEUA7bay1i
|
PRIVKEYPEM: /certs/live/jambotron.run.place/privkey.pem
|
||||||
|
|
||||||
|
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres_jambotron:5432/jambotronDB
|
||||||
|
SPRING_DATASOURCE_USERNAME: admin
|
||||||
|
SPRING_DATASOURCE_PASSWORD: postgrespw
|
||||||
SPRING_FLYWAY_BASELINE-ON-MIGRATE: "true"
|
SPRING_FLYWAY_BASELINE-ON-MIGRATE: "true"
|
||||||
SPRING_FLYWAY_VALIDATE-ON-MIGRATE: "true"
|
SPRING_FLYWAY_VALIDATE-ON-MIGRATE: "true"
|
||||||
|
|
||||||
SPRING_FLYWAY_USER: koyeb-adm
|
SPRING_FLYWAY_USER: admin
|
||||||
SPRING_FLYWAY_PASSWORD: npg_HfFEUA7bay1i
|
SPRING_FLYWAY_PASSWORD: postgrespw
|
||||||
SPRING_FLYWAY_URL: jdbc:postgresql://ep-red-breeze-a2cxhq5f.eu-central-1.pg.koyeb.app:5432/jambotronDB
|
SPRING_FLYWAY_URL: jdbc:postgresql://postgres_jambotron:5432/jambotronDB
|
||||||
|
|
||||||
|
# SPRING_DATASOURCE_URL: jdbc:postgresql://ep-red-breeze-a2cxhq5f.eu-central-1.pg.koyeb.app:5432/jambotronDB
|
||||||
|
# SPRING_DATASOURCE_USERNAME: koyeb-adm
|
||||||
|
# SPRING_DATASOURCE_PASSWORD: npg_HfFEUA7bay1i
|
||||||
|
# SPRING_FLYWAY_BASELINE-ON-MIGRATE: "true"
|
||||||
|
# SPRING_FLYWAY_VALIDATE-ON-MIGRATE: "true"
|
||||||
|
#
|
||||||
|
# SPRING_FLYWAY_USER: koyeb-adm
|
||||||
|
# SPRING_FLYWAY_PASSWORD: npg_HfFEUA7bay1i
|
||||||
|
# SPRING_FLYWAY_URL: jdbc:postgresql://ep-red-breeze-a2cxhq5f.eu-central-1.pg.koyeb.app:5432/jambotronDB
|
||||||
|
|
||||||
|
|
||||||
# SPRING_DATASOURCE_PASSWORD: /run/secrets/db_password
|
# SPRING_DATASOURCE_PASSWORD: /run/secrets/db_password
|
||||||
# secrets:
|
# secrets:
|
||||||
@@ -41,3 +60,6 @@ services:
|
|||||||
#secrets:
|
#secrets:
|
||||||
# db_password:
|
# db_password:
|
||||||
# file: db_password.txt
|
# file: db_password.txt
|
||||||
|
volumes:
|
||||||
|
certs:
|
||||||
|
external: true
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
SERVER_PORT=443
|
||||||
|
FULLCHAINPEM=/certs/live/jambotron.run.place/fullchain.pem
|
||||||
|
PRIVKEYPEM=/certs/live/jambotron.run.place/privkey.pem
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.jambotronGroup.jambotron;
|
package com.jambotronGroup.jambotron;
|
||||||
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
@@ -7,6 +8,7 @@ import org.slf4j.event.Level;
|
|||||||
import org.slf4j.helpers.BasicMarker;
|
import org.slf4j.helpers.BasicMarker;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.context.annotation.Import;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
@@ -19,9 +21,9 @@ public class JambotronApplication {
|
|||||||
SpringApplication.run(JambotronApplication.class, args);
|
SpringApplication.run(JambotronApplication.class, args);
|
||||||
|
|
||||||
|
|
||||||
logger.error("Application Run.");
|
logger.error("Application Run. This is an error message.");
|
||||||
logger.debug("Application Run.");
|
logger.debug("Application Run. This is a debug message.");
|
||||||
logger.info("Application Run.");
|
logger.info("Application Run. This is an info message.");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@CrossOrigin(origins = "http://localhost:4200, https://pony-sincere-chimp.ngrok-free.app/",
|
//@CrossOrigin(origins = "http://localhost:4200, https://pony-sincere-chimp.ngrok-free.app/",
|
||||||
maxAge = 3600,
|
// maxAge = 3600,
|
||||||
allowCredentials="true",
|
// allowCredentials="true",
|
||||||
allowedHeaders = {"Content-Type", "Authorization", "X-Requested-With"}
|
// allowedHeaders = {"Content-Type", "Authorization", "X-Requested-With"}
|
||||||
)
|
//)
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/zhipuai")
|
@RequestMapping("/api/public/zhipuai")
|
||||||
public class ImageController {
|
public class ImageController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
package com.jambotronGroup.jambotron.ZhiPuAi;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.ai.image.*;
|
||||||
|
import org.springframework.ai.model.ModelOptionsUtils;
|
||||||
|
import org.springframework.ai.retry.RetryUtils;
|
||||||
|
import org.springframework.ai.zhipuai.ZhiPuAiImageModel;
|
||||||
|
import org.springframework.ai.zhipuai.ZhiPuAiImageOptions;
|
||||||
|
import org.springframework.ai.zhipuai.api.ZhiPuAiImageApi;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.retry.support.RetryTemplate;
|
||||||
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class MyAIImageModel implements ImageModel {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(ZhiPuAiImageModel.class);
|
||||||
|
|
||||||
|
public final RetryTemplate retryTemplate;
|
||||||
|
|
||||||
|
private final MyImageOptions defaultOptions;
|
||||||
|
|
||||||
|
private final ZhiPuAiImageApi zhiPuAiImageApi;
|
||||||
|
|
||||||
|
public MyAIImageModel(ZhiPuAiImageApi zhiPuAiImageApi) {
|
||||||
|
this(zhiPuAiImageApi, MyImageOptions.builder().build(), RetryUtils.DEFAULT_RETRY_TEMPLATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MyAIImageModel(ZhiPuAiImageApi zhiPuAiImageApi, MyImageOptions defaultOptions,
|
||||||
|
RetryTemplate retryTemplate) {
|
||||||
|
Assert.notNull(zhiPuAiImageApi, "ZhiPuAiImageApi must not be null");
|
||||||
|
Assert.notNull(defaultOptions, "defaultOptions must not be null");
|
||||||
|
Assert.notNull(retryTemplate, "retryTemplate must not be null");
|
||||||
|
this.zhiPuAiImageApi = zhiPuAiImageApi;
|
||||||
|
this.defaultOptions = defaultOptions;
|
||||||
|
this.retryTemplate = retryTemplate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MyImageOptions getDefaultOptions() {
|
||||||
|
return this.defaultOptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ImageResponse call(ImagePrompt imagePrompt) {
|
||||||
|
return this.retryTemplate.execute(ctx -> {
|
||||||
|
|
||||||
|
String instructions = imagePrompt.getInstructions().get(0).getText();
|
||||||
|
|
||||||
|
ZhiPuAiImageApi.ZhiPuAiImageRequest imageRequest = new ZhiPuAiImageApi.ZhiPuAiImageRequest(instructions,
|
||||||
|
ZhiPuAiImageApi.DEFAULT_IMAGE_MODEL);
|
||||||
|
|
||||||
|
if (this.defaultOptions != null) {
|
||||||
|
imageRequest = ModelOptionsUtils.merge(this.defaultOptions, imageRequest,
|
||||||
|
ZhiPuAiImageApi.ZhiPuAiImageRequest.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (imagePrompt.getOptions() != null) {
|
||||||
|
imageRequest = ModelOptionsUtils.merge(toZhiPuAiImageOptions(imagePrompt.getOptions()), imageRequest,
|
||||||
|
ZhiPuAiImageApi.ZhiPuAiImageRequest.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make the request
|
||||||
|
ResponseEntity<ZhiPuAiImageApi.ZhiPuAiImageResponse> imageResponseEntity = this.zhiPuAiImageApi
|
||||||
|
.createImage(imageRequest);
|
||||||
|
|
||||||
|
// Convert to org.springframework.ai.model derived ImageResponse data type
|
||||||
|
return convertResponse(imageResponseEntity, imageRequest);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private ImageResponse convertResponse(ResponseEntity<ZhiPuAiImageApi.ZhiPuAiImageResponse> imageResponseEntity,
|
||||||
|
ZhiPuAiImageApi.ZhiPuAiImageRequest zhiPuAiImageRequest) {
|
||||||
|
ZhiPuAiImageApi.ZhiPuAiImageResponse imageApiResponse = imageResponseEntity.getBody();
|
||||||
|
if (imageApiResponse == null) {
|
||||||
|
logger.warn("No image response returned for request: {}", zhiPuAiImageRequest);
|
||||||
|
return new ImageResponse(List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
List<ImageGeneration> imageGenerationList = imageApiResponse.data()
|
||||||
|
.stream()
|
||||||
|
.map(entry -> new ImageGeneration(new Image(entry.url(), null)))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
return new ImageResponse(imageGenerationList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert the {@link ImageOptions} into {@link ZhiPuAiImageOptions}.
|
||||||
|
* @param runtimeImageOptions the image options to use.
|
||||||
|
* @return the converted {@link ZhiPuAiImageOptions}.
|
||||||
|
*/
|
||||||
|
private MyImageOptions toZhiPuAiImageOptions(ImageOptions runtimeImageOptions) {
|
||||||
|
MyImageOptions.Builder myImageOptionsBuilder = MyImageOptions.builder();
|
||||||
|
if (runtimeImageOptions != null) {
|
||||||
|
if (runtimeImageOptions.getModel() != null) {
|
||||||
|
myImageOptionsBuilder.model(runtimeImageOptions.getModel());
|
||||||
|
}
|
||||||
|
if (runtimeImageOptions instanceof MyImageOptions myImageOptions) {
|
||||||
|
if (myImageOptions.getUser() != null) {
|
||||||
|
myImageOptionsBuilder.user(myImageOptions.getUser());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return myImageOptionsBuilder.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
package com.jambotronGroup.jambotron.ZhiPuAi;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import org.springframework.ai.image.ImageOptions;
|
||||||
|
import org.springframework.ai.zhipuai.ZhiPuAiImageOptions;
|
||||||
|
import org.springframework.ai.zhipuai.api.ZhiPuAiImageApi;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class MyImageOptions implements ImageOptions {
|
||||||
|
/**
|
||||||
|
* The model to use for image generation.
|
||||||
|
*/
|
||||||
|
@JsonProperty("model")
|
||||||
|
private String model = ZhiPuAiImageApi.DEFAULT_IMAGE_MODEL;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A unique identifier representing your end-user, which can help ZhiPuAI to monitor
|
||||||
|
* and detect abuse. User ID length requirement: minimum of 6 characters, maximum of
|
||||||
|
* 128 characters
|
||||||
|
*/
|
||||||
|
@JsonProperty("user_id")
|
||||||
|
private String user;
|
||||||
|
|
||||||
|
public static MyImageOptions.Builder builder() {
|
||||||
|
|
||||||
|
return new MyImageOptions.Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@JsonIgnore
|
||||||
|
public Integer getN() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getModel() {
|
||||||
|
return this.model;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setModel(String model) {
|
||||||
|
this.model = model;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@JsonIgnore
|
||||||
|
public Integer getWidth() {
|
||||||
|
return 300;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@JsonIgnore
|
||||||
|
public Integer getHeight() {
|
||||||
|
|
||||||
|
return 200;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@JsonIgnore
|
||||||
|
public String getResponseFormat() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@JsonIgnore
|
||||||
|
public String getStyle() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUser() {
|
||||||
|
return this.user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUser(String user) {
|
||||||
|
this.user = user;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// if (!(o instanceof ZhiPuAiImageOptions that)) {
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
// return Objects.equals(this.model, that.model) && Objects.equals(this.user, that.user);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(this.model, this.user);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "ZhiPuAiImageOptions{model='" + this.model + '\'' + ", user='" + this.user + '\'' + '}';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final class Builder {
|
||||||
|
|
||||||
|
private final MyImageOptions options;
|
||||||
|
|
||||||
|
Builder() {
|
||||||
|
this.options = new MyImageOptions();
|
||||||
|
}
|
||||||
|
|
||||||
|
public MyImageOptions.Builder model(String model) {
|
||||||
|
this.options.setModel(model);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MyImageOptions.Builder user(String user) {
|
||||||
|
this.options.setUser(user);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MyImageOptions build() {
|
||||||
|
|
||||||
|
return this.options;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,9 +1,13 @@
|
|||||||
package com.jambotronGroup.jambotron.ZhiPuAi;
|
package com.jambotronGroup.jambotron.ZhiPuAi;
|
||||||
|
|
||||||
|
|
||||||
|
import org.springframework.ai.image.ImageOptions;
|
||||||
|
import org.springframework.ai.image.ImageOptionsBuilder;
|
||||||
import org.springframework.ai.image.ImagePrompt;
|
import org.springframework.ai.image.ImagePrompt;
|
||||||
import org.springframework.ai.image.ImageResponse;
|
import org.springframework.ai.image.ImageResponse;
|
||||||
|
import org.springframework.ai.retry.RetryUtils;
|
||||||
import org.springframework.ai.zhipuai.ZhiPuAiImageModel;
|
import org.springframework.ai.zhipuai.ZhiPuAiImageModel;
|
||||||
|
import org.springframework.ai.zhipuai.ZhiPuAiImageOptions;
|
||||||
import org.springframework.ai.zhipuai.api.ZhiPuAiImageApi;
|
import org.springframework.ai.zhipuai.api.ZhiPuAiImageApi;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -21,18 +25,48 @@ public class ZhiPuAiImageService {
|
|||||||
|
|
||||||
private ZhiPuAiImageApi _zhiPuAiImageApi;
|
private ZhiPuAiImageApi _zhiPuAiImageApi;
|
||||||
|
|
||||||
|
private MyAIImageModel _myAIImageModel;
|
||||||
|
|
||||||
private ZhiPuAiImageModel _zhiPuAiImageModel;
|
private ZhiPuAiImageModel _zhiPuAiImageModel;
|
||||||
|
|
||||||
|
private MyImageOptions _myImageOptions;
|
||||||
|
|
||||||
public ZhiPuAiImageService() {
|
public ZhiPuAiImageService() {
|
||||||
|
|
||||||
_zhiPuAiImageApi = new ZhiPuAiImageApi("628447c8c65845a48a7226391464a2ea.Dw8ci6TiW0BRF5LI");
|
_zhiPuAiImageApi = new ZhiPuAiImageApi("628447c8c65845a48a7226391464a2ea.Dw8ci6TiW0BRF5LI");
|
||||||
|
|
||||||
|
ImageOptionsBuilder imageOptionsBuilder = ImageOptionsBuilder.builder();
|
||||||
|
|
||||||
|
ImageOptions imageOptions = imageOptionsBuilder.model("Cogview-3-Flash")//ZhiPuAiImageApi.DEFAULT_IMAGE_MODEL)
|
||||||
|
.height(100)
|
||||||
|
.width(200)
|
||||||
|
|
||||||
|
.build();
|
||||||
|
// _myImageOptions = new MyImageOptions.Builder()
|
||||||
|
// .model(ZhiPuAiImageApi.DEFAULT_IMAGE_MODEL)
|
||||||
|
// .user("jambotron")
|
||||||
|
//
|
||||||
|
// .build();
|
||||||
|
|
||||||
|
|
||||||
_zhiPuAiImageModel = new ZhiPuAiImageModel(_zhiPuAiImageApi);
|
_zhiPuAiImageModel = new ZhiPuAiImageModel(_zhiPuAiImageApi);
|
||||||
|
_myAIImageModel = new MyAIImageModel(_zhiPuAiImageApi);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ImageResponse generateImage(String prompt) {
|
public ImageResponse generateImage(String prompt) {
|
||||||
|
ImageOptionsBuilder imageOptionsBuilder = ImageOptionsBuilder.builder();
|
||||||
|
ImageOptions imageOptions = imageOptionsBuilder.model("Cogview-3-Flash")//ZhiPuAiImageApi.DEFAULT_IMAGE_MODEL)
|
||||||
|
.height(1440)
|
||||||
|
.width(720)
|
||||||
|
|
||||||
|
.build();
|
||||||
// Create an ImagePrompt object with the desired prompt
|
// Create an ImagePrompt object with the desired prompt
|
||||||
ImagePrompt imagePrompt = new ImagePrompt(prompt);
|
ImagePrompt imagePrompt = new ImagePrompt(prompt,imageOptions);
|
||||||
|
|
||||||
|
/*// Call the generate method to get the image response
|
||||||
|
ImageResponse imageResponse = _myAIImageModel.call(imagePrompt);
|
||||||
|
*/
|
||||||
|
|
||||||
// Call the generate method to get the image response
|
// Call the generate method to get the image response
|
||||||
ImageResponse imageResponse = _zhiPuAiImageModel.call(imagePrompt);
|
ImageResponse imageResponse = _zhiPuAiImageModel.call(imagePrompt);
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import java.util.List;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
//@CrossOrigin(origins = "*", maxAge = 3600)
|
//@CrossOrigin(origins = "*", maxAge = 3600)
|
||||||
@CrossOrigin(origins = "http://localhost:4200,https://a576-5-248-149-207.ngrok-free.app, https://pony-sincere-chimp.ngrok-free.app", maxAge = 3600, allowCredentials="true")
|
//@CrossOrigin(origins = "http://localhost:4200,https://a576-5-248-149-207.ngrok-free.app, https://pony-sincere-chimp.ngrok-free.app", maxAge = 3600, allowCredentials="true")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/auth")
|
@RequestMapping("/api/auth")
|
||||||
public class AuthController {
|
public class AuthController {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user