From 392818363bf2921b919dfe0052eb628a3991aa86 Mon Sep 17 00:00:00 2001 From: Julien Dubois Date: Mon, 2 Nov 2015 20:32:50 +0100 Subject: [PATCH] automatic project update --- .gitignore | 5 + .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 49502 bytes .mvn/wrapper/maven-wrapper.properties | 1 + Gruntfile.js | 2 +- README.md | 2 +- bower.json | 1 + docker-compose-prod.yml | 4 +- mvnw | 233 +++++++++++++ mvnw.cmd | 145 ++++++++ .../myapp/config/DatabaseConfiguration.java | 1 + .../metrics/DatabaseHealthIndicator.java | 73 ---- .../JHipsterHealthIndicatorConfiguration.java | 20 -- .../myapp/config/metrics/package-info.java | 4 - .../myapp/repository/UserRepository.java | 2 + .../myapp/security/SecurityUtils.java | 3 +- .../mycompany/myapp/service/UserService.java | 8 +- .../myapp/web/rest/AccountResource.java | 7 +- .../myapp/web/rest/UserResource.java | 6 +- src/main/resources/.h2.server.properties | 2 +- src/main/resources/config/application-dev.yml | 2 +- src/main/webapp/assets/styles/main.css | 42 ++- .../angular-loading-bar/.bower.json | 39 +++ .../angular-loading-bar/CHANGELOG.md | 67 ++++ .../angular-loading-bar/Gruntfile.js | 94 +++++ .../angular-loading-bar/LICENSE | 20 ++ .../angular-loading-bar/README.md | 180 ++++++++++ .../angular-loading-bar/bower.json | 28 ++ .../angular-loading-bar/build/loading-bar.css | 110 ++++++ .../angular-loading-bar/build/loading-bar.js | 329 ++++++++++++++++++ .../build/loading-bar.min.css | 1 + .../build/loading-bar.min.js | 7 + .../angular-loading-bar/index.js | 2 + .../angular-loading-bar/package.json | 41 +++ .../angular-loading-bar/src/loading-bar.css | 104 ++++++ .../angular-loading-bar/src/loading-bar.js | 323 +++++++++++++++++ src/main/webapp/i18n/en/global.json | 3 +- src/main/webapp/i18n/fr/bankAccount.json | 3 + src/main/webapp/i18n/fr/global.json | 5 + src/main/webapp/i18n/fr/label.json | 3 + src/main/webapp/i18n/fr/operation.json | 3 + src/main/webapp/index.html | 6 + .../user-management-dialog.controller.js | 33 ++ .../user-management-dialog.html | 108 ++++++ .../user-management.controller.js | 20 -- .../user-management/user-management.html | 146 +------- .../admin/user-management/user-management.js | 51 +++ src/main/webapp/scripts/app/app.js | 31 +- .../bankAccount-delete-dialog.controller.js | 17 + .../bankAccount-delete-dialog.html | 18 + .../bankAccount-dialog.controller.js | 12 +- .../bankAccount/bankAccount-dialog.html | 2 +- .../bankAccount/bankAccount.controller.js | 17 +- .../app/entities/bankAccount/bankAccount.js | 23 ++ .../entities/bankAccount/bankAccounts.html | 27 +- .../label/label-delete-dialog.controller.js | 17 + .../entities/label/label-delete-dialog.html | 18 + .../entities/label/label-dialog.controller.js | 12 +- .../app/entities/label/label-dialog.html | 2 +- .../app/entities/label/label.controller.js | 17 +- .../scripts/app/entities/label/label.js | 23 ++ .../scripts/app/entities/label/labels.html | 27 +- .../operation-delete-dialog.controller.js | 17 + .../operation/operation-delete-dialog.html | 18 + .../operation/operation-dialog.controller.js | 12 +- .../entities/operation/operation-dialog.html | 2 +- .../operation/operation.controller.js | 17 +- .../app/entities/operation/operation.js | 23 ++ .../app/entities/operation/operations.html | 27 +- .../components/alert/alert.directive.js | 36 +- .../scripts/components/alert/alert.service.js | 209 ++++++----- src/test/javascript/karma.conf.js | 1 + src/test/resources/config/application.yml | 6 - 72 files changed, 2383 insertions(+), 537 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd delete mode 100644 src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java delete mode 100644 src/main/java/com/mycompany/myapp/config/metrics/JHipsterHealthIndicatorConfiguration.java delete mode 100644 src/main/java/com/mycompany/myapp/config/metrics/package-info.java create mode 100644 src/main/webapp/bower_components/angular-loading-bar/.bower.json create mode 100644 src/main/webapp/bower_components/angular-loading-bar/CHANGELOG.md create mode 100644 src/main/webapp/bower_components/angular-loading-bar/Gruntfile.js create mode 100644 src/main/webapp/bower_components/angular-loading-bar/LICENSE create mode 100644 src/main/webapp/bower_components/angular-loading-bar/README.md create mode 100644 src/main/webapp/bower_components/angular-loading-bar/bower.json create mode 100644 src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.css create mode 100644 src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.js create mode 100644 src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.css create mode 100644 src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.js create mode 100644 src/main/webapp/bower_components/angular-loading-bar/index.js create mode 100644 src/main/webapp/bower_components/angular-loading-bar/package.json create mode 100644 src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.css create mode 100644 src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.js create mode 100644 src/main/webapp/scripts/app/admin/user-management/user-management-dialog.controller.js create mode 100644 src/main/webapp/scripts/app/admin/user-management/user-management-dialog.html create mode 100644 src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.controller.js create mode 100644 src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.html create mode 100644 src/main/webapp/scripts/app/entities/label/label-delete-dialog.controller.js create mode 100644 src/main/webapp/scripts/app/entities/label/label-delete-dialog.html create mode 100644 src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.controller.js create mode 100644 src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.html diff --git a/.gitignore b/.gitignore index fd4b95c0..e1711e77 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,8 @@ Desktop.ini # Gradle Wrapper ###################### !gradle/wrapper/gradle-wrapper.jar + +###################### +# Maven Wrapper +###################### +!.mvn/wrapper/maven-wrapper.jar diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..5fd4d5023f1463b5ba3970e33c460c1eb26d748d GIT binary patch literal 49502 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%0A$pwhjXzyA0ZzErH{1@M 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 OJOEd-=rxTO#Qy`$*1Hh^ literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..eb919476 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index d3c3ff45..1abbd5ec 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,4 @@ -// Generated on 2015-10-23 using generator-jhipster 2.23.0 +// Generated on 2015-11-02 using generator-jhipster 2.23.0 'use strict'; var fs = require('fs'); diff --git a/README.md b/README.md index 5462fceb..abc6f5a3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Developing sampleApplication -This application was generated using JHipster, you can find documentation and help at [https://jhipster.gitub.io][]. +This application was generated using JHipster, you can find documentation and help at [https://jhipster.github.io](https://jhipster.github.io). Before you can build this project, you must install and configure the following dependencies on your machine: diff --git a/bower.json b/bower.json index de778975..9db5aef5 100644 --- a/bower.json +++ b/bower.json @@ -12,6 +12,7 @@ "angular-dynamic-locale": "0.1.27", "angular-i18n": "1.4.5", "angular-local-storage": "0.2.2", + "angular-loading-bar": "0.8.0", "angular-resource": "1.4.5", "angular-sanitize": "1.4.5", "angular-translate": "2.7.2", diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 76415631..2a49c4f5 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -1,6 +1,6 @@ jhipster-prod-mysql: container_name: sampleApplication-prod-mysql - image: mysql + image: mysql:5.7.9 # volumes: # - ~/volumes/jhipster/sampleApplication/prod-mysql/:/var/lib/mysql/ environment: @@ -9,5 +9,5 @@ jhipster-prod-mysql: - MYSQL_DATABASE=sampleapplication ports: - "3306:3306" - command: mysqld --lower_case_table_name=1 + command: mysqld --lower_case_table_names=1 diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..a1ba1bf5 --- /dev/null +++ b/mvnw @@ -0,0 +1,233 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..2b934e89 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% \ No newline at end of file diff --git a/src/main/java/com/mycompany/myapp/config/DatabaseConfiguration.java b/src/main/java/com/mycompany/myapp/config/DatabaseConfiguration.java index 0854251f..f193c3be 100644 --- a/src/main/java/com/mycompany/myapp/config/DatabaseConfiguration.java +++ b/src/main/java/com/mycompany/myapp/config/DatabaseConfiguration.java @@ -82,6 +82,7 @@ public class DatabaseConfiguration { * Open the TCP port for the H2 database, so it is available remotely. */ @Bean(initMethod = "start", destroyMethod = "stop") + @Profile(Constants.SPRING_PROFILE_DEVELOPMENT) public Server h2TCPServer() throws SQLException { return Server.createTcpServer("-tcp","-tcpAllowOthers"); } diff --git a/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java b/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java deleted file mode 100644 index 12dd3978..00000000 --- a/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.mycompany.myapp.config.metrics; - -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.util.StringUtils; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.util.HashMap; -import java.util.Map; - -/** - * SpringBoot Actuator HealthIndicator check for the Database. - */ -public class DatabaseHealthIndicator extends AbstractHealthIndicator { - - private JdbcTemplate jdbcTemplate; - - private static Map queries = new HashMap<>(); - - static { - queries.put("HSQL Database Engine", - "SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_USERS"); - queries.put("Oracle", "SELECT 'Hello' from DUAL"); - queries.put("Apache Derby", "SELECT 1 FROM SYSIBM.SYSDUMMY1"); - queries.put("MySQL", "SELECT 1"); - queries.put("PostgreSQL", "SELECT 1"); - queries.put("Microsoft SQL Server", "SELECT 1"); - } - - private static String DEFAULT_QUERY = "SELECT 1"; - - private String query = null; - - public DatabaseHealthIndicator(DataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); - } - - @Override - protected void doHealthCheck(Health.Builder builder) throws Exception { - String product = getProduct(); - builder.up().withDetail("database", product); - String query = detectQuery(product); - if (StringUtils.hasText(query)) { - try { - builder.withDetail("hello", - this.jdbcTemplate.queryForObject(query, Object.class)); - } catch (Exception ex) { - builder.down(ex); - } - } - } - - private String getProduct() { - return this.jdbcTemplate.execute((Connection connection) -> connection.getMetaData().getDatabaseProductName()); - } - - protected String detectQuery(String product) { - String query = this.query; - if (!StringUtils.hasText(query)) { - query = queries.get(product); - } - if (!StringUtils.hasText(query)) { - query = DEFAULT_QUERY; - } - return query; - } - - public void setQuery(String query) { - this.query = query; - } -} diff --git a/src/main/java/com/mycompany/myapp/config/metrics/JHipsterHealthIndicatorConfiguration.java b/src/main/java/com/mycompany/myapp/config/metrics/JHipsterHealthIndicatorConfiguration.java deleted file mode 100644 index 190a7e5f..00000000 --- a/src/main/java/com/mycompany/myapp/config/metrics/JHipsterHealthIndicatorConfiguration.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mycompany.myapp.config.metrics; - -import org.springframework.boot.actuate.health.HealthIndicator; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.inject.Inject; -import javax.sql.DataSource; - -@Configuration -public class JHipsterHealthIndicatorConfiguration { - - @Inject - private DataSource dataSource; - - @Bean - public HealthIndicator dbHealthIndicator() { - return new DatabaseHealthIndicator(dataSource); - } -} diff --git a/src/main/java/com/mycompany/myapp/config/metrics/package-info.java b/src/main/java/com/mycompany/myapp/config/metrics/package-info.java deleted file mode 100644 index 8f46c74a..00000000 --- a/src/main/java/com/mycompany/myapp/config/metrics/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Health and Metrics specific code. - */ -package com.mycompany.myapp.config.metrics; diff --git a/src/main/java/com/mycompany/myapp/repository/UserRepository.java b/src/main/java/com/mycompany/myapp/repository/UserRepository.java index 0daeafac..b45d7123 100644 --- a/src/main/java/com/mycompany/myapp/repository/UserRepository.java +++ b/src/main/java/com/mycompany/myapp/repository/UserRepository.java @@ -24,6 +24,8 @@ public interface UserRepository extends JpaRepository { Optional findOneByLogin(String login); + Optional findOneById(Long userId); + @Override void delete(User t); diff --git a/src/main/java/com/mycompany/myapp/security/SecurityUtils.java b/src/main/java/com/mycompany/myapp/security/SecurityUtils.java index 17b729d0..77b81368 100644 --- a/src/main/java/com/mycompany/myapp/security/SecurityUtils.java +++ b/src/main/java/com/mycompany/myapp/security/SecurityUtils.java @@ -82,9 +82,8 @@ public final class SecurityUtils { /** * If the current user has a specific authority (security role). * - *

The name of this method comes from the isUserInRole() method in the Servlet API

*/ - public static boolean isUserInRole(String authority) { + public static boolean isCurrentUserInRole(String authority) { SecurityContext securityContext = SecurityContextHolder.getContext(); Authentication authentication = securityContext.getAuthentication(); if (authentication != null) { diff --git a/src/main/java/com/mycompany/myapp/service/UserService.java b/src/main/java/com/mycompany/myapp/service/UserService.java index f8084ee5..174ae783 100644 --- a/src/main/java/com/mycompany/myapp/service/UserService.java +++ b/src/main/java/com/mycompany/myapp/service/UserService.java @@ -74,7 +74,7 @@ public class UserService { public Optional requestPasswordReset(String mail) { return userRepository.findOneByEmail(mail) - .filter(user -> user.getActivated()) + .filter(User::getActivated) .map(user -> { user.setResetKey(RandomUtil.generateResetKey()); user.setResetDate(ZonedDateTime.now()); @@ -109,7 +109,7 @@ public class UserService { } public void updateUserInformation(String firstName, String lastName, String email, String langKey) { - userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin()).ifPresent(u -> { + userRepository.findOneById(SecurityUtils.getCurrentUserId()).ifPresent(u -> { u.setFirstName(firstName); u.setLastName(lastName); u.setEmail(email); @@ -120,7 +120,7 @@ public class UserService { } public void changePassword(String password) { - userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin()).ifPresent(u-> { + userRepository.findOneById(SecurityUtils.getCurrentUserId()).ifPresent(u -> { String encryptedPassword = passwordEncoder.encode(password); u.setPassword(encryptedPassword); userRepository.save(u); @@ -145,7 +145,7 @@ public class UserService { @Transactional(readOnly = true) public User getUserWithAuthorities() { - User user = userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin()).get(); + User user = userRepository.findOneById(SecurityUtils.getCurrentUserId()).get(); user.getAuthorities().size(); // eagerly load the association return user; } diff --git a/src/main/java/com/mycompany/myapp/web/rest/AccountResource.java b/src/main/java/com/mycompany/myapp/web/rest/AccountResource.java index 84446d58..6f407ec5 100644 --- a/src/main/java/com/mycompany/myapp/web/rest/AccountResource.java +++ b/src/main/java/com/mycompany/myapp/web/rest/AccountResource.java @@ -123,8 +123,7 @@ public class AccountResource { @Timed public ResponseEntity saveAccount(@RequestBody UserDTO userDTO) { return userRepository - .findOneByLogin(userDTO.getLogin()) - .filter(u -> u.getLogin().equals(SecurityUtils.getCurrentUserLogin())) + .findOneById(SecurityUtils.getCurrentUserId()) .map(u -> { userService.updateUserInformation(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(), userDTO.getLangKey()); @@ -156,7 +155,7 @@ public class AccountResource { produces = MediaType.APPLICATION_JSON_VALUE) @Timed public ResponseEntity> getCurrentSessions() { - return userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin()) + return userRepository.findOneById(SecurityUtils.getCurrentUserId()) .map(user -> new ResponseEntity<>( persistentTokenRepository.findByUser(user), HttpStatus.OK)) @@ -181,7 +180,7 @@ public class AccountResource { @Timed public void invalidateSession(@PathVariable String series) throws UnsupportedEncodingException { String decodedSeries = URLDecoder.decode(series, "UTF-8"); - userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin()).ifPresent(u -> { + userRepository.findOneById(SecurityUtils.getCurrentUserId()).ifPresent(u -> { persistentTokenRepository.findByUser(u).stream() .filter(persistentToken -> StringUtils.equals(persistentToken.getSeries(), decodedSeries)) .findAny().ifPresent(t -> persistentTokenRepository.delete(decodedSeries)); diff --git a/src/main/java/com/mycompany/myapp/web/rest/UserResource.java b/src/main/java/com/mycompany/myapp/web/rest/UserResource.java index d1f330fc..871e3436 100644 --- a/src/main/java/com/mycompany/myapp/web/rest/UserResource.java +++ b/src/main/java/com/mycompany/myapp/web/rest/UserResource.java @@ -98,8 +98,8 @@ public class UserResource { @Secured(AuthoritiesConstants.ADMIN) public ResponseEntity updateUser(@RequestBody ManagedUserDTO managedUserDTO) throws URISyntaxException { log.debug("REST request to update User : {}", managedUserDTO); - return Optional.of(userRepository - .findOne(managedUserDTO.getId())) + return userRepository + .findOneById(managedUserDTO.getId()) .map(user -> { user.setLogin(managedUserDTO.getLogin()); user.setFirstName(managedUserDTO.getFirstName()); @@ -148,7 +148,7 @@ public class UserResource { public ResponseEntity getUser(@PathVariable String login) { log.debug("REST request to get User : {}", login); return userService.getUserWithAuthoritiesByLogin(login) - .map(user -> new ManagedUserDTO(user)) + .map(ManagedUserDTO::new) .map(managedUserDTO -> new ResponseEntity<>(managedUserDTO, HttpStatus.OK)) .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND)); } diff --git a/src/main/resources/.h2.server.properties b/src/main/resources/.h2.server.properties index 14b9b1d0..d24f737b 100644 --- a/src/main/resources/.h2.server.properties +++ b/src/main/resources/.h2.server.properties @@ -1,5 +1,5 @@ #H2 Server Properties -0=JHipster H2 (Memory)|org.h2.Driver|jdbc\:h2\:mem\:jhipster| +0=JHipster H2 (Memory)|org.h2.Driver|jdbc\:h2\:mem\:sampleapplication| webAllowOthers=true webPort=8082 webSSL=false diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 59e9ca62..d900dd9e 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -20,7 +20,7 @@ spring: enabled: false # we use Grunt + BrowserSync for livereload datasource: driver-class-name: org.h2.jdbcx.JdbcDataSource - url: jdbc:h2:mem:jhipster;DB_CLOSE_DELAY=-1 + url: jdbc:h2:mem:sampleapplication;DB_CLOSE_DELAY=-1 name: username: password: diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css index ca5659ce..63721561 100755 --- a/src/main/webapp/assets/styles/main.css +++ b/src/main/webapp/assets/styles/main.css @@ -111,14 +111,13 @@ only screen and ( min-resolution: 2dppx) { min-width: 400px; } -.alert .popover pre { - font-size: 10px; -} -/*Custom alerts for notification*/ +/* ========================================================================== +Custom alerts for notification +========================================================================== */ + .alerts .alert{ text-overflow: ellipsis; } - .alert pre{ background: none; border: none; @@ -128,6 +127,39 @@ only screen and ( min-resolution: 2dppx) { margin: 0; } +.alert .popover pre { + font-size: 10px; +} + +.alerts .toast { + position: fixed; + width: 100%; +} + +.alerts .toast.left { + left: 5px; +} + +.alerts .toast.right { + right: 5px; +} + +.alerts .toast.top { + top: 55px; +} + +.alerts .toast.bottom { + bottom: 55px; +} + +@media screen and (min-width: 480px) { + .alerts .toast { + width: 50%; + } +} + +/* end of Custom alerts for notification */ + .voffset { margin-top: 2px; } .voffset1 { margin-top: 5px; } .voffset2 { margin-top: 10px; } diff --git a/src/main/webapp/bower_components/angular-loading-bar/.bower.json b/src/main/webapp/bower_components/angular-loading-bar/.bower.json new file mode 100644 index 00000000..a29cf867 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/.bower.json @@ -0,0 +1,39 @@ +{ + "name": "angular-loading-bar", + "main": [ + "build/loading-bar.js", + "build/loading-bar.css" + ], + "ignore": [ + "**/.*", + "node_modules", + "components", + "test", + "example" + ], + "dependencies": { + "angular": "^1.2.9" + }, + "devDependencies": { + "angular": "~1.2.23", + "angular-1.3": "angular#1.3", + "angular-mocks": "~1.2.9", + "angular-mocks-1.3": "angular-mocks#1.3", + "angular-animate": "~1.2.9", + "angular-animate-1.3": "angular-animate#1.3" + }, + "resolutions": { + "angular": "~1.2.23" + }, + "homepage": "https://github.com/chieffancypants/angular-loading-bar", + "version": "0.8.0", + "_release": "0.8.0", + "_resolution": { + "type": "version", + "tag": "0.8.0", + "commit": "2582b44eca8c515635d1f667842a0e5b79fab405" + }, + "_source": "git://github.com/chieffancypants/angular-loading-bar.git", + "_target": "0.8.0", + "_originalSource": "angular-loading-bar" +} \ No newline at end of file diff --git a/src/main/webapp/bower_components/angular-loading-bar/CHANGELOG.md b/src/main/webapp/bower_components/angular-loading-bar/CHANGELOG.md new file mode 100644 index 00000000..3fe594c7 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/CHANGELOG.md @@ -0,0 +1,67 @@ +Changelog +========== +## 0.8.0 +- auto incrementing is now configurable +([#209](https://github.com/chieffancypants/angular-loading-bar/pull/209)) +- removed `version` from bower.json +([#207](https://github.com/chieffancypants/angular-loading-bar/pull/207)) +- added support for webpack and browserify +([#200](https://github.com/chieffancypants/angular-loading-bar/pull/200)) +- spinner border radius 10px -> 50% +([#184](https://github.com/chieffancypants/angular-loading-bar/issues/184)) + + +## 0.7.1 +- Merge correct PR for broken interceptor detection ([#133](https://github.com/chieffancypants/angular-loading-bar/pull/133), [#50](https://github.com/chieffancypants/angular-loading-bar/pull/50)) + +## 0.7.0 +- Changes for animate.enter compatibility for 1.2 and 1.3 ([#170](https://github.com/chieffancypants/angular-loading-bar/pull/170)) +- Detect errors with other interceptors ([#133](https://github.com/chieffancypants/angular-loading-bar/pull/133), [#50](https://github.com/chieffancypants/angular-loading-bar/pull/50)) +- Provide more detail on response/responseError events ([#128](https://github.com/chieffancypants/angular-loading-bar/pull/128)) +- Change angular dependency in bower ([#126](https://github.com/chieffancypants/angular-loading-bar/issues/126)) + +## 0.6.0 +- Customize progress bar template: ([#111](https://github.com/chieffancypants/angular-loading-bar/pull/111)) +- Only append bar to first parent found ([#108](https://github.com/chieffancypants/angular-loading-bar/pull/108)) + +## 0.5.2: +Fixes for Angular 1.3 breaking changes: +- Circular dependencies: ([#98](https://github.com/chieffancypants/angular-loading-bar/issues/98)), ([#101](https://github.com/chieffancypants/angular-loading-bar/pull/101)) +- $animate no longer accepts callbacks: ([#102](https://github.com/chieffancypants/angular-loading-bar/pull/102)) + +## 0.5.1 +- Reworked cache logic to allow cache:true ([#96](https://github.com/chieffancypants/angular-loading-bar/pull/96)) + +## 0.5.0 +- Added spinner template configuration ([#82](https://github.com/chieffancypants/angular-loading-bar/pull/82)) +- $timeout was not canceled properly ([#79](https://github.com/chieffancypants/angular-loading-bar/pull/79)) + +## 0.4.3 +- update z-index to work with other css frameworks ([#69](https://github.com/chieffancypants/angular-loading-bar/pull/69)) +- ignoreLoadingBar not ignored when calculating percentage complete ([#70](https://github.com/chieffancypants/angular-loading-bar/pull/70)) + +## 0.4.2 +- Split loading bar into different modules so they can be included separately ([#46](https://github.com/chieffancypants/angular-loading-bar/issues/46)) + +## 0.4.1 +- Fix for route views defined on body where loading bar is also attached ([#56](https://github.com/chieffancypants/angular-loading-bar/issues/56)) + +## 0.4.0 +- Initial load percentage is now configurable ([#47](https://github.com/chieffancypants/angular-loading-bar/issues/47)) +- Peg graphic reworked so the loadingbar does not require CSS changes when not at the very top of the page ([#42](https://github.com/chieffancypants/angular-loading-bar/issues/42), [#45](https://github.com/chieffancypants/angular-loading-bar/issues/45), [#10](https://github.com/chieffancypants/angular-loading-bar/issues/10)) +- z-index of spinner increased to work with Bootstrap 3 z-indexes ([#53](https://github.com/chieffancypants/angular-loading-bar/issues/53)) + +## 0.3.0 +- Loading bar only appears on XHR requests with high latency ([#27](https://github.com/chieffancypants/angular-loading-bar/issues/27)) + +## 0.2.0 +- Progression bar not calculated correctly for consecutive calls within the 500ms delay ([#29](https://github.com/chieffancypants/angular-loading-bar/issues/29), [#32](https://github.com/chieffancypants/angular-loading-bar/issues/32)) +- Event broadcasts when loading (#31) + +## 0.1.1 +- Alias chieffancypants.loadingbar to angular-loading-bar (#25, #19) + +## 0.1.0 +- Fixed issues with Angular 1.2-rc3+ +- Ability to ignore particular XHR requests (#21) +- Broadcasting of events (#18) diff --git a/src/main/webapp/bower_components/angular-loading-bar/Gruntfile.js b/src/main/webapp/bower_components/angular-loading-bar/Gruntfile.js new file mode 100644 index 00000000..d4126861 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/Gruntfile.js @@ -0,0 +1,94 @@ +/*global module:false*/ +module.exports = function(grunt) { + + grunt.initConfig({ + + // Metadata. + pkg: grunt.file.readJSON('package.json'), + banner: '/*! \n * <%= pkg.title || pkg.name %> v<%= pkg.version %>\n' + + ' * <%= pkg.homepage %>\n' + + ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + + ' * License: <%= pkg.license %>\n' + + ' */\n', + + // Task configuration. + uglify: { + options: { + banner: '<%= banner %>', + report: 'gzip' + }, + build: { + src: 'src/loading-bar.js', + dest: 'build/loading-bar.min.js' + } + }, + + cssmin: { + options: { + banner: '<%= banner %>', + report: 'gzip' + }, + minify: { + src: 'src/loading-bar.css', + dest: 'build/loading-bar.min.css' + } + }, + + karma: { + unit: { + configFile: 'test/karma-angular-1.2.conf.js', + singleRun: true, + coverageReporter: { + type: 'text', + dir: 'coverage/' + } + }, + unit13: { + configFile: 'test/karma-angular-1.3.conf.js', + singleRun: true, + coverageReporter: { + type: 'text', + dir: 'coverage/' + } + }, + watch: { + configFile: 'test/karma-angular-1.2.conf.js', + singleRun: false, + reporters: ['progress'] // Don't display coverage + } + }, + + jshint: { + jshintrc: '.jshintrc', + gruntfile: { + src: 'Gruntfile.js' + }, + src: { + src: ['src/*.js'] + } + }, + + concat: { + build: { + options: { + banner: '<%= banner %>' + }, + files: { + 'build/loading-bar.css': 'src/loading-bar.css', + 'build/loading-bar.js': 'src/loading-bar.js', + } + } + } + }); + + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-jshint'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-concat'); + grunt.loadNpmTasks('grunt-karma'); + + grunt.registerTask('default', ['jshint', 'karma:unit', 'karma:unit13', 'uglify', 'cssmin', 'concat:build']); + grunt.registerTask('test', ['karma:watch']); + grunt.registerTask('build', ['default']); + +}; diff --git a/src/main/webapp/bower_components/angular-loading-bar/LICENSE b/src/main/webapp/bower_components/angular-loading-bar/LICENSE new file mode 100644 index 00000000..252c23aa --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013-2014 Wes Cruver + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/webapp/bower_components/angular-loading-bar/README.md b/src/main/webapp/bower_components/angular-loading-bar/README.md new file mode 100644 index 00000000..b5dcf426 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/README.md @@ -0,0 +1,180 @@ +angular-loading-bar +=================== + +The idea is simple: Add a loading bar / progress bar whenever an XHR request goes out in angular. Multiple requests within the same time period get bundled together such that each response increments the progress bar by the appropriate amount. + +This is mostly cool because you simply include it in your app, and it works. There's no complicated setup, and no need to maintain the state of the loading bar; it's all handled automatically by the interceptor. + +**Requirements:** AngularJS 1.2+ + +**File Size:** 2.4Kb minified, 0.5Kb gzipped + + +## Usage: + +1. include the loading bar as a dependency for your app. If you want animations, include `ngAnimate` as well. *note: ngAnimate is optional* + + ```js + angular.module('myApp', ['angular-loading-bar', 'ngAnimate']) + ``` + +2. include the supplied JS and CSS file (or create your own CSS to override defaults). + + ```html + + + ``` + +3. That's it -- you're done! + +#### via bower: +``` +$ bower install angular-loading-bar +``` +#### via npm: +``` +$ npm install angular-loading-bar +``` + +#### via CDN: +```html + + +``` + +## Why I created this +There are a couple projects similar to this out there, but none were ideal for me. All implementations I've seen require that you maintain state on behalf of the loading bar. In other words, you're setting the value of the loading/progress bar manually from potentially many different locations. This becomes complicated when you have a very large application with several services all making independant XHR requests. It becomes even more complicated if you want these services to be loosly coupled. + +Additionally, Angular was created as a highly testable framework, so it pains me to see Angular modules without tests. That is not the case here as this loading bar ships with 100% code coverage. + + +**Goals for this project:** + +1. Make it automatic +2. Unit tests, 100% coverage +3. Must work well with ngAnimate +4. Must be styled via external CSS (not inline) +5. No jQuery dependencies + + +## Configuration + +#### Turn the spinner on or off: +The insertion of the spinner can be controlled through configuration. It's on by default, but if you'd like to turn it off, simply configure the service: + +```js +angular.module('myApp', ['angular-loading-bar']) + .config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) { + cfpLoadingBarProvider.includeSpinner = false; + }]) +``` + +#### Turn the loading bar on or off: +Like the spinner configuration above, the loading bar can also be turned off for cases where you only want the spinner: + +```js +angular.module('myApp', ['angular-loading-bar']) + .config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) { + cfpLoadingBarProvider.includeBar = false; + }]) +``` + +#### Latency Threshold +By default, the loading bar will only display after it has been waiting for a response for over 100ms. This helps keep things feeling snappy, and avoids the annoyingness of showing a loading bar every few seconds on really chatty applications. This threshold is totally configurable: + +```js +angular.module('myApp', ['angular-loading-bar']) + .config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) { + cfpLoadingBarProvider.latencyThreshold = 500; + }]) +``` + +#### Ignoring particular XHR requests: +The loading bar can also be forced to ignore certain requests, for example, when long-polling or periodically sending debugging information back to the server. + +```js +// ignore a particular $http GET: +$http.get('/status', { + ignoreLoadingBar: true +}); + +// ignore a particular $http POST. Note: POST and GET have different +// method signatures: +$http.post('/save', data, { + ignoreLoadingBar: true +}); + +``` + + +```js +// ignore particular $resource requests: +.factory('Restaurant', function($resource) { + return $resource('/api/restaurant/:id', {id: '@id'}, { + query: { + method: 'GET', + isArray: true, + ignoreLoadingBar: true + } + }); +}); + +``` + + + + +## How it works: +This library is split into two modules, an $http `interceptor`, and a `service`: + +**Interceptor** +The interceptor simply listens for all outgoing XHR requests, and then instructs the loadingBar service to start, stop, and increment accordingly. There is no public API for the interceptor. It can be used stand-alone by including `cfp.loadingBarInterceptor` as a dependency for your module. + +**Service** +The service is responsible for the presentation of the loading bar. It injects the loading bar into the DOM, adjusts the width whenever `set()` is called, and `complete()`s the whole show by removing the loading bar from the DOM. + +## Service API (advanced usage) +Under normal circumstances you won't need to use this. However, if you wish to use the loading bar without the interceptor, you can do that as well. Simply include the loading bar service as a dependency instead of the main `angular-loading-bar` module: + +```js +angular.module('myApp', ['cfp.loadingBar']) +``` + + +```js + +cfpLoadingBar.start(); +// will insert the loading bar into the DOM, and display its progress at 1%. +// It will automatically call `inc()` repeatedly to give the illusion that the page load is progressing. + +cfpLoadingBar.inc(); +// increments the loading bar by a random amount. +// It is important to note that the auto incrementing will begin to slow down as +// the progress increases. This is to prevent the loading bar from appearing +// completed (or almost complete) before the XHR request has responded. + +cfpLoadingBar.set(0.3) // Set the loading bar to 30% +cfpLoadingBar.status() // Returns the loading bar's progress. +// -> 0.3 + +cfpLoadingBar.complete() +// Set the loading bar's progress to 100%, and then remove it from the DOM. + +``` + +## Events +The loading bar broadcasts the following events over $rootScope allowing further customization: + +**`cfpLoadingBar:loading`** triggered upon each XHR request that is not already cached + +**`cfpLoadingBar:loaded`** triggered each time an XHR request recieves a response (either successful or error) + +**`cfpLoadingBar:started`** triggered once upon the first XHR request. Will trigger again if another request goes out after `cfpLoadingBar:completed` has triggered. + +**`cfpLoadingBar:completed`** triggered once when the all XHR requests have returned (either successfully or not) + +## Credits: +Credit goes to [rstacruz](https://github.com/rstacruz) for his excellent [nProgress](https://github.com/rstacruz/nprogress). + +## License: +Licensed under the MIT license diff --git a/src/main/webapp/bower_components/angular-loading-bar/bower.json b/src/main/webapp/bower_components/angular-loading-bar/bower.json new file mode 100644 index 00000000..c168bfe4 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/bower.json @@ -0,0 +1,28 @@ +{ + "name": "angular-loading-bar", + "main": [ + "build/loading-bar.js", + "build/loading-bar.css" + ], + "ignore": [ + "**/.*", + "node_modules", + "components", + "test", + "example" + ], + "dependencies": { + "angular": "^1.2.9" + }, + "devDependencies": { + "angular": "~1.2.23", + "angular-1.3": "angular#1.3", + "angular-mocks": "~1.2.9", + "angular-mocks-1.3": "angular-mocks#1.3", + "angular-animate": "~1.2.9", + "angular-animate-1.3": "angular-animate#1.3" + }, + "resolutions": { + "angular": "~1.2.23" + } +} diff --git a/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.css b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.css new file mode 100644 index 00000000..ccc0cace --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.css @@ -0,0 +1,110 @@ +/*! + * angular-loading-bar v0.8.0 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2015 Wes Cruver + * License: MIT + */ + +/* Make clicks pass-through */ +#loading-bar, +#loading-bar-spinner { + pointer-events: none; + -webkit-pointer-events: none; + -webkit-transition: 350ms linear all; + -moz-transition: 350ms linear all; + -o-transition: 350ms linear all; + transition: 350ms linear all; +} + +#loading-bar.ng-enter, +#loading-bar.ng-leave.ng-leave-active, +#loading-bar-spinner.ng-enter, +#loading-bar-spinner.ng-leave.ng-leave-active { + opacity: 0; +} + +#loading-bar.ng-enter.ng-enter-active, +#loading-bar.ng-leave, +#loading-bar-spinner.ng-enter.ng-enter-active, +#loading-bar-spinner.ng-leave { + opacity: 1; +} + +#loading-bar .bar { + -webkit-transition: width 350ms; + -moz-transition: width 350ms; + -o-transition: width 350ms; + transition: width 350ms; + + background: #29d; + position: fixed; + z-index: 10002; + top: 0; + left: 0; + width: 100%; + height: 2px; + border-bottom-right-radius: 1px; + border-top-right-radius: 1px; +} + +/* Fancy blur effect */ +#loading-bar .peg { + position: absolute; + width: 70px; + right: 0; + top: 0; + height: 2px; + opacity: .45; + -moz-box-shadow: #29d 1px 0 6px 1px; + -ms-box-shadow: #29d 1px 0 6px 1px; + -webkit-box-shadow: #29d 1px 0 6px 1px; + box-shadow: #29d 1px 0 6px 1px; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; +} + +#loading-bar-spinner { + display: block; + position: fixed; + z-index: 10002; + top: 10px; + left: 10px; +} + +#loading-bar-spinner .spinner-icon { + width: 14px; + height: 14px; + + border: solid 2px transparent; + border-top-color: #29d; + border-left-color: #29d; + border-radius: 50%; + + -webkit-animation: loading-bar-spinner 400ms linear infinite; + -moz-animation: loading-bar-spinner 400ms linear infinite; + -ms-animation: loading-bar-spinner 400ms linear infinite; + -o-animation: loading-bar-spinner 400ms linear infinite; + animation: loading-bar-spinner 400ms linear infinite; +} + +@-webkit-keyframes loading-bar-spinner { + 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); } +} +@-moz-keyframes loading-bar-spinner { + 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); } +} +@-o-keyframes loading-bar-spinner { + 0% { -o-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -o-transform: rotate(360deg); transform: rotate(360deg); } +} +@-ms-keyframes loading-bar-spinner { + 0% { -ms-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -ms-transform: rotate(360deg); transform: rotate(360deg); } +} +@keyframes loading-bar-spinner { + 0% { transform: rotate(0deg); transform: rotate(0deg); } + 100% { transform: rotate(360deg); transform: rotate(360deg); } +} diff --git a/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.js b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.js new file mode 100644 index 00000000..9542938b --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.js @@ -0,0 +1,329 @@ +/*! + * angular-loading-bar v0.8.0 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2015 Wes Cruver + * License: MIT + */ +/* + * angular-loading-bar + * + * intercepts XHR requests and creates a loading bar. + * Based on the excellent nprogress work by rstacruz (more info in readme) + * + * (c) 2013 Wes Cruver + * License: MIT + */ + + +(function() { + +'use strict'; + +// Alias the loading bar for various backwards compatibilities since the project has matured: +angular.module('angular-loading-bar', ['cfp.loadingBarInterceptor']); +angular.module('chieffancypants.loadingBar', ['cfp.loadingBarInterceptor']); + + +/** + * loadingBarInterceptor service + * + * Registers itself as an Angular interceptor and listens for XHR requests. + */ +angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar']) + .config(['$httpProvider', function ($httpProvider) { + + var interceptor = ['$q', '$cacheFactory', '$timeout', '$rootScope', '$log', 'cfpLoadingBar', function ($q, $cacheFactory, $timeout, $rootScope, $log, cfpLoadingBar) { + + /** + * The total number of requests made + */ + var reqsTotal = 0; + + /** + * The number of requests completed (either successfully or not) + */ + var reqsCompleted = 0; + + /** + * The amount of time spent fetching before showing the loading bar + */ + var latencyThreshold = cfpLoadingBar.latencyThreshold; + + /** + * $timeout handle for latencyThreshold + */ + var startTimeout; + + + /** + * calls cfpLoadingBar.complete() which removes the + * loading bar from the DOM. + */ + function setComplete() { + $timeout.cancel(startTimeout); + cfpLoadingBar.complete(); + reqsCompleted = 0; + reqsTotal = 0; + } + + /** + * Determine if the response has already been cached + * @param {Object} config the config option from the request + * @return {Boolean} retrns true if cached, otherwise false + */ + function isCached(config) { + var cache; + var defaultCache = $cacheFactory.get('$http'); + var defaults = $httpProvider.defaults; + + // Choose the proper cache source. Borrowed from angular: $http service + if ((config.cache || defaults.cache) && config.cache !== false && + (config.method === 'GET' || config.method === 'JSONP')) { + cache = angular.isObject(config.cache) ? config.cache + : angular.isObject(defaults.cache) ? defaults.cache + : defaultCache; + } + + var cached = cache !== undefined ? + cache.get(config.url) !== undefined : false; + + if (config.cached !== undefined && cached !== config.cached) { + return config.cached; + } + config.cached = cached; + return cached; + } + + + return { + 'request': function(config) { + // Check to make sure this request hasn't already been cached and that + // the requester didn't explicitly ask us to ignore this request: + if (!config.ignoreLoadingBar && !isCached(config)) { + $rootScope.$broadcast('cfpLoadingBar:loading', {url: config.url}); + if (reqsTotal === 0) { + startTimeout = $timeout(function() { + cfpLoadingBar.start(); + }, latencyThreshold); + } + reqsTotal++; + cfpLoadingBar.set(reqsCompleted / reqsTotal); + } + return config; + }, + + 'response': function(response) { + if (!response || !response.config) { + $log.error('Broken interceptor detected: Config object not supplied in response:\n https://github.com/chieffancypants/angular-loading-bar/pull/50'); + return response; + } + + if (!response.config.ignoreLoadingBar && !isCached(response.config)) { + reqsCompleted++; + $rootScope.$broadcast('cfpLoadingBar:loaded', {url: response.config.url, result: response}); + if (reqsCompleted >= reqsTotal) { + setComplete(); + } else { + cfpLoadingBar.set(reqsCompleted / reqsTotal); + } + } + return response; + }, + + 'responseError': function(rejection) { + if (!rejection || !rejection.config) { + $log.error('Broken interceptor detected: Config object not supplied in rejection:\n https://github.com/chieffancypants/angular-loading-bar/pull/50'); + return $q.reject(rejection); + } + + if (!rejection.config.ignoreLoadingBar && !isCached(rejection.config)) { + reqsCompleted++; + $rootScope.$broadcast('cfpLoadingBar:loaded', {url: rejection.config.url, result: rejection}); + if (reqsCompleted >= reqsTotal) { + setComplete(); + } else { + cfpLoadingBar.set(reqsCompleted / reqsTotal); + } + } + return $q.reject(rejection); + } + }; + }]; + + $httpProvider.interceptors.push(interceptor); + }]); + + +/** + * Loading Bar + * + * This service handles adding and removing the actual element in the DOM. + * Generally, best practices for DOM manipulation is to take place in a + * directive, but because the element itself is injected in the DOM only upon + * XHR requests, and it's likely needed on every view, the best option is to + * use a service. + */ +angular.module('cfp.loadingBar', []) + .provider('cfpLoadingBar', function() { + + this.autoIncrement = true; + this.includeSpinner = true; + this.includeBar = true; + this.latencyThreshold = 100; + this.startSize = 0.02; + this.parentSelector = 'body'; + this.spinnerTemplate = '
'; + this.loadingBarTemplate = '
'; + + this.$get = ['$injector', '$document', '$timeout', '$rootScope', function ($injector, $document, $timeout, $rootScope) { + var $animate; + var $parentSelector = this.parentSelector, + loadingBarContainer = angular.element(this.loadingBarTemplate), + loadingBar = loadingBarContainer.find('div').eq(0), + spinner = angular.element(this.spinnerTemplate); + + var incTimeout, + completeTimeout, + started = false, + status = 0; + + var autoIncrement = this.autoIncrement; + var includeSpinner = this.includeSpinner; + var includeBar = this.includeBar; + var startSize = this.startSize; + + /** + * Inserts the loading bar element into the dom, and sets it to 2% + */ + function _start() { + if (!$animate) { + $animate = $injector.get('$animate'); + } + + var $parent = $document.find($parentSelector).eq(0); + $timeout.cancel(completeTimeout); + + // do not continually broadcast the started event: + if (started) { + return; + } + + $rootScope.$broadcast('cfpLoadingBar:started'); + started = true; + + if (includeBar) { + $animate.enter(loadingBarContainer, $parent, angular.element($parent[0].lastChild)); + } + + if (includeSpinner) { + $animate.enter(spinner, $parent, angular.element($parent[0].lastChild)); + } + + _set(startSize); + } + + /** + * Set the loading bar's width to a certain percent. + * + * @param n any value between 0 and 1 + */ + function _set(n) { + if (!started) { + return; + } + var pct = (n * 100) + '%'; + loadingBar.css('width', pct); + status = n; + + // increment loadingbar to give the illusion that there is always + // progress but make sure to cancel the previous timeouts so we don't + // have multiple incs running at the same time. + if (autoIncrement) { + $timeout.cancel(incTimeout); + incTimeout = $timeout(function() { + _inc(); + }, 250); + } + } + + /** + * Increments the loading bar by a random amount + * but slows down as it progresses + */ + function _inc() { + if (_status() >= 1) { + return; + } + + var rnd = 0; + + // TODO: do this mathmatically instead of through conditions + + var stat = _status(); + if (stat >= 0 && stat < 0.25) { + // Start out between 3 - 6% increments + rnd = (Math.random() * (5 - 3 + 1) + 3) / 100; + } else if (stat >= 0.25 && stat < 0.65) { + // increment between 0 - 3% + rnd = (Math.random() * 3) / 100; + } else if (stat >= 0.65 && stat < 0.9) { + // increment between 0 - 2% + rnd = (Math.random() * 2) / 100; + } else if (stat >= 0.9 && stat < 0.99) { + // finally, increment it .5 % + rnd = 0.005; + } else { + // after 99%, don't increment: + rnd = 0; + } + + var pct = _status() + rnd; + _set(pct); + } + + function _status() { + return status; + } + + function _completeAnimation() { + status = 0; + started = false; + } + + function _complete() { + if (!$animate) { + $animate = $injector.get('$animate'); + } + + $rootScope.$broadcast('cfpLoadingBar:completed'); + _set(1); + + $timeout.cancel(completeTimeout); + + // Attempt to aggregate any start/complete calls within 500ms: + completeTimeout = $timeout(function() { + var promise = $animate.leave(loadingBarContainer, _completeAnimation); + if (promise && promise.then) { + promise.then(_completeAnimation); + } + $animate.leave(spinner); + }, 500); + } + + return { + start : _start, + set : _set, + status : _status, + inc : _inc, + complete : _complete, + autoIncrement : this.autoIncrement, + includeSpinner : this.includeSpinner, + latencyThreshold : this.latencyThreshold, + parentSelector : this.parentSelector, + startSize : this.startSize + }; + + + }]; // + }); // wtf javascript. srsly +})(); // diff --git a/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.css b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.css new file mode 100644 index 00000000..0f9f1067 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.css @@ -0,0 +1 @@ +#loading-bar,#loading-bar-spinner{pointer-events:none;-webkit-pointer-events:none;-webkit-transition:350ms linear all;-moz-transition:350ms linear all;-o-transition:350ms linear all;transition:350ms linear all}#loading-bar-spinner.ng-enter,#loading-bar-spinner.ng-leave.ng-leave-active,#loading-bar.ng-enter,#loading-bar.ng-leave.ng-leave-active{opacity:0}#loading-bar-spinner.ng-enter.ng-enter-active,#loading-bar-spinner.ng-leave,#loading-bar.ng-enter.ng-enter-active,#loading-bar.ng-leave{opacity:1}#loading-bar .bar{-webkit-transition:width 350ms;-moz-transition:width 350ms;-o-transition:width 350ms;transition:width 350ms;background:#29d;position:fixed;z-index:10002;top:0;left:0;width:100%;height:2px;border-bottom-right-radius:1px;border-top-right-radius:1px}#loading-bar .peg{position:absolute;width:70px;right:0;top:0;height:2px;opacity:.45;-moz-box-shadow:#29d 1px 0 6px 1px;-ms-box-shadow:#29d 1px 0 6px 1px;-webkit-box-shadow:#29d 1px 0 6px 1px;box-shadow:#29d 1px 0 6px 1px;-moz-border-radius:100%;-webkit-border-radius:100%;border-radius:100%}#loading-bar-spinner{display:block;position:fixed;z-index:10002;top:10px;left:10px}#loading-bar-spinner .spinner-icon{width:14px;height:14px;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:loading-bar-spinner 400ms linear infinite;-moz-animation:loading-bar-spinner 400ms linear infinite;-ms-animation:loading-bar-spinner 400ms linear infinite;-o-animation:loading-bar-spinner 400ms linear infinite;animation:loading-bar-spinner 400ms linear infinite}@-webkit-keyframes loading-bar-spinner{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes loading-bar-spinner{0%{-moz-transform:rotate(0);transform:rotate(0)}100%{-moz-transform:rotate(360deg);transform:rotate(360deg)}}@-o-keyframes loading-bar-spinner{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(360deg);transform:rotate(360deg)}}@-ms-keyframes loading-bar-spinner{0%{-ms-transform:rotate(0);transform:rotate(0)}100%{-ms-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes loading-bar-spinner{0%{transform:rotate(0)}100%{transform:rotate(360deg)}} \ No newline at end of file diff --git a/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.js b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.js new file mode 100644 index 00000000..5026baf9 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/build/loading-bar.min.js @@ -0,0 +1,7 @@ +/*! + * angular-loading-bar v0.8.0 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2015 Wes Cruver + * License: MIT + */ +!function(){"use strict";angular.module("angular-loading-bar",["cfp.loadingBarInterceptor"]),angular.module("chieffancypants.loadingBar",["cfp.loadingBarInterceptor"]),angular.module("cfp.loadingBarInterceptor",["cfp.loadingBar"]).config(["$httpProvider",function(a){var b=["$q","$cacheFactory","$timeout","$rootScope","$log","cfpLoadingBar",function(b,c,d,e,f,g){function h(){d.cancel(j),g.complete(),l=0,k=0}function i(b){var d,e=c.get("$http"),f=a.defaults;!b.cache&&!f.cache||b.cache===!1||"GET"!==b.method&&"JSONP"!==b.method||(d=angular.isObject(b.cache)?b.cache:angular.isObject(f.cache)?f.cache:e);var g=void 0!==d?void 0!==d.get(b.url):!1;return void 0!==b.cached&&g!==b.cached?b.cached:(b.cached=g,g)}var j,k=0,l=0,m=g.latencyThreshold;return{request:function(a){return a.ignoreLoadingBar||i(a)||(e.$broadcast("cfpLoadingBar:loading",{url:a.url}),0===k&&(j=d(function(){g.start()},m)),k++,g.set(l/k)),a},response:function(a){return a&&a.config?(a.config.ignoreLoadingBar||i(a.config)||(l++,e.$broadcast("cfpLoadingBar:loaded",{url:a.config.url,result:a}),l>=k?h():g.set(l/k)),a):(f.error("Broken interceptor detected: Config object not supplied in response:\n https://github.com/chieffancypants/angular-loading-bar/pull/50"),a)},responseError:function(a){return a&&a.config?(a.config.ignoreLoadingBar||i(a.config)||(l++,e.$broadcast("cfpLoadingBar:loaded",{url:a.config.url,result:a}),l>=k?h():g.set(l/k)),b.reject(a)):(f.error("Broken interceptor detected: Config object not supplied in rejection:\n https://github.com/chieffancypants/angular-loading-bar/pull/50"),b.reject(a))}}}];a.interceptors.push(b)}]),angular.module("cfp.loadingBar",[]).provider("cfpLoadingBar",function(){this.autoIncrement=!0,this.includeSpinner=!0,this.includeBar=!0,this.latencyThreshold=100,this.startSize=.02,this.parentSelector="body",this.spinnerTemplate='
',this.loadingBarTemplate='
',this.$get=["$injector","$document","$timeout","$rootScope",function(a,b,c,d){function e(){k||(k=a.get("$animate"));var e=b.find(n).eq(0);c.cancel(m),r||(d.$broadcast("cfpLoadingBar:started"),r=!0,v&&k.enter(o,e,angular.element(e[0].lastChild)),u&&k.enter(q,e,angular.element(e[0].lastChild)),f(w))}function f(a){if(r){var b=100*a+"%";p.css("width",b),s=a,t&&(c.cancel(l),l=c(function(){g()},250))}}function g(){if(!(h()>=1)){var a=0,b=h();a=b>=0&&.25>b?(3*Math.random()+3)/100:b>=.25&&.65>b?3*Math.random()/100:b>=.65&&.9>b?2*Math.random()/100:b>=.9&&.99>b?.005:0;var c=h()+a;f(c)}}function h(){return s}function i(){s=0,r=!1}function j(){k||(k=a.get("$animate")),d.$broadcast("cfpLoadingBar:completed"),f(1),c.cancel(m),m=c(function(){var a=k.leave(o,i);a&&a.then&&a.then(i),k.leave(q)},500)}var k,l,m,n=this.parentSelector,o=angular.element(this.loadingBarTemplate),p=o.find("div").eq(0),q=angular.element(this.spinnerTemplate),r=!1,s=0,t=this.autoIncrement,u=this.includeSpinner,v=this.includeBar,w=this.startSize;return{start:e,set:f,status:h,inc:g,complete:j,autoIncrement:this.autoIncrement,includeSpinner:this.includeSpinner,latencyThreshold:this.latencyThreshold,parentSelector:this.parentSelector,startSize:this.startSize}}]})}(); \ No newline at end of file diff --git a/src/main/webapp/bower_components/angular-loading-bar/index.js b/src/main/webapp/bower_components/angular-loading-bar/index.js new file mode 100644 index 00000000..411428d8 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/index.js @@ -0,0 +1,2 @@ +require('./build/loading-bar'); +module.exports = 'angular-loading-bar'; diff --git a/src/main/webapp/bower_components/angular-loading-bar/package.json b/src/main/webapp/bower_components/angular-loading-bar/package.json new file mode 100644 index 00000000..21c88970 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/package.json @@ -0,0 +1,41 @@ +{ + "name": "angular-loading-bar", + "version": "0.8.0", + "description": "An automatic loading bar for AngularJS", + "main": "index.js", + "directories": { + "example": "example", + "test": "test" + }, + "repository": { + "type": "git", + "url": "git://github.com/chieffancypants/angular-loading-bar.git" + }, + "keywords": [ + "angular", + "angularjs", + "loading", + "loadingbar", + "progress", + "progressbar" + ], + "author": "Wes Cruver", + "license": "MIT", + "bugs": { + "url": "https://github.com/chieffancypants/angular-loading-bar/issues" + }, + "homepage": "https://chieffancypants.github.io/angular-loading-bar", + "devDependencies": { + "karma-jasmine": "^0.1.3", + "karma-coffee-preprocessor": "^0.2.0", + "karma-phantomjs-launcher": "^0.1.0", + "karma": "~0.12.0", + "karma-coverage": "^0.1.0", + "grunt": "~0.4.1", + "grunt-contrib-jshint": "~0.6.4", + "grunt-contrib-uglify": "^0.9.1", + "grunt-contrib-cssmin": "~0.12.0", + "grunt-karma": "~0.11.0", + "grunt-contrib-concat": "^0.5.0" + } +} diff --git a/src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.css b/src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.css new file mode 100644 index 00000000..469d1433 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.css @@ -0,0 +1,104 @@ + +/* Make clicks pass-through */ +#loading-bar, +#loading-bar-spinner { + pointer-events: none; + -webkit-pointer-events: none; + -webkit-transition: 350ms linear all; + -moz-transition: 350ms linear all; + -o-transition: 350ms linear all; + transition: 350ms linear all; +} + +#loading-bar.ng-enter, +#loading-bar.ng-leave.ng-leave-active, +#loading-bar-spinner.ng-enter, +#loading-bar-spinner.ng-leave.ng-leave-active { + opacity: 0; +} + +#loading-bar.ng-enter.ng-enter-active, +#loading-bar.ng-leave, +#loading-bar-spinner.ng-enter.ng-enter-active, +#loading-bar-spinner.ng-leave { + opacity: 1; +} + +#loading-bar .bar { + -webkit-transition: width 350ms; + -moz-transition: width 350ms; + -o-transition: width 350ms; + transition: width 350ms; + + background: #29d; + position: fixed; + z-index: 10002; + top: 0; + left: 0; + width: 100%; + height: 2px; + border-bottom-right-radius: 1px; + border-top-right-radius: 1px; +} + +/* Fancy blur effect */ +#loading-bar .peg { + position: absolute; + width: 70px; + right: 0; + top: 0; + height: 2px; + opacity: .45; + -moz-box-shadow: #29d 1px 0 6px 1px; + -ms-box-shadow: #29d 1px 0 6px 1px; + -webkit-box-shadow: #29d 1px 0 6px 1px; + box-shadow: #29d 1px 0 6px 1px; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; +} + +#loading-bar-spinner { + display: block; + position: fixed; + z-index: 10002; + top: 10px; + left: 10px; +} + +#loading-bar-spinner .spinner-icon { + width: 14px; + height: 14px; + + border: solid 2px transparent; + border-top-color: #29d; + border-left-color: #29d; + border-radius: 50%; + + -webkit-animation: loading-bar-spinner 400ms linear infinite; + -moz-animation: loading-bar-spinner 400ms linear infinite; + -ms-animation: loading-bar-spinner 400ms linear infinite; + -o-animation: loading-bar-spinner 400ms linear infinite; + animation: loading-bar-spinner 400ms linear infinite; +} + +@-webkit-keyframes loading-bar-spinner { + 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); } +} +@-moz-keyframes loading-bar-spinner { + 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); } +} +@-o-keyframes loading-bar-spinner { + 0% { -o-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -o-transform: rotate(360deg); transform: rotate(360deg); } +} +@-ms-keyframes loading-bar-spinner { + 0% { -ms-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -ms-transform: rotate(360deg); transform: rotate(360deg); } +} +@keyframes loading-bar-spinner { + 0% { transform: rotate(0deg); transform: rotate(0deg); } + 100% { transform: rotate(360deg); transform: rotate(360deg); } +} diff --git a/src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.js b/src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.js new file mode 100644 index 00000000..364ca826 --- /dev/null +++ b/src/main/webapp/bower_components/angular-loading-bar/src/loading-bar.js @@ -0,0 +1,323 @@ +/* + * angular-loading-bar + * + * intercepts XHR requests and creates a loading bar. + * Based on the excellent nprogress work by rstacruz (more info in readme) + * + * (c) 2013 Wes Cruver + * License: MIT + */ + + +(function() { + +'use strict'; + +// Alias the loading bar for various backwards compatibilities since the project has matured: +angular.module('angular-loading-bar', ['cfp.loadingBarInterceptor']); +angular.module('chieffancypants.loadingBar', ['cfp.loadingBarInterceptor']); + + +/** + * loadingBarInterceptor service + * + * Registers itself as an Angular interceptor and listens for XHR requests. + */ +angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar']) + .config(['$httpProvider', function ($httpProvider) { + + var interceptor = ['$q', '$cacheFactory', '$timeout', '$rootScope', '$log', 'cfpLoadingBar', function ($q, $cacheFactory, $timeout, $rootScope, $log, cfpLoadingBar) { + + /** + * The total number of requests made + */ + var reqsTotal = 0; + + /** + * The number of requests completed (either successfully or not) + */ + var reqsCompleted = 0; + + /** + * The amount of time spent fetching before showing the loading bar + */ + var latencyThreshold = cfpLoadingBar.latencyThreshold; + + /** + * $timeout handle for latencyThreshold + */ + var startTimeout; + + + /** + * calls cfpLoadingBar.complete() which removes the + * loading bar from the DOM. + */ + function setComplete() { + $timeout.cancel(startTimeout); + cfpLoadingBar.complete(); + reqsCompleted = 0; + reqsTotal = 0; + } + + /** + * Determine if the response has already been cached + * @param {Object} config the config option from the request + * @return {Boolean} retrns true if cached, otherwise false + */ + function isCached(config) { + var cache; + var defaultCache = $cacheFactory.get('$http'); + var defaults = $httpProvider.defaults; + + // Choose the proper cache source. Borrowed from angular: $http service + if ((config.cache || defaults.cache) && config.cache !== false && + (config.method === 'GET' || config.method === 'JSONP')) { + cache = angular.isObject(config.cache) ? config.cache + : angular.isObject(defaults.cache) ? defaults.cache + : defaultCache; + } + + var cached = cache !== undefined ? + cache.get(config.url) !== undefined : false; + + if (config.cached !== undefined && cached !== config.cached) { + return config.cached; + } + config.cached = cached; + return cached; + } + + + return { + 'request': function(config) { + // Check to make sure this request hasn't already been cached and that + // the requester didn't explicitly ask us to ignore this request: + if (!config.ignoreLoadingBar && !isCached(config)) { + $rootScope.$broadcast('cfpLoadingBar:loading', {url: config.url}); + if (reqsTotal === 0) { + startTimeout = $timeout(function() { + cfpLoadingBar.start(); + }, latencyThreshold); + } + reqsTotal++; + cfpLoadingBar.set(reqsCompleted / reqsTotal); + } + return config; + }, + + 'response': function(response) { + if (!response || !response.config) { + $log.error('Broken interceptor detected: Config object not supplied in response:\n https://github.com/chieffancypants/angular-loading-bar/pull/50'); + return response; + } + + if (!response.config.ignoreLoadingBar && !isCached(response.config)) { + reqsCompleted++; + $rootScope.$broadcast('cfpLoadingBar:loaded', {url: response.config.url, result: response}); + if (reqsCompleted >= reqsTotal) { + setComplete(); + } else { + cfpLoadingBar.set(reqsCompleted / reqsTotal); + } + } + return response; + }, + + 'responseError': function(rejection) { + if (!rejection || !rejection.config) { + $log.error('Broken interceptor detected: Config object not supplied in rejection:\n https://github.com/chieffancypants/angular-loading-bar/pull/50'); + return $q.reject(rejection); + } + + if (!rejection.config.ignoreLoadingBar && !isCached(rejection.config)) { + reqsCompleted++; + $rootScope.$broadcast('cfpLoadingBar:loaded', {url: rejection.config.url, result: rejection}); + if (reqsCompleted >= reqsTotal) { + setComplete(); + } else { + cfpLoadingBar.set(reqsCompleted / reqsTotal); + } + } + return $q.reject(rejection); + } + }; + }]; + + $httpProvider.interceptors.push(interceptor); + }]); + + +/** + * Loading Bar + * + * This service handles adding and removing the actual element in the DOM. + * Generally, best practices for DOM manipulation is to take place in a + * directive, but because the element itself is injected in the DOM only upon + * XHR requests, and it's likely needed on every view, the best option is to + * use a service. + */ +angular.module('cfp.loadingBar', []) + .provider('cfpLoadingBar', function() { + + this.autoIncrement = true; + this.includeSpinner = true; + this.includeBar = true; + this.latencyThreshold = 100; + this.startSize = 0.02; + this.parentSelector = 'body'; + this.spinnerTemplate = '
'; + this.loadingBarTemplate = '
'; + + this.$get = ['$injector', '$document', '$timeout', '$rootScope', function ($injector, $document, $timeout, $rootScope) { + var $animate; + var $parentSelector = this.parentSelector, + loadingBarContainer = angular.element(this.loadingBarTemplate), + loadingBar = loadingBarContainer.find('div').eq(0), + spinner = angular.element(this.spinnerTemplate); + + var incTimeout, + completeTimeout, + started = false, + status = 0; + + var autoIncrement = this.autoIncrement; + var includeSpinner = this.includeSpinner; + var includeBar = this.includeBar; + var startSize = this.startSize; + + /** + * Inserts the loading bar element into the dom, and sets it to 2% + */ + function _start() { + if (!$animate) { + $animate = $injector.get('$animate'); + } + + var $parent = $document.find($parentSelector).eq(0); + $timeout.cancel(completeTimeout); + + // do not continually broadcast the started event: + if (started) { + return; + } + + $rootScope.$broadcast('cfpLoadingBar:started'); + started = true; + + if (includeBar) { + $animate.enter(loadingBarContainer, $parent, angular.element($parent[0].lastChild)); + } + + if (includeSpinner) { + $animate.enter(spinner, $parent, angular.element($parent[0].lastChild)); + } + + _set(startSize); + } + + /** + * Set the loading bar's width to a certain percent. + * + * @param n any value between 0 and 1 + */ + function _set(n) { + if (!started) { + return; + } + var pct = (n * 100) + '%'; + loadingBar.css('width', pct); + status = n; + + // increment loadingbar to give the illusion that there is always + // progress but make sure to cancel the previous timeouts so we don't + // have multiple incs running at the same time. + if (autoIncrement) { + $timeout.cancel(incTimeout); + incTimeout = $timeout(function() { + _inc(); + }, 250); + } + } + + /** + * Increments the loading bar by a random amount + * but slows down as it progresses + */ + function _inc() { + if (_status() >= 1) { + return; + } + + var rnd = 0; + + // TODO: do this mathmatically instead of through conditions + + var stat = _status(); + if (stat >= 0 && stat < 0.25) { + // Start out between 3 - 6% increments + rnd = (Math.random() * (5 - 3 + 1) + 3) / 100; + } else if (stat >= 0.25 && stat < 0.65) { + // increment between 0 - 3% + rnd = (Math.random() * 3) / 100; + } else if (stat >= 0.65 && stat < 0.9) { + // increment between 0 - 2% + rnd = (Math.random() * 2) / 100; + } else if (stat >= 0.9 && stat < 0.99) { + // finally, increment it .5 % + rnd = 0.005; + } else { + // after 99%, don't increment: + rnd = 0; + } + + var pct = _status() + rnd; + _set(pct); + } + + function _status() { + return status; + } + + function _completeAnimation() { + status = 0; + started = false; + } + + function _complete() { + if (!$animate) { + $animate = $injector.get('$animate'); + } + + $rootScope.$broadcast('cfpLoadingBar:completed'); + _set(1); + + $timeout.cancel(completeTimeout); + + // Attempt to aggregate any start/complete calls within 500ms: + completeTimeout = $timeout(function() { + var promise = $animate.leave(loadingBarContainer, _completeAnimation); + if (promise && promise.then) { + promise.then(_completeAnimation); + } + $animate.leave(spinner); + }, 500); + } + + return { + start : _start, + set : _set, + status : _status, + inc : _inc, + complete : _complete, + autoIncrement : this.autoIncrement, + includeSpinner : this.includeSpinner, + latencyThreshold : this.latencyThreshold, + parentSelector : this.parentSelector, + startSize : this.startSize + }; + + + }]; // + }); // wtf javascript. srsly +})(); // diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index 3f25ad9e..2935128d 100644 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -109,7 +109,8 @@ }, "error": { "serverNotReachable": "Server not reachable", - "NotNull": "Field {{fieldName}} cannot be empty!" + "NotNull": "Field {{fieldName}} cannot be empty!", + "Size": "Field {{fieldName}} does not meet min/max size requirements!" }, "footer": "This is your footer" } diff --git a/src/main/webapp/i18n/fr/bankAccount.json b/src/main/webapp/i18n/fr/bankAccount.json index bb0fcb6f..2ab06392 100644 --- a/src/main/webapp/i18n/fr/bankAccount.json +++ b/src/main/webapp/i18n/fr/bankAccount.json @@ -6,6 +6,9 @@ "createLabel": "Créer un nouveau BankAccount", "createOrEditLabel": "Créer ou éditer un BankAccount" }, + "created": "Un nouveau BankAccount a été créé avec l'identifiant {{ param }}", + "updated": "Le BankAccount avec l'identifiant {{ param }} a été mis à jour", + "deleted": "Le BankAccount avec l'identifiant {{ param }} a été supprimé", "delete": { "question": "Etes-vous certain de vouloir supprimer le BankAccount {{ id }} ?" }, diff --git a/src/main/webapp/i18n/fr/global.json b/src/main/webapp/i18n/fr/global.json index 14a8e269..589d7d4b 100644 --- a/src/main/webapp/i18n/fr/global.json +++ b/src/main/webapp/i18n/fr/global.json @@ -107,5 +107,10 @@ "datetimelocal": "Ce champs doit être une date et une heure." } }, + "error": { + "serverNotReachable": "Server not reachable", + "NotNull": "Field {{fieldName}} cannot be empty!", + "Size": "Field {{fieldName}} does not meet min/max size requirements!" + }, "footer": "Ceci est votre pied de page" } diff --git a/src/main/webapp/i18n/fr/label.json b/src/main/webapp/i18n/fr/label.json index 5afccb8e..fc22799a 100644 --- a/src/main/webapp/i18n/fr/label.json +++ b/src/main/webapp/i18n/fr/label.json @@ -6,6 +6,9 @@ "createLabel": "Créer un nouveau Label", "createOrEditLabel": "Créer ou éditer un Label" }, + "created": "Un nouveau Label a été créé avec l'identifiant {{ param }}", + "updated": "Le Label avec l'identifiant {{ param }} a été mis à jour", + "deleted": "Le Label avec l'identifiant {{ param }} a été supprimé", "delete": { "question": "Etes-vous certain de vouloir supprimer le Label {{ id }} ?" }, diff --git a/src/main/webapp/i18n/fr/operation.json b/src/main/webapp/i18n/fr/operation.json index a1c7c2c8..36ea3c64 100644 --- a/src/main/webapp/i18n/fr/operation.json +++ b/src/main/webapp/i18n/fr/operation.json @@ -6,6 +6,9 @@ "createLabel": "Créer un nouveau Operation", "createOrEditLabel": "Créer ou éditer un Operation" }, + "created": "Un nouveau Operation a été créé avec l'identifiant {{ param }}", + "updated": "Le Operation avec l'identifiant {{ param }} a été mis à jour", + "deleted": "Le Operation avec l'identifiant {{ param }} a été supprimé", "delete": { "question": "Etes-vous certain de vouloir supprimer le Operation {{ id }} ?" }, diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 9bdb34da..fa184472 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -10,6 +10,7 @@ + @@ -52,6 +53,7 @@ + @@ -131,6 +133,7 @@ + @@ -148,16 +151,19 @@ + + + diff --git a/src/main/webapp/scripts/app/admin/user-management/user-management-dialog.controller.js b/src/main/webapp/scripts/app/admin/user-management/user-management-dialog.controller.js new file mode 100644 index 00000000..3a18762c --- /dev/null +++ b/src/main/webapp/scripts/app/admin/user-management/user-management-dialog.controller.js @@ -0,0 +1,33 @@ +'use strict'; + +angular.module('sampleApplicationApp').controller('UserManagementDialogController', + ['$scope', '$stateParams', '$modalInstance', 'entity', 'User', 'Language', + function($scope, $stateParams, $modalInstance, entity, User, Language) { + + $scope.user = entity; + $scope.authorities = ["ROLE_USER", "ROLE_ADMIN"]; + Language.getAll().then(function (languages) { + $scope.languages = languages; + }); + var onSaveSuccess = function (result) { + $scope.isSaving = false; + $modalInstance.close(result); + }; + + var onSaveError = function (result) { + $scope.isSaving = false; + }; + + $scope.save = function () { + $scope.isSaving = true; + if ($scope.user.id != null) { + User.update($scope.user, onSaveSuccess, onSaveError); + } else { + User.save($scope.user, onSaveSuccess, onSaveError); + } + }; + + $scope.clear = function() { + $modalInstance.dismiss('cancel'); + }; +}]); diff --git a/src/main/webapp/scripts/app/admin/user-management/user-management-dialog.html b/src/main/webapp/scripts/app/admin/user-management/user-management-dialog.html new file mode 100644 index 00000000..14209d1c --- /dev/null +++ b/src/main/webapp/scripts/app/admin/user-management/user-management-dialog.html @@ -0,0 +1,108 @@ +
+ +
+ + +
+
+
+ + +
+ +
+ + + +
+

+ This field is required. +

+ +

+ This field cannot be longer than 50 characters. +

+
+
+
+ + + +
+

+ This field cannot be longer than 50 characters. +

+
+
+
+ + + +
+

+ This field cannot be longer than 50 characters. +

+
+
+
+ + + +
+

+ This field is required. +

+ +

+ This field cannot be longer than 100 characters. +

+
+
+
+ +
+ +
+ + +
+ +
+ + +
+
+
+ + +
+
\ No newline at end of file diff --git a/src/main/webapp/scripts/app/admin/user-management/user-management.controller.js b/src/main/webapp/scripts/app/admin/user-management/user-management.controller.js index f6ac32c7..8508bec9 100644 --- a/src/main/webapp/scripts/app/admin/user-management/user-management.controller.js +++ b/src/main/webapp/scripts/app/admin/user-management/user-management.controller.js @@ -30,26 +30,6 @@ angular.module('sampleApplicationApp') }); }; - $scope.showUpdate = function (login) { - User.get({login: login}, function (result) { - $scope.user = result; - $('#saveUserModal').modal('show'); - }); - }; - - $scope.save = function () { - User.update($scope.user, - function () { - $scope.refresh(); - }); - }; - - $scope.refresh = function () { - $scope.loadAll(); - $('#saveUserModal').modal('hide'); - $scope.clear(); - }; - $scope.clear = function () { $scope.user = { id: null, login: null, firstName: null, lastName: null, email: null, diff --git a/src/main/webapp/scripts/app/admin/user-management/user-management.html b/src/main/webapp/scripts/app/admin/user-management/user-management.html index 85b82126..cd95b706 100644 --- a/src/main/webapp/scripts/app/admin/user-management/user-management.html +++ b/src/main/webapp/scripts/app/admin/user-management/user-management.html @@ -3,150 +3,6 @@

Users

- - - -
@@ -190,7 +46,7 @@ diff --git a/src/main/webapp/scripts/app/admin/user-management/user-management.js b/src/main/webapp/scripts/app/admin/user-management/user-management.js index 9dc2efa1..76bd48a2 100644 --- a/src/main/webapp/scripts/app/admin/user-management/user-management.js +++ b/src/main/webapp/scripts/app/admin/user-management/user-management.js @@ -42,5 +42,56 @@ angular.module('sampleApplicationApp') return $translate.refresh(); }] } + }) + .state('user-management.new', { + parent: 'user-management', + url: '/new', + data: { + authorities: ['ROLE_ADMIN'], + }, + onEnter: ['$stateParams', '$state', '$modal', function($stateParams, $state, $modal) { + $modal.open({ + templateUrl: 'scripts/app/admin/user-management/user-management-dialog.html', + controller: 'UserManagementDialogController', + size: 'lg', + resolve: { + entity: function () { + return { + id: null, login: null, firstName: null, lastName: null, email: null, + activated: null, langKey: null, createdBy: null, createdDate: null, + lastModifiedBy: null, lastModifiedDate: null, resetDate: null, + resetKey: null, authorities: null + }; + } + } + }).result.then(function(result) { + $state.go('user-management', null, { reload: true }); + }, function() { + $state.go('user-management'); + }) + }] + }) + .state('user-management.edit', { + parent: 'user-management', + url: '/{login}/edit', + data: { + authorities: ['ROLE_ADMIN'], + }, + onEnter: ['$stateParams', '$state', '$modal', function($stateParams, $state, $modal) { + $modal.open({ + templateUrl: 'scripts/app/admin/user-management/user-management-dialog.html', + controller: 'UserManagementDialogController', + size: 'lg', + resolve: { + entity: ['User', function(User) { + return User.get({login : $stateParams.login}); + }] + } + }).result.then(function(result) { + $state.go('user-management', null, { reload: true }); + }, function() { + $state.go('^'); + }) + }] }); }); diff --git a/src/main/webapp/scripts/app/app.js b/src/main/webapp/scripts/app/app.js index b0e2e543..3885f0e4 100644 --- a/src/main/webapp/scripts/app/app.js +++ b/src/main/webapp/scripts/app/app.js @@ -2,9 +2,23 @@ angular.module('sampleApplicationApp', ['LocalStorageModule', 'tmh.dynamicLocale', 'pascalprecht.translate', 'ui.bootstrap', // for modal dialogs - 'ngResource', 'ui.router', 'ngCookies', 'ngAria', 'ngCacheBuster', 'ngFileUpload', 'infinite-scroll']) + 'ngResource', 'ui.router', 'ngCookies', 'ngAria', 'ngCacheBuster', 'ngFileUpload', 'infinite-scroll', 'angular-loading-bar']) .run(function ($rootScope, $location, $window, $http, $state, $translate, Language, Auth, Principal, ENV, VERSION) { + // update the window title using params in the following + // precendence + // 1. titleKey parameter + // 2. $state.$current.data.pageTitle (current state page title) + // 3. 'global.title' + var updateTitle = function(titleKey) { + if (!titleKey && $state.$current.data && $state.$current.data.pageTitle) { + titleKey = $state.$current.data.pageTitle; + } + $translate(titleKey || 'global.title').then(function (title) { + $window.document.title = title; + }); + }; + $rootScope.ENV = ENV; $rootScope.VERSION = VERSION; $rootScope.$on('$stateChangeStart', function (event, toState, toStateParams) { @@ -38,14 +52,13 @@ angular.module('sampleApplicationApp', ['LocalStorageModule', 'tmh.dynamicLocale if (toState.data.pageTitle) { titleKey = toState.data.pageTitle; } - - $translate(titleKey).then(function (title) { - // Change window title with translated one - $window.document.title = title; - }); - + updateTitle(titleKey); }); + + // if the current translation changes, update the window title + $rootScope.$on('$translateChangeSuccess', function() { updateTitle(); }); + $rootScope.back = function() { // If previous state is 'activate' or do not exist go to 'home' if ($rootScope.previousStateName === 'activate' || $state.get($rootScope.previousStateName) === null) { @@ -55,7 +68,9 @@ angular.module('sampleApplicationApp', ['LocalStorageModule', 'tmh.dynamicLocale } }; }) - .config(function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider, $translateProvider, tmhDynamicLocaleProvider, httpRequestInterceptorCacheBusterProvider) { + .config(function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider, $translateProvider, tmhDynamicLocaleProvider, httpRequestInterceptorCacheBusterProvider, AlertServiceProvider) { + // uncomment below to make alerts look like toast + //AlertServiceProvider.showAsToast(true); //enable CSRF $httpProvider.defaults.xsrfCookieName = 'CSRF-TOKEN'; diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.controller.js b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.controller.js new file mode 100644 index 00000000..b125a541 --- /dev/null +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.controller.js @@ -0,0 +1,17 @@ +'use strict'; + +angular.module('sampleApplicationApp') + .controller('BankAccountDeleteController', function($scope, $modalInstance, entity, BankAccount) { + + $scope.bankAccount = entity; + $scope.clear = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.confirmDelete = function (id) { + BankAccount.delete({id: id}, + function () { + $modalInstance.close(true); + }); + }; + + }); \ No newline at end of file diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.html b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.html new file mode 100644 index 00000000..dfd2f0ad --- /dev/null +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-delete-dialog.html @@ -0,0 +1,18 @@ + +
+ +

Confirm delete operation

+
+
+

Are you sure you want to delete this BankAccount?

+
+
+ + +
+ \ No newline at end of file diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.controller.js b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.controller.js index 7fe10d1c..1e0cee52 100644 --- a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.controller.js +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.controller.js @@ -13,16 +13,22 @@ angular.module('sampleApplicationApp').controller('BankAccountDialogController', }); }; - var onSaveFinished = function (result) { + var onSaveSuccess = function (result) { $scope.$emit('sampleApplicationApp:bankAccountUpdate', result); $modalInstance.close(result); + $scope.isSaving = false; + }; + + var onSaveError = function (result) { + $scope.isSaving = false; }; $scope.save = function () { + $scope.isSaving = true; if ($scope.bankAccount.id != null) { - BankAccount.update($scope.bankAccount, onSaveFinished); + BankAccount.update($scope.bankAccount, onSaveSuccess, onSaveError); } else { - BankAccount.save($scope.bankAccount, onSaveFinished); + BankAccount.save($scope.bankAccount, onSaveSuccess, onSaveError); } }; diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.html b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.html index 0760ac5d..f2ff4df1 100644 --- a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.html +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount-dialog.html @@ -53,7 +53,7 @@ - diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.controller.js b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.controller.js index 862faf08..d5e6b879 100644 --- a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.controller.js +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.controller.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('sampleApplicationApp') - .controller('BankAccountController', function ($scope, BankAccount) { + .controller('BankAccountController', function ($scope, $state, $modal, BankAccount) { $scope.bankAccounts = []; $scope.loadAll = function() { BankAccount.query(function(result) { @@ -10,21 +10,6 @@ angular.module('sampleApplicationApp') }; $scope.loadAll(); - $scope.delete = function (id) { - BankAccount.get({id: id}, function(result) { - $scope.bankAccount = result; - $('#deleteBankAccountConfirmation').modal('show'); - }); - }; - - $scope.confirmDelete = function (id) { - BankAccount.delete({id: id}, - function () { - $scope.loadAll(); - $('#deleteBankAccountConfirmation').modal('hide'); - $scope.clear(); - }); - }; $scope.refresh = function () { $scope.loadAll(); diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.js b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.js index 245b61b5..00273b93 100644 --- a/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.js +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccount.js @@ -96,5 +96,28 @@ angular.module('sampleApplicationApp') $state.go('^'); }) }] + }) + .state('bankAccount.delete', { + parent: 'bankAccount', + url: '/{id}/delete', + data: { + authorities: ['ROLE_USER'], + }, + onEnter: ['$stateParams', '$state', '$modal', function($stateParams, $state, $modal) { + $modal.open({ + templateUrl: 'scripts/app/entities/bankAccount/bankAccount-delete-dialog.html', + controller: 'BankAccountDeleteController', + size: 'md', + resolve: { + entity: ['BankAccount', function(BankAccount) { + return BankAccount.get({id : $stateParams.id}); + }] + } + }).result.then(function(result) { + $state.go('bankAccount', null, { reload: true }); + }, function() { + $state.go('^'); + }) + }] }); }); diff --git a/src/main/webapp/scripts/app/entities/bankAccount/bankAccounts.html b/src/main/webapp/scripts/app/entities/bankAccount/bankAccounts.html index a4f6962d..c14ec0f4 100644 --- a/src/main/webapp/scripts/app/entities/bankAccount/bankAccounts.html +++ b/src/main/webapp/scripts/app/entities/bankAccount/bankAccounts.html @@ -11,31 +11,6 @@ - -
@@ -67,7 +42,7 @@   Edit diff --git a/src/main/webapp/scripts/app/entities/label/label-delete-dialog.controller.js b/src/main/webapp/scripts/app/entities/label/label-delete-dialog.controller.js new file mode 100644 index 00000000..72044c40 --- /dev/null +++ b/src/main/webapp/scripts/app/entities/label/label-delete-dialog.controller.js @@ -0,0 +1,17 @@ +'use strict'; + +angular.module('sampleApplicationApp') + .controller('LabelDeleteController', function($scope, $modalInstance, entity, Label) { + + $scope.label = entity; + $scope.clear = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.confirmDelete = function (id) { + Label.delete({id: id}, + function () { + $modalInstance.close(true); + }); + }; + + }); \ No newline at end of file diff --git a/src/main/webapp/scripts/app/entities/label/label-delete-dialog.html b/src/main/webapp/scripts/app/entities/label/label-delete-dialog.html new file mode 100644 index 00000000..9bb6e83f --- /dev/null +++ b/src/main/webapp/scripts/app/entities/label/label-delete-dialog.html @@ -0,0 +1,18 @@ + +
+ +

Confirm delete operation

+
+
+

Are you sure you want to delete this Label?

+
+
+ + +
+ \ No newline at end of file diff --git a/src/main/webapp/scripts/app/entities/label/label-dialog.controller.js b/src/main/webapp/scripts/app/entities/label/label-dialog.controller.js index 48656189..7db7f190 100644 --- a/src/main/webapp/scripts/app/entities/label/label-dialog.controller.js +++ b/src/main/webapp/scripts/app/entities/label/label-dialog.controller.js @@ -12,16 +12,22 @@ angular.module('sampleApplicationApp').controller('LabelDialogController', }); }; - var onSaveFinished = function (result) { + var onSaveSuccess = function (result) { $scope.$emit('sampleApplicationApp:labelUpdate', result); $modalInstance.close(result); + $scope.isSaving = false; + }; + + var onSaveError = function (result) { + $scope.isSaving = false; }; $scope.save = function () { + $scope.isSaving = true; if ($scope.label.id != null) { - Label.update($scope.label, onSaveFinished); + Label.update($scope.label, onSaveSuccess, onSaveError); } else { - Label.save($scope.label, onSaveFinished); + Label.save($scope.label, onSaveSuccess, onSaveError); } }; diff --git a/src/main/webapp/scripts/app/entities/label/label-dialog.html b/src/main/webapp/scripts/app/entities/label/label-dialog.html index c7a7a70c..4bff38f6 100644 --- a/src/main/webapp/scripts/app/entities/label/label-dialog.html +++ b/src/main/webapp/scripts/app/entities/label/label-dialog.html @@ -35,7 +35,7 @@ - diff --git a/src/main/webapp/scripts/app/entities/label/label.controller.js b/src/main/webapp/scripts/app/entities/label/label.controller.js index 23e47127..ca4107c5 100644 --- a/src/main/webapp/scripts/app/entities/label/label.controller.js +++ b/src/main/webapp/scripts/app/entities/label/label.controller.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('sampleApplicationApp') - .controller('LabelController', function ($scope, Label) { + .controller('LabelController', function ($scope, $state, $modal, Label) { $scope.labels = []; $scope.loadAll = function() { Label.query(function(result) { @@ -10,21 +10,6 @@ angular.module('sampleApplicationApp') }; $scope.loadAll(); - $scope.delete = function (id) { - Label.get({id: id}, function(result) { - $scope.label = result; - $('#deleteLabelConfirmation').modal('show'); - }); - }; - - $scope.confirmDelete = function (id) { - Label.delete({id: id}, - function () { - $scope.loadAll(); - $('#deleteLabelConfirmation').modal('hide'); - $scope.clear(); - }); - }; $scope.refresh = function () { $scope.loadAll(); diff --git a/src/main/webapp/scripts/app/entities/label/label.js b/src/main/webapp/scripts/app/entities/label/label.js index 3ad23e5a..2e897174 100644 --- a/src/main/webapp/scripts/app/entities/label/label.js +++ b/src/main/webapp/scripts/app/entities/label/label.js @@ -95,5 +95,28 @@ angular.module('sampleApplicationApp') $state.go('^'); }) }] + }) + .state('label.delete', { + parent: 'label', + url: '/{id}/delete', + data: { + authorities: ['ROLE_USER'], + }, + onEnter: ['$stateParams', '$state', '$modal', function($stateParams, $state, $modal) { + $modal.open({ + templateUrl: 'scripts/app/entities/label/label-delete-dialog.html', + controller: 'LabelDeleteController', + size: 'md', + resolve: { + entity: ['Label', function(Label) { + return Label.get({id : $stateParams.id}); + }] + } + }).result.then(function(result) { + $state.go('label', null, { reload: true }); + }, function() { + $state.go('^'); + }) + }] }); }); diff --git a/src/main/webapp/scripts/app/entities/label/labels.html b/src/main/webapp/scripts/app/entities/label/labels.html index 93cc2c87..9b99b549 100644 --- a/src/main/webapp/scripts/app/entities/label/labels.html +++ b/src/main/webapp/scripts/app/entities/label/labels.html @@ -11,31 +11,6 @@ - -
@@ -61,7 +36,7 @@   Edit diff --git a/src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.controller.js b/src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.controller.js new file mode 100644 index 00000000..46be34d1 --- /dev/null +++ b/src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.controller.js @@ -0,0 +1,17 @@ +'use strict'; + +angular.module('sampleApplicationApp') + .controller('OperationDeleteController', function($scope, $modalInstance, entity, Operation) { + + $scope.operation = entity; + $scope.clear = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.confirmDelete = function (id) { + Operation.delete({id: id}, + function () { + $modalInstance.close(true); + }); + }; + + }); \ No newline at end of file diff --git a/src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.html b/src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.html new file mode 100644 index 00000000..50e41e7f --- /dev/null +++ b/src/main/webapp/scripts/app/entities/operation/operation-delete-dialog.html @@ -0,0 +1,18 @@ + +
+ +

Confirm delete operation

+
+
+

Are you sure you want to delete this Operation?

+
+
+ + +
+ \ No newline at end of file diff --git a/src/main/webapp/scripts/app/entities/operation/operation-dialog.controller.js b/src/main/webapp/scripts/app/entities/operation/operation-dialog.controller.js index fd509d03..41bbef72 100644 --- a/src/main/webapp/scripts/app/entities/operation/operation-dialog.controller.js +++ b/src/main/webapp/scripts/app/entities/operation/operation-dialog.controller.js @@ -13,16 +13,22 @@ angular.module('sampleApplicationApp').controller('OperationDialogController', }); }; - var onSaveFinished = function (result) { + var onSaveSuccess = function (result) { $scope.$emit('sampleApplicationApp:operationUpdate', result); $modalInstance.close(result); + $scope.isSaving = false; + }; + + var onSaveError = function (result) { + $scope.isSaving = false; }; $scope.save = function () { + $scope.isSaving = true; if ($scope.operation.id != null) { - Operation.update($scope.operation, onSaveFinished); + Operation.update($scope.operation, onSaveSuccess, onSaveError); } else { - Operation.save($scope.operation, onSaveFinished); + Operation.save($scope.operation, onSaveSuccess, onSaveError); } }; diff --git a/src/main/webapp/scripts/app/entities/operation/operation-dialog.html b/src/main/webapp/scripts/app/entities/operation/operation-dialog.html index 86c83b63..8ccfb748 100644 --- a/src/main/webapp/scripts/app/entities/operation/operation-dialog.html +++ b/src/main/webapp/scripts/app/entities/operation/operation-dialog.html @@ -67,7 +67,7 @@ - diff --git a/src/main/webapp/scripts/app/entities/operation/operation.controller.js b/src/main/webapp/scripts/app/entities/operation/operation.controller.js index 8a901fed..27691aca 100644 --- a/src/main/webapp/scripts/app/entities/operation/operation.controller.js +++ b/src/main/webapp/scripts/app/entities/operation/operation.controller.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('sampleApplicationApp') - .controller('OperationController', function ($scope, Operation, ParseLinks) { + .controller('OperationController', function ($scope, $state, $modal, Operation, ParseLinks) { $scope.operations = []; $scope.page = 0; $scope.loadAll = function() { @@ -23,21 +23,6 @@ angular.module('sampleApplicationApp') }; $scope.loadAll(); - $scope.delete = function (id) { - Operation.get({id: id}, function(result) { - $scope.operation = result; - $('#deleteOperationConfirmation').modal('show'); - }); - }; - - $scope.confirmDelete = function (id) { - Operation.delete({id: id}, - function () { - $scope.reset(); - $('#deleteOperationConfirmation').modal('hide'); - $scope.clear(); - }); - }; $scope.refresh = function () { $scope.reset(); diff --git a/src/main/webapp/scripts/app/entities/operation/operation.js b/src/main/webapp/scripts/app/entities/operation/operation.js index c80da184..46f06426 100644 --- a/src/main/webapp/scripts/app/entities/operation/operation.js +++ b/src/main/webapp/scripts/app/entities/operation/operation.js @@ -97,5 +97,28 @@ angular.module('sampleApplicationApp') $state.go('^'); }) }] + }) + .state('operation.delete', { + parent: 'operation', + url: '/{id}/delete', + data: { + authorities: ['ROLE_USER'], + }, + onEnter: ['$stateParams', '$state', '$modal', function($stateParams, $state, $modal) { + $modal.open({ + templateUrl: 'scripts/app/entities/operation/operation-delete-dialog.html', + controller: 'OperationDeleteController', + size: 'md', + resolve: { + entity: ['Operation', function(Operation) { + return Operation.get({id : $stateParams.id}); + }] + } + }).result.then(function(result) { + $state.go('operation', null, { reload: true }); + }, function() { + $state.go('^'); + }) + }] }); }); diff --git a/src/main/webapp/scripts/app/entities/operation/operations.html b/src/main/webapp/scripts/app/entities/operation/operations.html index d58ff758..fa298584 100644 --- a/src/main/webapp/scripts/app/entities/operation/operations.html +++ b/src/main/webapp/scripts/app/entities/operation/operations.html @@ -11,31 +11,6 @@ - -
@@ -69,7 +44,7 @@   Edit diff --git a/src/main/webapp/scripts/components/alert/alert.directive.js b/src/main/webapp/scripts/components/alert/alert.directive.js index 9d120c09..00a5dc4c 100644 --- a/src/main/webapp/scripts/components/alert/alert.directive.js +++ b/src/main/webapp/scripts/components/alert/alert.directive.js @@ -5,8 +5,10 @@ angular.module('sampleApplicationApp') return { restrict: 'E', template: '
' + - '
{{ alert.msg }}
' + - '
', + '
' + + '
{{ alert.msg }}
' + + '
' + + '', controller: ['$scope', function($scope) { $scope.alerts = AlertService.get(); @@ -21,11 +23,14 @@ angular.module('sampleApplicationApp') return { restrict: 'E', template: '
' + - '
{{ alert.msg }}
' + - '
', + '
' + + '
{{ alert.msg }}
' + + '
' + + '', controller: ['$scope', function($scope) { - $scope.alerts = AlertService.get(); + + $scope.alerts = []; var cleanHttpErrorListener = $rootScope.$on('sampleApplicationApp.httpError', function (event, httpResponse) { var i; @@ -46,9 +51,9 @@ angular.module('sampleApplicationApp') addErrorAlert('Field ' + fieldName + ' cannot be empty', 'error.' + fieldError.message, {fieldName: fieldName}); } } else if (httpResponse.data && httpResponse.data.message) { - addErrorAlert(httpResponse.data.message, httpResponse.data.message, httpResponse.data); + addErrorAlert(httpResponse.data.message, httpResponse.data.message, httpResponse.data); } else { - addErrorAlert(httpResponse.data); + addErrorAlert(httpResponse.data); } break; @@ -64,14 +69,25 @@ angular.module('sampleApplicationApp') $scope.$on('$destroy', function () { if(cleanHttpErrorListener !== undefined && cleanHttpErrorListener !== null){ cleanHttpErrorListener(); + $scope.alerts = []; } }); var addErrorAlert = function (message, key, data) { - key = key && key != null ? key : message; - AlertService.error(key, data); - + $scope.alerts.push( + AlertService.add( + { + type: "danger", + msg: key, + params: data, + timeout: 5000, + toast: AlertService.isToast(), + scoped: true + }, + $scope.alerts + ) + ); } } ] diff --git a/src/main/webapp/scripts/components/alert/alert.service.js b/src/main/webapp/scripts/components/alert/alert.service.js index 7e5a2d0a..16bbfd63 100644 --- a/src/main/webapp/scripts/components/alert/alert.service.js +++ b/src/main/webapp/scripts/components/alert/alert.service.js @@ -1,99 +1,132 @@ 'use strict'; angular.module('sampleApplicationApp') - .factory('AlertService', function ($timeout, $sce,$translate) { - var exports = { - factory: factory, - add: addAlert, - closeAlert: closeAlert, - closeAlertByIndex: closeAlertByIndex, - clear: clear, - get: get, - success: success, - error: error, - info: info, - warning : warning - }, - alertId = 0, // unique id for each alert. Starts from 0. - alerts = [], - timeout = 5000; // default timeout + .provider('AlertService', function () { + this.toast = false; - function clear() { - alerts = []; - } + this.$get = ['$timeout', '$sce', '$translate', function($timeout, $sce,$translate) { - function get() { - return alerts; - } + var exports = { + factory: factory, + isToast: isToast, + add: addAlert, + closeAlert: closeAlert, + closeAlertByIndex: closeAlertByIndex, + clear: clear, + get: get, + success: success, + error: error, + info: info, + warning : warning + }, + + toast = this.toast, + alertId = 0, // unique id for each alert. Starts from 0. + alerts = [], + timeout = 5000; // default timeout - function success(msg, params) { - this.add({ - type: "success", - msg: msg, - params: params, - timeout: timeout - }); - } - - function error(msg, params) { - this.add({ - type: "danger", - msg: msg, - params: params, - timeout: timeout - }); - } - - function warning(msg, params) { - this.add({ - type: "warning", - msg: msg, - params: params, - timeout: timeout - }); - } - - function info(msg, params) { - this.add({ - type: "info", - msg: msg, - params: params, - timeout: timeout - }); - } - - function factory(alertOptions) { - return alerts.push({ - type: alertOptions.type, - msg: $sce.trustAsHtml(alertOptions.msg), - id: alertOptions.alertId, - timeout: alertOptions.timeout, - close: function () { - return exports.closeAlert(this.id); - } - }); - } - - function addAlert(alertOptions) { - alertOptions.alertId = alertId++; - alertOptions.msg = $translate.instant(alertOptions.msg, alertOptions.params); - var that = this; - this.factory(alertOptions); - if (alertOptions.timeout && alertOptions.timeout > 0) { - $timeout(function () { - that.closeAlert(alertOptions.alertId); - }, alertOptions.timeout); + function isToast() { + return toast; } - } - function closeAlert(id) { - return this.closeAlertByIndex(alerts.map(function(e) { return e.id; }).indexOf(id)); - } + function clear() { + alerts = []; + } - function closeAlertByIndex(index) { - return alerts.splice(index, 1); - } + function get() { + return alerts; + } - return exports; + function success(msg, params, position) { + return this.add({ + type: "success", + msg: msg, + params: params, + timeout: timeout, + toast: toast, + position: position + }); + } - }); \ No newline at end of file + function error(msg, params, position) { + return this.add({ + type: "danger", + msg: msg, + params: params, + timeout: timeout, + toast: toast, + position: position + }); + } + + function warning(msg, params, position) { + return this.add({ + type: "warning", + msg: msg, + params: params, + timeout: timeout, + toast: toast, + position: position + }); + } + + function info(msg, params, position) { + return this.add({ + type: "info", + msg: msg, + params: params, + timeout: timeout, + toast: toast, + position: position + }); + } + + function factory(alertOptions) { + var alert = { + type: alertOptions.type, + msg: $sce.trustAsHtml(alertOptions.msg), + id: alertOptions.alertId, + timeout: alertOptions.timeout, + toast: alertOptions.toast, + position: alertOptions.position ? alertOptions.position : 'top right', + scoped: alertOptions.scoped, + close: function (alerts) { + return exports.closeAlert(this.id, alerts); + } + } + if(!alert.scoped) { + alerts.push(alert); + } + return alert; + } + + function addAlert(alertOptions, extAlerts) { + alertOptions.alertId = alertId++; + alertOptions.msg = $translate.instant(alertOptions.msg, alertOptions.params); + var that = this; + var alert = this.factory(alertOptions); + if (alertOptions.timeout && alertOptions.timeout > 0) { + $timeout(function () { + that.closeAlert(alertOptions.alertId, extAlerts); + }, alertOptions.timeout); + } + return alert; + } + + function closeAlert(id, extAlerts) { + var thisAlerts = extAlerts ? extAlerts : alerts; + return this.closeAlertByIndex(thisAlerts.map(function(e) { return e.id; }).indexOf(id), thisAlerts); + } + + function closeAlertByIndex(index, thisAlerts) { + return thisAlerts.splice(index, 1); + } + + return exports; + }]; + + this.showAsToast = function(isToast) { + this.toast = isToast; + }; + + }); diff --git a/src/test/javascript/karma.conf.js b/src/test/javascript/karma.conf.js index 8935b948..3ce5b123 100644 --- a/src/test/javascript/karma.conf.js +++ b/src/test/javascript/karma.conf.js @@ -21,6 +21,7 @@ module.exports = function (config) { 'main/webapp/bower_components/angular-cookies/angular-cookies.js', 'main/webapp/bower_components/angular-dynamic-locale/src/tmhDynamicLocale.js', 'main/webapp/bower_components/angular-local-storage/dist/angular-local-storage.js', + 'main/webapp/bower_components/angular-loading-bar/build/loading-bar.js', 'main/webapp/bower_components/angular-resource/angular-resource.js', 'main/webapp/bower_components/angular-sanitize/angular-sanitize.js', 'main/webapp/bower_components/angular-translate/angular-translate.js', diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index 1af7b539..9127ba45 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -10,12 +10,6 @@ # http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html # =================================================================== - - -# =================================================================== -# JHipster specific properties -# =================================================================== - spring: datasource: driver-class-name: org.h2.jdbcx.JdbcDataSource