moved to single project
This commit is contained in:
commit
4f8b3ce8f3
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
__pycache__/
|
||||||
|
ENV
|
||||||
|
|
51
api/Dockerfile
Normal file
51
api/Dockerfile
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
FROM python:latest
|
||||||
|
|
||||||
|
LABEL Maintainer="Wolfgang Hottgenroth wolfgang.hottgenroth@icloud.com"
|
||||||
|
LABEL ImageName="registry.hottis.de/hv2/hv2-api"
|
||||||
|
|
||||||
|
ARG APP_DIR="/opt/app"
|
||||||
|
ARG CONF_DIR="${APP_DIR}/config"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
apt update && \
|
||||||
|
apt install -y postgresql-client-common && \
|
||||||
|
pip3 install psycopg2 && \
|
||||||
|
pip3 install dateparser && \
|
||||||
|
pip3 install connexion && \
|
||||||
|
pip3 install connexion[swagger-ui] && \
|
||||||
|
pip3 install uwsgi && \
|
||||||
|
pip3 install flask-cors && \
|
||||||
|
pip3 install python-jose[cryptography] && \
|
||||||
|
pip3 install loguru && \
|
||||||
|
pip3 install Cheetah3
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
mkdir -p ${APP_DIR} && \
|
||||||
|
mkdir -p ${CONF_DIR} && \
|
||||||
|
useradd -d ${APP_DIR} -u 1000 user
|
||||||
|
|
||||||
|
COPY *.py ${APP_DIR}/
|
||||||
|
COPY openapi.yaml.tmpl ${APP_DIR}/
|
||||||
|
COPY methods.py.tmpl ${APP_DIR}/
|
||||||
|
COPY schema.json ${APP_DIR}/
|
||||||
|
COPY server.ini ${CONF_DIR}/
|
||||||
|
|
||||||
|
WORKDIR ${APP_DIR}
|
||||||
|
VOLUME ${CONF_DIR}
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
python3 generate.py
|
||||||
|
|
||||||
|
USER 1000:1000
|
||||||
|
|
||||||
|
EXPOSE 5000
|
||||||
|
EXPOSE 9191
|
||||||
|
|
||||||
|
CMD [ "uwsgi", "./config/server.ini" ]
|
||||||
|
|
||||||
|
|
||||||
|
|
10
api/ENV.tmp
Normal file
10
api/ENV.tmp
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# copy to ENV and adjust values
|
||||||
|
|
||||||
|
JWT_PUB_KEY="..."
|
||||||
|
|
||||||
|
DB_USER="hv2"
|
||||||
|
DB_PASS="..."
|
||||||
|
DB_HOST="172.16.10.27"
|
||||||
|
DB_NAME="hv2"
|
||||||
|
|
||||||
|
|
27
api/auth.py
Executable file
27
api/auth.py
Executable file
@ -0,0 +1,27 @@
|
|||||||
|
from jose import JWTError, jwt
|
||||||
|
import werkzeug
|
||||||
|
import os
|
||||||
|
from loguru import logger
|
||||||
|
import json
|
||||||
|
|
||||||
|
JWT_PUB_KEY = ""
|
||||||
|
try:
|
||||||
|
JWT_PUB_KEY = os.environ["JWT_PUB_KEY"]
|
||||||
|
except KeyError:
|
||||||
|
with open('/opt/app/config/authservice.pub', 'r') as f:
|
||||||
|
JWT_PUB_KEY = f.read()
|
||||||
|
|
||||||
|
|
||||||
|
def decodeToken(token):
|
||||||
|
try:
|
||||||
|
return jwt.decode(token, JWT_PUB_KEY, audience="hv2")
|
||||||
|
except JWTError as e:
|
||||||
|
logger.error("{}".format(e))
|
||||||
|
raise werkzeug.exceptions.Unauthorized()
|
||||||
|
|
||||||
|
|
||||||
|
def testToken(user, token_info):
|
||||||
|
return {
|
||||||
|
"message": f"You are user_id {user} and the provided token has been signed by this issuers. Fine.",
|
||||||
|
"details": json.dumps(token_info)
|
||||||
|
}
|
103
api/db.py
Normal file
103
api/db.py
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
import psycopg2
|
||||||
|
import psycopg2.extras
|
||||||
|
from loguru import logger
|
||||||
|
import os
|
||||||
|
import configparser
|
||||||
|
import json
|
||||||
|
import werkzeug
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
DB_USER = ""
|
||||||
|
DB_PASS = ""
|
||||||
|
DB_HOST = ""
|
||||||
|
DB_NAME = ""
|
||||||
|
try:
|
||||||
|
DB_USER = os.environ["DB_USER"]
|
||||||
|
DB_PASS = os.environ["DB_PASS"]
|
||||||
|
DB_HOST = os.environ["DB_HOST"]
|
||||||
|
DB_NAME = os.environ["DB_NAME"]
|
||||||
|
except KeyError:
|
||||||
|
config = configparser.ConfigParser()
|
||||||
|
config.read('/opt/app/config/dbconfig.ini')
|
||||||
|
DB_USER = config["database"]["user"]
|
||||||
|
DB_PASS = config["database"]["pass"]
|
||||||
|
DB_HOST = config["database"]["host"]
|
||||||
|
DB_NAME = config["database"]["name"]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class NoDataFoundException(Exception): pass
|
||||||
|
|
||||||
|
class TooMuchDataFoundException(Exception): pass
|
||||||
|
|
||||||
|
|
||||||
|
def databaseOperation(cursor, params):
|
||||||
|
cursor.execute('SELECT key, value FROM claims_for_user_v where "user" = %s and application = %s',
|
||||||
|
params)
|
||||||
|
for claimObj in cursor:
|
||||||
|
logger.debug("add claim {} -> {}".format(claimObj[0], claimObj[1]))
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def execDatabaseOperation(func, params):
|
||||||
|
conn = None
|
||||||
|
cur = None
|
||||||
|
try:
|
||||||
|
conn = psycopg2.connect(user = DB_USER, password = DB_PASS,
|
||||||
|
host = DB_HOST, database = DB_NAME,
|
||||||
|
sslmode = 'require')
|
||||||
|
conn.autocommit = False
|
||||||
|
|
||||||
|
with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
|
||||||
|
return func(cur, params)
|
||||||
|
except psycopg2.Error as err:
|
||||||
|
raise Exception("Error when connecting to database: {}".format(err))
|
||||||
|
finally:
|
||||||
|
if conn:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def _opGetMany(cursor, params):
|
||||||
|
items = []
|
||||||
|
cursor.execute(params["statement"])
|
||||||
|
for itemObj in cursor:
|
||||||
|
logger.debug("item received {}".format(str(itemObj)))
|
||||||
|
items.append(itemObj)
|
||||||
|
return items
|
||||||
|
|
||||||
|
def dbGetMany(user, token_info, params):
|
||||||
|
logger.info("params: {}, token: {}".format(params, json.dumps(token_info)))
|
||||||
|
try:
|
||||||
|
return execDatabaseOperation(_opGetMany, params)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Exception: {e}")
|
||||||
|
raise werkzeug.exceptions.InternalServerError
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def _opGetOne(cursor, params):
|
||||||
|
cursor.execute(params["statement"], params["params"])
|
||||||
|
itemObj = cursor.fetchone()
|
||||||
|
logger.debug(f"item received: {itemObj}")
|
||||||
|
if not itemObj:
|
||||||
|
raise NoDataFoundException
|
||||||
|
dummyObj = cursor.fetchone()
|
||||||
|
if dummyObj:
|
||||||
|
raise TooMuchDataFoundException
|
||||||
|
return itemObj
|
||||||
|
|
||||||
|
def dbGetOne(user, token_info, params):
|
||||||
|
logger.info("params: {}, token: {}".format(params, json.dumps(token_info)))
|
||||||
|
try:
|
||||||
|
return execDatabaseOperation(_opGetOne, params)
|
||||||
|
except NoDataFoundException:
|
||||||
|
logger.error("no data found")
|
||||||
|
raise werkzeug.exceptions.NotFound
|
||||||
|
except TooMuchDataFoundException:
|
||||||
|
logger.error("too much data found")
|
||||||
|
raise werkzeug.exceptions.InternalServerError
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Exception: {e}")
|
||||||
|
raise werkzeug.exceptions.InternalServerError
|
32
api/methods.py.tmpl
Normal file
32
api/methods.py.tmpl
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
from db import dbGetMany, dbGetOne
|
||||||
|
|
||||||
|
#for $table in $tables
|
||||||
|
def get_${table.name}s(user, token_info):
|
||||||
|
return dbGetMany(user, token_info, {
|
||||||
|
"statement": """
|
||||||
|
SELECT
|
||||||
|
id
|
||||||
|
#for $column in $table.columns
|
||||||
|
,$column.name
|
||||||
|
#end for
|
||||||
|
FROM ${table.name}_t
|
||||||
|
""",
|
||||||
|
"params": ()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_${table.name}(user, token_info, ${table.name}Id=None):
|
||||||
|
return dbGetOne(user, token_info, {
|
||||||
|
"statement": """
|
||||||
|
SELECT
|
||||||
|
id
|
||||||
|
#for $column in $table.columns
|
||||||
|
,$column.name
|
||||||
|
#end for
|
||||||
|
FROM ${table.name}_t
|
||||||
|
WHERE id = %s
|
||||||
|
""",
|
||||||
|
"params": (${table.name}Id, )
|
||||||
|
}
|
||||||
|
)
|
||||||
|
#end for
|
75
api/openapi.yaml.tmpl
Normal file
75
api/openapi.yaml.tmpl
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
openapi: 3.0.0
|
||||||
|
info:
|
||||||
|
title: hv2-api
|
||||||
|
version: "1"
|
||||||
|
description: "REST-API for the Nober Grundbesitz GbR Hausverwaltungs-Software"
|
||||||
|
termsOfService: "https://home.hottis.de/dokuwiki/doku.php?id=hv2pub:termsofuse"
|
||||||
|
contact:
|
||||||
|
name: "Wolfgang Hottgenroth"
|
||||||
|
email: "wolfgang.hottgenroth@icloud.com"
|
||||||
|
externalDocs:
|
||||||
|
description: "Find more details here"
|
||||||
|
url: "https://home.hottis.de/dokuwiki/doku.php?id=hv2pub:externaldocs"
|
||||||
|
|
||||||
|
paths:
|
||||||
|
#for $table in $tables
|
||||||
|
/v1/${table.name}s:
|
||||||
|
get:
|
||||||
|
tags: [ "$table.name" ]
|
||||||
|
summary: Return all normalized ${table.name}s
|
||||||
|
operationId: methods.get_${table.name}s
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: ${table.name}s response
|
||||||
|
content:
|
||||||
|
'application/json':
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
\$ref: '#/components/schemas/$table.name'
|
||||||
|
security:
|
||||||
|
- jwt: ['secret']
|
||||||
|
/v1/${table.name}s/{${table.name}Id}:
|
||||||
|
get:
|
||||||
|
tags: [ "$table.name" ]
|
||||||
|
summary: Return the normalized $table.name with given id
|
||||||
|
operationId: methods.get_$table.name
|
||||||
|
parameters:
|
||||||
|
- name: ${table.name}Id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: $table.name response
|
||||||
|
content:
|
||||||
|
'application/json':
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
\$ref: '#/components/schemas/$table.name'
|
||||||
|
security:
|
||||||
|
- jwt: ['secret']
|
||||||
|
#end for
|
||||||
|
|
||||||
|
components:
|
||||||
|
securitySchemes:
|
||||||
|
jwt:
|
||||||
|
type: http
|
||||||
|
scheme: bearer
|
||||||
|
bearerFormat: JWT
|
||||||
|
x-bearerInfoFunc: auth.decodeToken
|
||||||
|
schemas:
|
||||||
|
#for $table in $tables
|
||||||
|
$table.name:
|
||||||
|
description: $table.name
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: integer
|
||||||
|
#for $column in $table.columns
|
||||||
|
$column.name:
|
||||||
|
type: $column.apitype
|
||||||
|
#end for
|
||||||
|
#end for
|
14
api/run.sh
Executable file
14
api/run.sh
Executable file
@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
. ENV
|
||||||
|
|
||||||
|
IMAGE_NAME="registry.hottis.de/hv2/hv2-api"
|
||||||
|
VERSION=0.0.x
|
||||||
|
|
||||||
|
|
||||||
|
docker run \
|
||||||
|
-d \
|
||||||
|
--rm \
|
||||||
|
--name "hv2-api" \
|
||||||
|
-p 5000:5000
|
||||||
|
${IMAGE_NAME}:${VERSION}
|
6
api/server.ini
Normal file
6
api/server.ini
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[uwsgi]
|
||||||
|
http = :5000
|
||||||
|
wsgi-file = server.py
|
||||||
|
processes = 4
|
||||||
|
stats = :9191
|
||||||
|
|
12
api/server.py
Normal file
12
api/server.py
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import connexion
|
||||||
|
from flask_cors import CORS
|
||||||
|
|
||||||
|
# instantiate the webservice
|
||||||
|
app = connexion.App(__name__)
|
||||||
|
app.add_api('openapi.yaml')
|
||||||
|
|
||||||
|
# CORSify it - otherwise Angular won't accept it
|
||||||
|
CORS(app.app)
|
||||||
|
|
||||||
|
# provide the webservice application to uwsgi
|
||||||
|
application = app.app
|
8
api/test.py
Normal file
8
api/test.py
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
import connexion
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logging.basicConfig(level=logging.DEBUG)
|
||||||
|
|
||||||
|
app = connexion.App('hv2-api')
|
||||||
|
app.add_api('./openapi.yaml')
|
||||||
|
app.run(port=8080)
|
61
ci-script-api
Normal file
61
ci-script-api
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
stages:
|
||||||
|
- check
|
||||||
|
- build
|
||||||
|
- deploy
|
||||||
|
|
||||||
|
variables:
|
||||||
|
IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
|
||||||
|
|
||||||
|
check:
|
||||||
|
image: registry.hottis.de/dockerized/base-build-env:latest
|
||||||
|
stage: check
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
script:
|
||||||
|
- checksemver.py -v
|
||||||
|
--versionToValidate "${CI_COMMIT_TAG}"
|
||||||
|
--validateMessage
|
||||||
|
--messageToValidate "${CI_COMMIT_MESSAGE}"
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
|
stage: build
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
script:
|
||||||
|
- docker build --tag $IMAGE_NAME:latest .
|
||||||
|
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
||||||
|
docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
|
||||||
|
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
|
||||||
|
docker push $IMAGE_NAME:latest;
|
||||||
|
docker push $IMAGE_NAME:${CI_COMMIT_TAG};
|
||||||
|
fi
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
stage: deploy
|
||||||
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: none
|
||||||
|
script:
|
||||||
|
- CONTAINER_NAME=$CI_PROJECT_NAME
|
||||||
|
- SERVICE_VOLUME=$CI_PROJECT_NAME"-conf"
|
||||||
|
- SERVICE_PORT=5000
|
||||||
|
- docker volume inspect $SERVICE_VOLUME || docker volume create $SERVICE_VOLUME
|
||||||
|
- docker stop $CONTAINER_NAME || echo "$CONTAINER_NAME not running, anyway okay"
|
||||||
|
- docker rm $CONTAINER_NAME || echo "$CONTAINER_NAME not exsting, anyway okay"
|
||||||
|
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
|
||||||
|
- docker pull $IMAGE_NAME:${CI_COMMIT_TAG}
|
||||||
|
- docker run -d --restart always --name $CONTAINER_NAME --network docker-server --ip 172.16.10.38 -v $SERVICE_VOLUME:/opt/app/config $IMAGE_NAME:${CI_COMMIT_TAG}
|
||||||
|
|
88
ci-script-ui
Normal file
88
ci-script-ui
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
stages:
|
||||||
|
- check
|
||||||
|
- build
|
||||||
|
- dockerize
|
||||||
|
- deploy
|
||||||
|
|
||||||
|
variables:
|
||||||
|
IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
|
||||||
|
|
||||||
|
check:
|
||||||
|
image: registry.hottis.de/dockerized/base-build-env:latest
|
||||||
|
stage: check
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
script:
|
||||||
|
- checksemver.py -v
|
||||||
|
--versionToValidate "$CI_COMMIT_TAG"
|
||||||
|
--validateMessage
|
||||||
|
--messageToValidate "$CI_COMMIT_MESSAGE"
|
||||||
|
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: registry.hottis.de/hv2/hv2-node-build-env:1.0.0
|
||||||
|
stage: build
|
||||||
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- dist.tgz
|
||||||
|
expire_in: 1 day
|
||||||
|
script:
|
||||||
|
- cd hv2-ui
|
||||||
|
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
||||||
|
sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html;
|
||||||
|
fi
|
||||||
|
- npm install
|
||||||
|
- for F in ./src/app/*.tmpl; do
|
||||||
|
python ../helpers/hv2-api/generate.py -s ../helpers/hv2-api/schema.json -t $F;
|
||||||
|
done
|
||||||
|
- ./node_modules/.bin/ng build --prod
|
||||||
|
- tar -czf ../dist.tgz dist
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
dockerize:
|
||||||
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
|
stage: dockerize
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
script:
|
||||||
|
- tar -xzf dist.tgz
|
||||||
|
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_TAG .
|
||||||
|
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
||||||
|
- docker push $IMAGE_NAME:latest
|
||||||
|
- docker push $IMAGE_NAME:$CI_COMMIT_TAG
|
||||||
|
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
stage: deploy
|
||||||
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: none
|
||||||
|
script:
|
||||||
|
- CONTAINER_NAME=$CI_PROJECT_NAME
|
||||||
|
- docker stop $CONTAINER_NAME || echo "$CONTAINER_NAME not running, anyway okay"
|
||||||
|
- docker rm $CONTAINER_NAME || echo "$CONTAINER_NAME not exsting, anyway okay"
|
||||||
|
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
|
||||||
|
- docker pull $IMAGE_NAME:${CI_COMMIT_TAG}
|
||||||
|
- docker run -d --restart always --name $CONTAINER_NAME --network docker-server --ip 172.16.10.39 $IMAGE_NAME:${CI_COMMIT_TAG}
|
||||||
|
|
49
generate.py
Normal file
49
generate.py
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
import json
|
||||||
|
from Cheetah.Template import Template
|
||||||
|
import glob
|
||||||
|
import argparse
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(description="generate.py")
|
||||||
|
parser.add_argument('--schema', '-s',
|
||||||
|
help='Schema file. Default: schema.json in the current folder.',
|
||||||
|
required=False,
|
||||||
|
default='./schema.json')
|
||||||
|
parser.add_argument('--template', '-t',
|
||||||
|
help="""Template file, templates files must be named as the final output file
|
||||||
|
with an additional .tmpl extension. Default: all template files in the current folder.""",
|
||||||
|
required=False,
|
||||||
|
default="*.tmpl")
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
|
||||||
|
with open(args.schema) as schemaFile:
|
||||||
|
schema = json.load(schemaFile)
|
||||||
|
|
||||||
|
for table in schema["tables"]:
|
||||||
|
for column in table["columns"]:
|
||||||
|
if column["sqltype"] == 'serial':
|
||||||
|
column["apitype"] = 'integer'
|
||||||
|
column["jstype"] = 'number'
|
||||||
|
elif column["sqltype"] == 'integer':
|
||||||
|
column["apitype"] = 'integer'
|
||||||
|
column["jstype"] = 'number'
|
||||||
|
elif column["sqltype"] == 'date':
|
||||||
|
column["apitype"] = 'string'
|
||||||
|
column["jstype"] = 'string'
|
||||||
|
elif column["sqltype"] == 'timestamp':
|
||||||
|
column["apitype"] = 'string'
|
||||||
|
column["jstype"] = 'string'
|
||||||
|
elif column["sqltype"].startswith('varchar'):
|
||||||
|
column["apitype"] = 'string'
|
||||||
|
column["jstype"] = 'string'
|
||||||
|
elif column["sqltype"].startswith('numeric'):
|
||||||
|
column["apitype"] = 'number'
|
||||||
|
column["jstype"] = 'number'
|
||||||
|
|
||||||
|
for f in glob.glob(args.template):
|
||||||
|
print(f"process {f}")
|
||||||
|
tmpl = Template(file=f, searchList=[schema])
|
||||||
|
with open(f[:-5], 'w') as outFile:
|
||||||
|
outFile.write(str(tmpl))
|
||||||
|
|
||||||
|
|
3
generateHelper.py
Normal file
3
generateHelper.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
def JsNameConverter(tmplName):
|
||||||
|
return ''.join([x.capitalize() for x in tmplName.split('_')])
|
||||||
|
|
119
schema.json
Normal file
119
schema.json
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
{
|
||||||
|
"tables": [
|
||||||
|
{
|
||||||
|
"name": "account",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)", "notnull": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tenant",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "salutation", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "firstname", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "lastname", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "address1", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "address2", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "address3", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "zip", "sqltype": "varchar(10)" },
|
||||||
|
{ "name": "city", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "phone1", "sqltype": "varchar(64)" },
|
||||||
|
{ "name": "phone2", "sqltype": "varchar(64)" },
|
||||||
|
{ "name": "iban", "sqltype": "varchar(64)" },
|
||||||
|
{ "name": "account", "sqltype": "integer", "notnull": true, "foreignkey": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "premise",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "street", "sqltype": "varchar(128)", "notnull": true },
|
||||||
|
{ "name": "zip", "sqltype": "varchar(10)", "notnull": true },
|
||||||
|
{ "name": "city", "sqltype": "varchar(128)", "notnull": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "flat",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "premise", "sqltype": "integer", "foreignkey": true },
|
||||||
|
{ "name": "area", "sqltype": "numeric(10,2)", "notnull": true },
|
||||||
|
{ "name": "flat_no", "sqltype": "integer" }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "overhead_advance",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "amount", "sqltype": "numeric(10,4)", "notnull": true },
|
||||||
|
{ "name": "startdate", "sqltype": "date" },
|
||||||
|
{ "name": "enddate", "sqltype": "date" }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "overhead_advance_flat_mapping",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "overhead_advance", "sqltype": "integer", "notnull": true, "foreignkey": true },
|
||||||
|
{ "name": "flat", "sqltype": "integer", "notnull": true, "foreignkey": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "parking",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "premise", "sqltype": "integer", "foreignkey": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commercial_premise",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "premise", "sqltype": "integer", "foreignkey": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tenancy",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "tenant", "sqltype": "integer", "notnull": true, "foreignkey": true },
|
||||||
|
{ "name": "flat", "sqltype": "integer", "notnull": false, "foreignkey": true },
|
||||||
|
{ "name": "parking", "sqltype": "integer", "notnull": false, "foreignkey": true },
|
||||||
|
{ "name": "commercial_premise", "sqltype": "integer", "notnull": false, "foreignkey": true },
|
||||||
|
{ "name": "startdate", "sqltype": "date", "notnull": true },
|
||||||
|
{ "name": "enddate", "sqltype": "date", "notnull": false }
|
||||||
|
],
|
||||||
|
"tableConstraints": [
|
||||||
|
"constraint tenancy_only_one_object check ((flat is not null and parking is null and commercial_premise is null) or (flat is null and parking is not null and commercial_premise is null) or (flat is null and parking is null and commercial_premise is not null))"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "fee",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)" },
|
||||||
|
{ "name": "amount", "sqltype": "numeric(10,2)", "notnull": true },
|
||||||
|
{ "name": "fee_type", "sqltype": "varchar(10)", "notnull": true },
|
||||||
|
{ "name": "startdate", "sqltype": "date" },
|
||||||
|
{ "name": "enddate", "sqltype": "date" }
|
||||||
|
],
|
||||||
|
"tableConstraints": [
|
||||||
|
"constraint fee_fee_type check (fee_type = 'per_area' or fee_type = 'total')"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tenancy_fee_mapping",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "tenancy", "sqltype": "integer", "notnull": true, "foreignkey": true },
|
||||||
|
{ "name": "fee", "sqltype": "integer", "notnull": true, "foreignkey": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "account_entry",
|
||||||
|
"columns": [
|
||||||
|
{ "name": "description", "sqltype": "varchar(128)", "notnull": true },
|
||||||
|
{ "name": "account", "sqltype": "integer", "notnull": true, "foreignkey": true },
|
||||||
|
{ "name": "created_at", "sqltype": "timestamp", "notnull": true, "default": "now()" },
|
||||||
|
{ "name": "amount", "sqltype": "numeric(10,2)", "notnull": true }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
29
schema/create.sql.tmpl
Normal file
29
schema/create.sql.tmpl
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
#for $table in $tables
|
||||||
|
CREATE TABLE ${table.name}_t (
|
||||||
|
id serial not null primary key
|
||||||
|
#for $column in $table.columns
|
||||||
|
,$column.name $column.sqltype #slurp
|
||||||
|
#if (('notnull' in $column) and $column.notnull)
|
||||||
|
not null #slurp
|
||||||
|
#end if
|
||||||
|
#if (('primarykey' in $column) and $column.primarykey)
|
||||||
|
primary key #slurp
|
||||||
|
#end if
|
||||||
|
#if (('foreignkey' in $column) and $column.foreignkey)
|
||||||
|
references ${column.name}_t (id) #slurp
|
||||||
|
#end if
|
||||||
|
#if ('default' in $column)
|
||||||
|
default $column.default #slurp
|
||||||
|
#end if
|
||||||
|
|
||||||
|
#end for
|
||||||
|
#if ('tableConstraints' in $table)
|
||||||
|
#for $tableConstraint in $table.tableConstraints
|
||||||
|
,$tableConstraint
|
||||||
|
#end for
|
||||||
|
#end if
|
||||||
|
);
|
||||||
|
|
||||||
|
#end for
|
||||||
|
|
||||||
|
|
48
schema/testdata/testdata.sql
vendored
Normal file
48
schema/testdata/testdata.sql
vendored
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
insert into account_t (description) values ('account testtenant1');
|
||||||
|
|
||||||
|
insert into tenant_t (lastname, account) values (
|
||||||
|
'testtenant1',
|
||||||
|
(select id from account_t where description = 'account testtenant1')
|
||||||
|
);
|
||||||
|
|
||||||
|
insert into premise_t (street, zip, city) values ('Hemsingskotten 38', '45259', 'Essen');
|
||||||
|
|
||||||
|
insert into parking_t (description, premise) values ('Garage 1', (select id from premise_t where street = 'Hemsingskotten 38'));
|
||||||
|
|
||||||
|
insert into flat_t (description, premise, area, flat_no) values('EG links', (select id from premise_t where street = 'Hemsingskotten 38'), 59.0, 1);
|
||||||
|
|
||||||
|
insert into fee_t (description, amount, fee_type, startdate) values ('Altenwohnung Hemsingskotten', 5.23, 'per_area', '2021-01-01');
|
||||||
|
|
||||||
|
insert into fee_t (description, amount, fee_type, startdate) values ('Garage intern', 30.0, 'total', '2021-01-01');
|
||||||
|
|
||||||
|
insert into tenancy_t (tenant, flat, description, startdate) values (
|
||||||
|
(select id from tenant_t where lastname = 'testtenant1'),
|
||||||
|
(select id from flat_t where flat_no = 1),
|
||||||
|
'flat testtenant1',
|
||||||
|
'2021-06-01'
|
||||||
|
);
|
||||||
|
|
||||||
|
insert into tenancy_t (tenant, parking, description, startdate) values (
|
||||||
|
(select id from tenant_t where lastname = 'testtenant1'),
|
||||||
|
(select id from parking_t where description = 'Garage 1'),
|
||||||
|
'parking testtenant1',
|
||||||
|
'2021-06-01'
|
||||||
|
);
|
||||||
|
|
||||||
|
insert into overhead_advance_t (description, amount, startdate) values ('BKV Altenwohnung Hemsingskotten', 0.34, '2021-01-01');
|
||||||
|
|
||||||
|
insert into overhead_advance_flat_mapping_t (overhead_advance, flat) values (
|
||||||
|
(select id from overhead_advance_t where description = 'BKV Altenwohnung Hemsingskotten'),
|
||||||
|
(select id from flat_t where flat_no = 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
insert into tenancy_fee_mapping_t (tenancy, fee) values (
|
||||||
|
(select id from tenancy_t where description = 'flat testtenant1'),
|
||||||
|
(select id from fee_t where description = 'Altenwohnung Hemsingskotten')
|
||||||
|
);
|
||||||
|
|
||||||
|
insert into tenancy_fee_mapping_t (tenancy, fee) values (
|
||||||
|
(select id from tenancy_t where description = 'parking testtenant1'),
|
||||||
|
(select id from fee_t where description = 'Garage intern')
|
||||||
|
);
|
||||||
|
|
49
ui/.gitignore
vendored
Normal file
49
ui/.gitignore
vendored
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
# See http://help.github.com/ignore-files/ for more about ignoring files.
|
||||||
|
|
||||||
|
# compiled output
|
||||||
|
/dist
|
||||||
|
/tmp
|
||||||
|
/out-tsc
|
||||||
|
# Only exists if Bazel was run
|
||||||
|
/bazel-out
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
/node_modules
|
||||||
|
|
||||||
|
# profiling files
|
||||||
|
chrome-profiler-events*.json
|
||||||
|
speed-measure-plugin*.json
|
||||||
|
|
||||||
|
# IDEs and editors
|
||||||
|
/.idea
|
||||||
|
.project
|
||||||
|
.classpath
|
||||||
|
.c9/
|
||||||
|
*.launch
|
||||||
|
.settings/
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
|
# IDE - VSCode
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/settings.json
|
||||||
|
!.vscode/tasks.json
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.history/*
|
||||||
|
|
||||||
|
# misc
|
||||||
|
/.sass-cache
|
||||||
|
/connect.lock
|
||||||
|
/coverage
|
||||||
|
/libpeerconnection.log
|
||||||
|
npm-debug.log
|
||||||
|
yarn-error.log
|
||||||
|
testem.log
|
||||||
|
/typings
|
||||||
|
|
||||||
|
# System Files
|
||||||
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
hv2-ui-old/
|
||||||
|
|
4
ui/Dockerfile
Normal file
4
ui/Dockerfile
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
FROM nginx:stable
|
||||||
|
COPY default.conf /etc/nginx/conf.d/
|
||||||
|
COPY dist/hv2-ui/* /usr/share/nginx/html/
|
||||||
|
|
9
ui/default.conf
Normal file
9
ui/default.conf
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name hv2-ui;
|
||||||
|
location / {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
17
ui/hv2-ui/.browserslistrc
Normal file
17
ui/hv2-ui/.browserslistrc
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
|
||||||
|
# For additional information regarding the format and rule options, please see:
|
||||||
|
# https://github.com/browserslist/browserslist#queries
|
||||||
|
|
||||||
|
# For the full list of supported browsers by the Angular framework, please see:
|
||||||
|
# https://angular.io/guide/browser-support
|
||||||
|
|
||||||
|
# You can see what browsers were selected by your queries by running:
|
||||||
|
# npx browserslist
|
||||||
|
|
||||||
|
last 1 Chrome version
|
||||||
|
last 1 Firefox version
|
||||||
|
last 2 Edge major versions
|
||||||
|
last 2 Safari major versions
|
||||||
|
last 2 iOS major versions
|
||||||
|
Firefox ESR
|
||||||
|
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
|
16
ui/hv2-ui/.editorconfig
Normal file
16
ui/hv2-ui/.editorconfig
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# Editor configuration, see https://editorconfig.org
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.ts]
|
||||||
|
quote_type = single
|
||||||
|
|
||||||
|
[*.md]
|
||||||
|
max_line_length = off
|
||||||
|
trim_trailing_whitespace = false
|
46
ui/hv2-ui/.gitignore
vendored
Normal file
46
ui/hv2-ui/.gitignore
vendored
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
# See http://help.github.com/ignore-files/ for more about ignoring files.
|
||||||
|
|
||||||
|
# compiled output
|
||||||
|
/dist
|
||||||
|
/tmp
|
||||||
|
/out-tsc
|
||||||
|
# Only exists if Bazel was run
|
||||||
|
/bazel-out
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
/node_modules
|
||||||
|
|
||||||
|
# profiling files
|
||||||
|
chrome-profiler-events*.json
|
||||||
|
speed-measure-plugin*.json
|
||||||
|
|
||||||
|
# IDEs and editors
|
||||||
|
/.idea
|
||||||
|
.project
|
||||||
|
.classpath
|
||||||
|
.c9/
|
||||||
|
*.launch
|
||||||
|
.settings/
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
|
# IDE - VSCode
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/settings.json
|
||||||
|
!.vscode/tasks.json
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.history/*
|
||||||
|
|
||||||
|
# misc
|
||||||
|
/.sass-cache
|
||||||
|
/connect.lock
|
||||||
|
/coverage
|
||||||
|
/libpeerconnection.log
|
||||||
|
npm-debug.log
|
||||||
|
yarn-error.log
|
||||||
|
testem.log
|
||||||
|
/typings
|
||||||
|
|
||||||
|
# System Files
|
||||||
|
.DS_Store
|
||||||
|
Thumbs.db
|
27
ui/hv2-ui/README.md
Normal file
27
ui/hv2-ui/README.md
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Hv2Ui
|
||||||
|
|
||||||
|
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.0.6.
|
||||||
|
|
||||||
|
## Development server
|
||||||
|
|
||||||
|
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
|
||||||
|
|
||||||
|
## Code scaffolding
|
||||||
|
|
||||||
|
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
|
||||||
|
|
||||||
|
## Build
|
||||||
|
|
||||||
|
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
|
||||||
|
|
||||||
|
## Running unit tests
|
||||||
|
|
||||||
|
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
|
||||||
|
|
||||||
|
## Running end-to-end tests
|
||||||
|
|
||||||
|
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
|
||||||
|
|
||||||
|
## Further help
|
||||||
|
|
||||||
|
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
|
126
ui/hv2-ui/angular.json
Normal file
126
ui/hv2-ui/angular.json
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"hv2-ui": {
|
||||||
|
"projectType": "application",
|
||||||
|
"schematics": {},
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"prefix": "app",
|
||||||
|
"architect": {
|
||||||
|
"build": {
|
||||||
|
"builder": "@angular-devkit/build-angular:browser",
|
||||||
|
"options": {
|
||||||
|
"outputPath": "dist/hv2-ui",
|
||||||
|
"index": "src/index.html",
|
||||||
|
"main": "src/main.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.app.json",
|
||||||
|
"aot": true,
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"./node_modules/@angular/material/prebuilt-themes/purple-green.css",
|
||||||
|
"src/styles.css"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/environments/environment.ts",
|
||||||
|
"with": "src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"optimization": true,
|
||||||
|
"outputHashing": "all",
|
||||||
|
"sourceMap": false,
|
||||||
|
"namedChunks": false,
|
||||||
|
"extractLicenses": true,
|
||||||
|
"vendorChunk": false,
|
||||||
|
"buildOptimizer": true,
|
||||||
|
"budgets": [
|
||||||
|
{
|
||||||
|
"type": "initial",
|
||||||
|
"maximumWarning": "2mb",
|
||||||
|
"maximumError": "5mb"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "anyComponentStyle",
|
||||||
|
"maximumWarning": "6kb",
|
||||||
|
"maximumError": "10kb"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "hv2-ui:build"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "hv2-ui:build:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "hv2-ui:build"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"main": "src/test.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.spec.json",
|
||||||
|
"karmaConfig": "karma.conf.js",
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"./node_modules/@angular/material/prebuilt-themes/purple-green.css",
|
||||||
|
"src/styles.css"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": [
|
||||||
|
"tsconfig.app.json",
|
||||||
|
"tsconfig.spec.json",
|
||||||
|
"e2e/tsconfig.json"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"**/node_modules/**"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"e2e": {
|
||||||
|
"builder": "@angular-devkit/build-angular:protractor",
|
||||||
|
"options": {
|
||||||
|
"protractorConfig": "e2e/protractor.conf.js",
|
||||||
|
"devServerTarget": "hv2-ui:serve"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"devServerTarget": "hv2-ui:serve:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultProject": "hv2-ui"
|
||||||
|
}
|
37
ui/hv2-ui/e2e/protractor.conf.js
Normal file
37
ui/hv2-ui/e2e/protractor.conf.js
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
// @ts-check
|
||||||
|
// Protractor configuration file, see link for more information
|
||||||
|
// https://github.com/angular/protractor/blob/master/lib/config.ts
|
||||||
|
|
||||||
|
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @type { import("protractor").Config }
|
||||||
|
*/
|
||||||
|
exports.config = {
|
||||||
|
allScriptsTimeout: 11000,
|
||||||
|
specs: [
|
||||||
|
'./src/**/*.e2e-spec.ts'
|
||||||
|
],
|
||||||
|
capabilities: {
|
||||||
|
browserName: 'chrome'
|
||||||
|
},
|
||||||
|
directConnect: true,
|
||||||
|
SELENIUM_PROMISE_MANAGER: false,
|
||||||
|
baseUrl: 'http://localhost:4200/',
|
||||||
|
framework: 'jasmine',
|
||||||
|
jasmineNodeOpts: {
|
||||||
|
showColors: true,
|
||||||
|
defaultTimeoutInterval: 30000,
|
||||||
|
print: function() {}
|
||||||
|
},
|
||||||
|
onPrepare() {
|
||||||
|
require('ts-node').register({
|
||||||
|
project: require('path').join(__dirname, './tsconfig.json')
|
||||||
|
});
|
||||||
|
jasmine.getEnv().addReporter(new SpecReporter({
|
||||||
|
spec: {
|
||||||
|
displayStacktrace: StacktraceOption.PRETTY
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
};
|
23
ui/hv2-ui/e2e/src/app.e2e-spec.ts
Normal file
23
ui/hv2-ui/e2e/src/app.e2e-spec.ts
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import { AppPage } from './app.po';
|
||||||
|
import { browser, logging } from 'protractor';
|
||||||
|
|
||||||
|
describe('workspace-project App', () => {
|
||||||
|
let page: AppPage;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
page = new AppPage();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display welcome message', async () => {
|
||||||
|
await page.navigateTo();
|
||||||
|
expect(await page.getTitleText()).toEqual('hv2-ui app is running!');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
// Assert that there are no errors emitted from the browser
|
||||||
|
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
|
||||||
|
expect(logs).not.toContain(jasmine.objectContaining({
|
||||||
|
level: logging.Level.SEVERE,
|
||||||
|
} as logging.Entry));
|
||||||
|
});
|
||||||
|
});
|
11
ui/hv2-ui/e2e/src/app.po.ts
Normal file
11
ui/hv2-ui/e2e/src/app.po.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import { browser, by, element } from 'protractor';
|
||||||
|
|
||||||
|
export class AppPage {
|
||||||
|
async navigateTo(): Promise<unknown> {
|
||||||
|
return browser.get(browser.baseUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getTitleText(): Promise<string> {
|
||||||
|
return element(by.css('app-root .content span')).getText();
|
||||||
|
}
|
||||||
|
}
|
13
ui/hv2-ui/e2e/tsconfig.json
Normal file
13
ui/hv2-ui/e2e/tsconfig.json
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "../tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../out-tsc/e2e",
|
||||||
|
"module": "commonjs",
|
||||||
|
"target": "es2018",
|
||||||
|
"types": [
|
||||||
|
"jasmine",
|
||||||
|
"node"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
44
ui/hv2-ui/karma.conf.js
Normal file
44
ui/hv2-ui/karma.conf.js
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
// Karma configuration file, see link for more information
|
||||||
|
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
||||||
|
|
||||||
|
module.exports = function (config) {
|
||||||
|
config.set({
|
||||||
|
basePath: '',
|
||||||
|
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
||||||
|
plugins: [
|
||||||
|
require('karma-jasmine'),
|
||||||
|
require('karma-chrome-launcher'),
|
||||||
|
require('karma-jasmine-html-reporter'),
|
||||||
|
require('karma-coverage'),
|
||||||
|
require('@angular-devkit/build-angular/plugins/karma')
|
||||||
|
],
|
||||||
|
client: {
|
||||||
|
jasmine: {
|
||||||
|
// you can add configuration options for Jasmine here
|
||||||
|
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
|
||||||
|
// for example, you can disable the random execution with `random: false`
|
||||||
|
// or set a specific seed with `seed: 4321`
|
||||||
|
},
|
||||||
|
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
||||||
|
},
|
||||||
|
jasmineHtmlReporter: {
|
||||||
|
suppressAll: true // removes the duplicated traces
|
||||||
|
},
|
||||||
|
coverageReporter: {
|
||||||
|
dir: require('path').join(__dirname, './coverage/hv2-ui'),
|
||||||
|
subdir: '.',
|
||||||
|
reporters: [
|
||||||
|
{ type: 'html' },
|
||||||
|
{ type: 'text-summary' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
reporters: ['progress', 'kjhtml'],
|
||||||
|
port: 9876,
|
||||||
|
colors: true,
|
||||||
|
logLevel: config.LOG_INFO,
|
||||||
|
autoWatch: true,
|
||||||
|
browsers: ['Chrome'],
|
||||||
|
singleRun: false,
|
||||||
|
restartOnFileChange: true
|
||||||
|
});
|
||||||
|
};
|
13627
ui/hv2-ui/package-lock.json
generated
Normal file
13627
ui/hv2-ui/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
50
ui/hv2-ui/package.json
Normal file
50
ui/hv2-ui/package.json
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"name": "hv2-ui",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"scripts": {
|
||||||
|
"ng": "ng",
|
||||||
|
"start": "ng serve",
|
||||||
|
"build": "ng build",
|
||||||
|
"test": "ng test",
|
||||||
|
"lint": "ng lint",
|
||||||
|
"e2e": "ng e2e",
|
||||||
|
"generate": "python ../helpers/hv2-api/generate.py -s ../helpers/hv2-api/schema.json -t ./src/app/*.tmpl"
|
||||||
|
|
||||||
|
},
|
||||||
|
"private": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@angular/animations": "~11.0.6",
|
||||||
|
"@angular/cdk": "^11.2.13",
|
||||||
|
"@angular/common": "~11.0.6",
|
||||||
|
"@angular/compiler": "~11.0.6",
|
||||||
|
"@angular/core": "~11.0.6",
|
||||||
|
"@angular/forms": "~11.0.6",
|
||||||
|
"@angular/material": "^11.2.13",
|
||||||
|
"@angular/platform-browser": "~11.0.6",
|
||||||
|
"@angular/platform-browser-dynamic": "~11.0.6",
|
||||||
|
"@angular/router": "~11.0.6",
|
||||||
|
"jwt-decode": "^3.1.2",
|
||||||
|
"rxjs": "~6.6.0",
|
||||||
|
"tslib": "^2.0.0",
|
||||||
|
"zone.js": "~0.10.2"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@angular-devkit/build-angular": "~0.1100.6",
|
||||||
|
"@angular/cli": "~11.0.6",
|
||||||
|
"@angular/compiler-cli": "~11.0.6",
|
||||||
|
"@types/jasmine": "~3.6.0",
|
||||||
|
"@types/node": "^12.11.1",
|
||||||
|
"codelyzer": "^6.0.0",
|
||||||
|
"jasmine-core": "~3.6.0",
|
||||||
|
"jasmine-spec-reporter": "~5.0.0",
|
||||||
|
"karma": "~5.1.0",
|
||||||
|
"karma-chrome-launcher": "~3.1.0",
|
||||||
|
"karma-coverage": "~2.0.3",
|
||||||
|
"karma-jasmine": "~4.0.0",
|
||||||
|
"karma-jasmine-html-reporter": "^1.5.0",
|
||||||
|
"protractor": "~7.0.0",
|
||||||
|
"ts-node": "~8.3.0",
|
||||||
|
"tslint": "~6.1.0",
|
||||||
|
"typescript": "~4.0.2"
|
||||||
|
}
|
||||||
|
}
|
21
ui/hv2-ui/src/app/app-routing.module.ts
Normal file
21
ui/hv2-ui/src/app/app-routing.module.ts
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
|
import { AuthGuardService } from './auth-guard.service';
|
||||||
|
import { LoginComponent } from './login/login.component';
|
||||||
|
import { LogoutComponent } from './logout/logout.component';
|
||||||
|
import { TestOutputComponent } from './test-output/test-output.component';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{ path: 'test', component: TestOutputComponent, canActivate: [ AuthGuardService ] },
|
||||||
|
{ path: 'logout', component: LogoutComponent },
|
||||||
|
{ path: 'login', component: LoginComponent }
|
||||||
|
]
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forRoot(routes, {onSameUrlNavigation:'reload'})],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
|
||||||
|
export class AppRoutingModule { }
|
0
ui/hv2-ui/src/app/app.component.css
Normal file
0
ui/hv2-ui/src/app/app.component.css
Normal file
3
ui/hv2-ui/src/app/app.component.html
Normal file
3
ui/hv2-ui/src/app/app.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<section class="mat-typography">
|
||||||
|
<app-navigation></app-navigation>
|
||||||
|
</section>
|
31
ui/hv2-ui/src/app/app.component.spec.ts
Normal file
31
ui/hv2-ui/src/app/app.component.spec.ts
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
|
||||||
|
describe('AppComponent', () => {
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [
|
||||||
|
AppComponent
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create the app', () => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
const app = fixture.componentInstance;
|
||||||
|
expect(app).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should have as title 'hv2-ui'`, () => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
const app = fixture.componentInstance;
|
||||||
|
expect(app.title).toEqual('hv2-ui');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should render title', () => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
const compiled = fixture.nativeElement;
|
||||||
|
expect(compiled.querySelector('.content span').textContent).toContain('hv2-ui app is running!');
|
||||||
|
});
|
||||||
|
});
|
10
ui/hv2-ui/src/app/app.component.ts
Normal file
10
ui/hv2-ui/src/app/app.component.ts
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-root',
|
||||||
|
templateUrl: './app.component.html',
|
||||||
|
styleUrls: ['./app.component.css']
|
||||||
|
})
|
||||||
|
export class AppComponent {
|
||||||
|
title = 'hv2-ui';
|
||||||
|
}
|
57
ui/hv2-ui/src/app/app.module.ts
Normal file
57
ui/hv2-ui/src/app/app.module.ts
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
import { NavigationComponent } from './navigation/navigation.component';
|
||||||
|
import { LayoutModule } from '@angular/cdk/layout';
|
||||||
|
import { MatToolbarModule } from '@angular/material/toolbar';
|
||||||
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
|
import { MatSidenavModule } from '@angular/material/sidenav';
|
||||||
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
|
import { MatListModule } from '@angular/material/list';
|
||||||
|
import { MessagesComponent } from './messages/messages.component';
|
||||||
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
|
import { TestOutputComponent } from './test-output/test-output.component';
|
||||||
|
import { MatCardModule } from '@angular/material/card';
|
||||||
|
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||||
|
import { ErrorHandlerInterceptor } from './error-handler.interceptor';
|
||||||
|
import { AuthHandlerInterceptor } from './auth-handler.interceptor';
|
||||||
|
import { LogoutComponent } from './logout/logout.component';
|
||||||
|
import { LoginComponent } from './login/login.component';
|
||||||
|
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||||
|
import { MatInputModule } from '@angular/material/input';
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
declarations: [
|
||||||
|
AppComponent,
|
||||||
|
NavigationComponent,
|
||||||
|
MessagesComponent,
|
||||||
|
TestOutputComponent,
|
||||||
|
LogoutComponent,
|
||||||
|
LoginComponent
|
||||||
|
],
|
||||||
|
imports: [
|
||||||
|
BrowserModule,
|
||||||
|
BrowserAnimationsModule,
|
||||||
|
LayoutModule,
|
||||||
|
HttpClientModule,
|
||||||
|
MatToolbarModule,
|
||||||
|
MatButtonModule,
|
||||||
|
MatSidenavModule,
|
||||||
|
MatIconModule,
|
||||||
|
MatListModule,
|
||||||
|
MatCardModule,
|
||||||
|
AppRoutingModule,
|
||||||
|
FormsModule,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
MatInputModule
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
{ provide: HTTP_INTERCEPTORS, useClass: ErrorHandlerInterceptor, multi: true },
|
||||||
|
{ provide: HTTP_INTERCEPTORS, useClass: AuthHandlerInterceptor, multi: true }
|
||||||
|
],
|
||||||
|
bootstrap: [AppComponent]
|
||||||
|
})
|
||||||
|
export class AppModule { }
|
16
ui/hv2-ui/src/app/auth-guard.service.spec.ts
Normal file
16
ui/hv2-ui/src/app/auth-guard.service.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AuthGuardService } from './auth-guard.service';
|
||||||
|
|
||||||
|
describe('AuthGuardService', () => {
|
||||||
|
let service: AuthGuardService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(AuthGuardService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
22
ui/hv2-ui/src/app/auth-guard.service.ts
Normal file
22
ui/hv2-ui/src/app/auth-guard.service.ts
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
import { TokenService } from './token.service';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class AuthGuardService implements CanActivate {
|
||||||
|
|
||||||
|
constructor(public tokenService: TokenService, public router: Router, private messageService: MessageService) {
|
||||||
|
}
|
||||||
|
|
||||||
|
canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
|
||||||
|
this.messageService.add(`Activated: ${next.url}`)
|
||||||
|
if (! this.tokenService.checkAuthenticated()) {
|
||||||
|
return this.router.parseUrl(`/login?returnUrl=${next.url}`)
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
16
ui/hv2-ui/src/app/auth-handler.interceptor.spec.ts
Normal file
16
ui/hv2-ui/src/app/auth-handler.interceptor.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AuthHandlerInterceptor } from './auth-handler.interceptor';
|
||||||
|
|
||||||
|
describe('AuthHandlerInterceptor', () => {
|
||||||
|
beforeEach(() => TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
AuthHandlerInterceptor
|
||||||
|
]
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
const interceptor: AuthHandlerInterceptor = TestBed.inject(AuthHandlerInterceptor);
|
||||||
|
expect(interceptor).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
28
ui/hv2-ui/src/app/auth-handler.interceptor.ts
Normal file
28
ui/hv2-ui/src/app/auth-handler.interceptor.ts
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {
|
||||||
|
HttpRequest,
|
||||||
|
HttpHandler,
|
||||||
|
HttpEvent,
|
||||||
|
HttpInterceptor
|
||||||
|
} from '@angular/common/http';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
import { TokenService } from './token.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuthHandlerInterceptor implements HttpInterceptor {
|
||||||
|
|
||||||
|
constructor(private tokenService: TokenService, private messageService: MessageService) {}
|
||||||
|
|
||||||
|
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
|
||||||
|
const token = localStorage.getItem(TokenService.Id_Token_Key)
|
||||||
|
if (request.url.includes('api.hv.nober.de') && token) {
|
||||||
|
const clone = request.clone({
|
||||||
|
setHeaders: { Authorization: `Bearer ${token}`}
|
||||||
|
})
|
||||||
|
return next.handle(clone)
|
||||||
|
}
|
||||||
|
|
||||||
|
return next.handle(request);
|
||||||
|
}
|
||||||
|
}
|
2
ui/hv2-ui/src/app/config.ts
Normal file
2
ui/hv2-ui/src/app/config.ts
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
export const serviceBaseUrl = "https://api.hv.nober.de";
|
||||||
|
// export const serviceBaseUrl = "http://172.16.10.38:5000";
|
35
ui/hv2-ui/src/app/data-object-service.ts.tmpl
Normal file
35
ui/hv2-ui/src/app/data-object-service.ts.tmpl
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable, of } from 'rxjs';
|
||||||
|
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
import { serviceBaseUrl } from './config';
|
||||||
|
|
||||||
|
|
||||||
|
#for $table in $tables
|
||||||
|
import { ${JsNameConverter($table.name)} } from './data-objects';
|
||||||
|
#end for
|
||||||
|
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#from generateHelper import JsNameConverter
|
||||||
|
|
||||||
|
#for $table in $tables
|
||||||
|
export class ${JsNameConverter($table.name)}Service {
|
||||||
|
constructor(private messageService: MessageService, private http: HttpClient) { }
|
||||||
|
|
||||||
|
async get${JsNameConverter($table.name)}(): Promise<${JsNameConverter($table.name)}> {
|
||||||
|
this.messageService.add(`${JsNameConverter($table.name)}Service: fetch data`);
|
||||||
|
return this.http.get<${JsNameConverter($table.name)}>(`\${serviceBaseUrl}/v1/${table.name}`).toPromise()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#end for
|
||||||
|
|
11
ui/hv2-ui/src/app/data-objects.ts.tmpl
Normal file
11
ui/hv2-ui/src/app/data-objects.ts.tmpl
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#from generateHelper import JsNameConverter
|
||||||
|
|
||||||
|
#for $table in $tables
|
||||||
|
export interface $JsNameConverter($table.name) {
|
||||||
|
#for $column in $table.columns
|
||||||
|
${column.name}: ${column.jstype}
|
||||||
|
#end for
|
||||||
|
}
|
||||||
|
|
||||||
|
#end for
|
||||||
|
|
16
ui/hv2-ui/src/app/error-handler.interceptor.spec.ts
Normal file
16
ui/hv2-ui/src/app/error-handler.interceptor.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ErrorHandlerInterceptor } from './error-handler.interceptor';
|
||||||
|
|
||||||
|
describe('ErrorHandlerInterceptor', () => {
|
||||||
|
beforeEach(() => TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
ErrorHandlerInterceptor
|
||||||
|
]
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
const interceptor: ErrorHandlerInterceptor = TestBed.inject(ErrorHandlerInterceptor);
|
||||||
|
expect(interceptor).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
30
ui/hv2-ui/src/app/error-handler.interceptor.ts
Normal file
30
ui/hv2-ui/src/app/error-handler.interceptor.ts
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {
|
||||||
|
HttpRequest,
|
||||||
|
HttpHandler,
|
||||||
|
HttpEvent,
|
||||||
|
HttpInterceptor,
|
||||||
|
HttpErrorResponse
|
||||||
|
} from '@angular/common/http';
|
||||||
|
import { Observable, throwError } from 'rxjs';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
import { catchError } from 'rxjs/operators';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ErrorHandlerInterceptor implements HttpInterceptor {
|
||||||
|
|
||||||
|
constructor(private messageService: MessageService, private router: Router) {}
|
||||||
|
|
||||||
|
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
|
||||||
|
return next.handle(request).pipe(
|
||||||
|
catchError((errorResponse: HttpErrorResponse) => {
|
||||||
|
this.messageService.add(`Intercepted http error: ${JSON.stringify(errorResponse, undefined, 4)}`)
|
||||||
|
if (errorResponse.status === 401) {
|
||||||
|
this.router.navigate(['login'])
|
||||||
|
}
|
||||||
|
return throwError(errorResponse)
|
||||||
|
})
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
9
ui/hv2-ui/src/app/login/login.component.css
Normal file
9
ui/hv2-ui/src/app/login/login.component.css
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
mat-card {
|
||||||
|
max-width: 400px;
|
||||||
|
margin: 2em auto;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
mat-form-field {
|
||||||
|
display: block;
|
||||||
|
}
|
23
ui/hv2-ui/src/app/login/login.component.html
Normal file
23
ui/hv2-ui/src/app/login/login.component.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
<mat-card>
|
||||||
|
<mat-card-content>
|
||||||
|
<form [formGroup]="form" (ngSubmit)="onSubmit()">
|
||||||
|
<h2>Log In</h2>
|
||||||
|
<mat-error *ngIf="loginInvalid">
|
||||||
|
The username and password were not recognized
|
||||||
|
</mat-error>
|
||||||
|
<mat-form-field class="full-width-input">
|
||||||
|
<input matInput placeholder="Username" formControlName="username" required>
|
||||||
|
<mat-error>
|
||||||
|
Please provide a valid email address
|
||||||
|
</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field class="full-width-input">
|
||||||
|
<input matInput type="password" placeholder="Password" formControlName="password" required>
|
||||||
|
<mat-error>
|
||||||
|
Please provide a valid password
|
||||||
|
</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
<button mat-raised-button color="primary">Login</button>
|
||||||
|
</form>
|
||||||
|
</mat-card-content>
|
||||||
|
</mat-card>
|
25
ui/hv2-ui/src/app/login/login.component.spec.ts
Normal file
25
ui/hv2-ui/src/app/login/login.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { LoginComponent } from './login.component';
|
||||||
|
|
||||||
|
describe('LoginComponent', () => {
|
||||||
|
let component: LoginComponent;
|
||||||
|
let fixture: ComponentFixture<LoginComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ LoginComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(LoginComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
56
ui/hv2-ui/src/app/login/login.component.ts
Normal file
56
ui/hv2-ui/src/app/login/login.component.ts
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { MessageService } from '../message.service';
|
||||||
|
import { TokenService } from '../token.service';
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-login',
|
||||||
|
templateUrl: './login.component.html',
|
||||||
|
styleUrls: ['./login.component.css']
|
||||||
|
})
|
||||||
|
export class LoginComponent implements OnInit {
|
||||||
|
form: FormGroup;
|
||||||
|
public loginInvalid = false;
|
||||||
|
private formSubmitAttempt = false;
|
||||||
|
private returnUrl: string;
|
||||||
|
|
||||||
|
constructor(private fb: FormBuilder,
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private router: Router,
|
||||||
|
private tokenService: TokenService,
|
||||||
|
private messageService: MessageService) {
|
||||||
|
this.returnUrl = this.route.snapshot.queryParams.returnUrl || '/'
|
||||||
|
this.messageService.add(`Return URL is ${this.returnUrl}`)
|
||||||
|
this.form = this.fb.group({
|
||||||
|
username: ['', Validators.required],
|
||||||
|
password: ['', Validators.required]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
if (this.tokenService.checkAuthenticated()) {
|
||||||
|
this.router.navigate([this.returnUrl])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async onSubmit(): Promise<void> {
|
||||||
|
this.loginInvalid = false;
|
||||||
|
this.formSubmitAttempt = false;
|
||||||
|
if (this.form.valid) {
|
||||||
|
try {
|
||||||
|
const username = this.form.get('username')?.value;
|
||||||
|
const password = this.form.get('password')?.value;
|
||||||
|
await this.tokenService.login(username, password);
|
||||||
|
this.router.navigate([this.returnUrl])
|
||||||
|
} catch (err) {
|
||||||
|
this.messageService.add(`Login err: ${err.message}`)
|
||||||
|
this.loginInvalid = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.formSubmitAttempt = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
0
ui/hv2-ui/src/app/logout/logout.component.css
Normal file
0
ui/hv2-ui/src/app/logout/logout.component.css
Normal file
17
ui/hv2-ui/src/app/logout/logout.component.html
Normal file
17
ui/hv2-ui/src/app/logout/logout.component.html
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<section class="mat-typography">
|
||||||
|
<mat-card class="defaultCard">
|
||||||
|
<mat-card-header>
|
||||||
|
<mat-card-title>
|
||||||
|
Logout
|
||||||
|
</mat-card-title>
|
||||||
|
</mat-card-header>
|
||||||
|
<mat-card-content>
|
||||||
|
<div>
|
||||||
|
|
||||||
|
<h2>Good bye</h2>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</mat-card-content>
|
||||||
|
</mat-card>
|
||||||
|
</section>
|
25
ui/hv2-ui/src/app/logout/logout.component.spec.ts
Normal file
25
ui/hv2-ui/src/app/logout/logout.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { LogoutComponent } from './logout.component';
|
||||||
|
|
||||||
|
describe('LogoutComponent', () => {
|
||||||
|
let component: LogoutComponent;
|
||||||
|
let fixture: ComponentFixture<LogoutComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ LogoutComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(LogoutComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
20
ui/hv2-ui/src/app/logout/logout.component.ts
Normal file
20
ui/hv2-ui/src/app/logout/logout.component.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { MessageService } from '../message.service';
|
||||||
|
import { TokenService } from '../token.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-logout',
|
||||||
|
templateUrl: './logout.component.html',
|
||||||
|
styleUrls: ['./logout.component.css']
|
||||||
|
})
|
||||||
|
export class LogoutComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(private tokenService: TokenService, private router: Router, private messageService: MessageService) { }
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.tokenService.logout()
|
||||||
|
this.router.navigateByUrl('/login')
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
16
ui/hv2-ui/src/app/message.service.spec.ts
Normal file
16
ui/hv2-ui/src/app/message.service.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
|
||||||
|
describe('MessageService', () => {
|
||||||
|
let service: MessageService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(MessageService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
16
ui/hv2-ui/src/app/message.service.ts
Normal file
16
ui/hv2-ui/src/app/message.service.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root',
|
||||||
|
})
|
||||||
|
export class MessageService {
|
||||||
|
messages: string[] = [];
|
||||||
|
|
||||||
|
add(message: string) {
|
||||||
|
this.messages.push(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
clear() {
|
||||||
|
this.messages = [];
|
||||||
|
}
|
||||||
|
}
|
0
ui/hv2-ui/src/app/messages/messages.component.css
Normal file
0
ui/hv2-ui/src/app/messages/messages.component.css
Normal file
11
ui/hv2-ui/src/app/messages/messages.component.html
Normal file
11
ui/hv2-ui/src/app/messages/messages.component.html
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<section class="mat-typography">
|
||||||
|
<mat-card class="defaultCard" *ngIf="messageService.messages.length">
|
||||||
|
<mat-card-header>
|
||||||
|
<mat-card-title>Messages</mat-card-title>
|
||||||
|
</mat-card-header>
|
||||||
|
<mat-card-content>
|
||||||
|
<button (click)="messageService.clear()">clear</button>
|
||||||
|
<div *ngFor='let message of messageService.messages'> {{message}} </div>
|
||||||
|
</mat-card-content>
|
||||||
|
</mat-card>
|
||||||
|
</section>
|
25
ui/hv2-ui/src/app/messages/messages.component.spec.ts
Normal file
25
ui/hv2-ui/src/app/messages/messages.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MessagesComponent } from './messages.component';
|
||||||
|
|
||||||
|
describe('MessagesComponent', () => {
|
||||||
|
let component: MessagesComponent;
|
||||||
|
let fixture: ComponentFixture<MessagesComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ MessagesComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(MessagesComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
16
ui/hv2-ui/src/app/messages/messages.component.ts
Normal file
16
ui/hv2-ui/src/app/messages/messages.component.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { MessageService } from '../message.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-messages',
|
||||||
|
templateUrl: './messages.component.html',
|
||||||
|
styleUrls: ['./messages.component.css']
|
||||||
|
})
|
||||||
|
export class MessagesComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(public messageService: MessageService) { }
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
26
ui/hv2-ui/src/app/navigation/navigation.component.css
Normal file
26
ui/hv2-ui/src/app/navigation/navigation.component.css
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
.sidenav-container {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidenav {
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidenav .mat-toolbar {
|
||||||
|
background: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-toolbar.mat-primary {
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spacer {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gittagversion {
|
||||||
|
font-size: x-small;
|
||||||
|
margin-right: 5em;
|
||||||
|
}
|
33
ui/hv2-ui/src/app/navigation/navigation.component.html
Normal file
33
ui/hv2-ui/src/app/navigation/navigation.component.html
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
<mat-sidenav-container class="sidenav-container">
|
||||||
|
<mat-sidenav #drawer class="sidenav" fixedInViewport
|
||||||
|
[attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
|
||||||
|
[mode]="(isHandset$ | async) ? 'over' : 'side'"
|
||||||
|
[opened]="(isHandset$ | async) === false">
|
||||||
|
<mat-toolbar>Menu</mat-toolbar>
|
||||||
|
<mat-nav-list>
|
||||||
|
<a mat-list-item href="/test">Mein Test</a>
|
||||||
|
</mat-nav-list>
|
||||||
|
</mat-sidenav>
|
||||||
|
<mat-sidenav-content>
|
||||||
|
<mat-toolbar color="primary">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
aria-label="Toggle sidenav"
|
||||||
|
mat-icon-button
|
||||||
|
(click)="drawer.toggle()"
|
||||||
|
*ngIf="isHandset$ | async">
|
||||||
|
<mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
|
||||||
|
</button>
|
||||||
|
<span>Nober Grundbesitz GbR Hausverwaltung</span>
|
||||||
|
<span class="spacer"></span>
|
||||||
|
<span class="gittagversion">GITTAGVERSION</span>
|
||||||
|
<a *ngIf="!authenticated" mat-button routerLink="/login">Login</a>
|
||||||
|
<a *ngIf="authenticated" mat-button routerLink="/logout">Logout</a>
|
||||||
|
</mat-toolbar>
|
||||||
|
<!-- Add Content Here -->
|
||||||
|
|
||||||
|
<router-outlet></router-outlet>
|
||||||
|
<app-messages></app-messages>
|
||||||
|
|
||||||
|
</mat-sidenav-content>
|
||||||
|
</mat-sidenav-container>
|
40
ui/hv2-ui/src/app/navigation/navigation.component.spec.ts
Normal file
40
ui/hv2-ui/src/app/navigation/navigation.component.spec.ts
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
import { LayoutModule } from '@angular/cdk/layout';
|
||||||
|
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
|
import { MatListModule } from '@angular/material/list';
|
||||||
|
import { MatSidenavModule } from '@angular/material/sidenav';
|
||||||
|
import { MatToolbarModule } from '@angular/material/toolbar';
|
||||||
|
|
||||||
|
import { NavigationComponent } from './navigation.component';
|
||||||
|
|
||||||
|
describe('NavigationComponent', () => {
|
||||||
|
let component: NavigationComponent;
|
||||||
|
let fixture: ComponentFixture<NavigationComponent>;
|
||||||
|
|
||||||
|
beforeEach(waitForAsync(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [NavigationComponent],
|
||||||
|
imports: [
|
||||||
|
NoopAnimationsModule,
|
||||||
|
LayoutModule,
|
||||||
|
MatButtonModule,
|
||||||
|
MatIconModule,
|
||||||
|
MatListModule,
|
||||||
|
MatSidenavModule,
|
||||||
|
MatToolbarModule,
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(NavigationComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should compile', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
38
ui/hv2-ui/src/app/navigation/navigation.component.ts
Normal file
38
ui/hv2-ui/src/app/navigation/navigation.component.ts
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { map, shareReplay } from 'rxjs/operators';
|
||||||
|
import { TokenService } from '../token.service';
|
||||||
|
import { NavigationEnd, Router } from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-navigation',
|
||||||
|
templateUrl: './navigation.component.html',
|
||||||
|
styleUrls: ['./navigation.component.css']
|
||||||
|
})
|
||||||
|
export class NavigationComponent {
|
||||||
|
|
||||||
|
public authenticated: boolean
|
||||||
|
|
||||||
|
isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
|
||||||
|
.pipe(
|
||||||
|
map(result => result.matches),
|
||||||
|
shareReplay()
|
||||||
|
);
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private breakpointObserver: BreakpointObserver,
|
||||||
|
private tokenService: TokenService,
|
||||||
|
private router: Router) {
|
||||||
|
this.router.events.subscribe((e: any) => {
|
||||||
|
if (e instanceof NavigationEnd) {
|
||||||
|
this.authenticated = this.tokenService.checkAuthenticated()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.authenticated = this.tokenService.checkAuthenticated()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
16
ui/hv2-ui/src/app/test-output.service.spec.ts
Normal file
16
ui/hv2-ui/src/app/test-output.service.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TestOutputService } from './test-output.service';
|
||||||
|
|
||||||
|
describe('TestOutputService', () => {
|
||||||
|
let service: TestOutputService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(TestOutputService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
19
ui/hv2-ui/src/app/test-output.service.ts
Normal file
19
ui/hv2-ui/src/app/test-output.service.ts
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable, of } from 'rxjs';
|
||||||
|
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
import { serviceBaseUrl } from './config';
|
||||||
|
import { TestOutput } from './testOutput';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class TestOutputService {
|
||||||
|
constructor(private messageService: MessageService, private http: HttpClient) { }
|
||||||
|
|
||||||
|
async getTestOutput(): Promise<TestOutput> {
|
||||||
|
this.messageService.add(`TestOutputService: fetch test output`);
|
||||||
|
return this.http.get<TestOutput>(`${serviceBaseUrl}/v1/test`).toPromise()
|
||||||
|
}
|
||||||
|
}
|
22
ui/hv2-ui/src/app/test-output/test-output.component.html
Normal file
22
ui/hv2-ui/src/app/test-output/test-output.component.html
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<section class="mat-typography">
|
||||||
|
<mat-card class="defaultCard">
|
||||||
|
<mat-card-header>
|
||||||
|
<mat-card-title>
|
||||||
|
Mein Test
|
||||||
|
</mat-card-title>
|
||||||
|
</mat-card-header>
|
||||||
|
<mat-card-content>
|
||||||
|
<div>
|
||||||
|
|
||||||
|
<h2>Mein Test</h2>
|
||||||
|
<pre>
|
||||||
|
{{testOutput.message}}
|
||||||
|
|
||||||
|
{{testOutput.details}}
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</mat-card-content>
|
||||||
|
</mat-card>
|
||||||
|
</section>
|
25
ui/hv2-ui/src/app/test-output/test-output.component.spec.ts
Normal file
25
ui/hv2-ui/src/app/test-output/test-output.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TestOutputComponent } from './test-output.component';
|
||||||
|
|
||||||
|
describe('TestOutputComponent', () => {
|
||||||
|
let component: TestOutputComponent;
|
||||||
|
let fixture: ComponentFixture<TestOutputComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ TestOutputComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(TestOutputComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
29
ui/hv2-ui/src/app/test-output/test-output.component.ts
Normal file
29
ui/hv2-ui/src/app/test-output/test-output.component.ts
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { MessageService } from '../message.service';
|
||||||
|
import { TestOutputService } from '../test-output.service';
|
||||||
|
import { TestOutput } from '../testOutput';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-test-output',
|
||||||
|
templateUrl: './test-output.component.html',
|
||||||
|
styleUrls: ['./test-output.component.css']
|
||||||
|
})
|
||||||
|
export class TestOutputComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(private testOutputService: TestOutputService, private messageService: MessageService) { }
|
||||||
|
|
||||||
|
testOutput : TestOutput = { "message": "abc", "details": "123" }
|
||||||
|
|
||||||
|
async getTestOutput() {
|
||||||
|
try {
|
||||||
|
this.testOutput = await this.testOutputService.getTestOutput();
|
||||||
|
} catch (err) {
|
||||||
|
this.messageService.add(JSON.stringify(err, undefined, 4))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.messageService.add("TestOutputComponent.ngOnInit")
|
||||||
|
this.getTestOutput();
|
||||||
|
}
|
||||||
|
}
|
4
ui/hv2-ui/src/app/testOutput.ts
Normal file
4
ui/hv2-ui/src/app/testOutput.ts
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
export interface TestOutput {
|
||||||
|
message: string
|
||||||
|
details: string
|
||||||
|
}
|
16
ui/hv2-ui/src/app/token.service.spec.ts
Normal file
16
ui/hv2-ui/src/app/token.service.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TokenService } from './token.service';
|
||||||
|
|
||||||
|
describe('TokenService', () => {
|
||||||
|
let service: TokenService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(TokenService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
54
ui/hv2-ui/src/app/token.service.ts
Normal file
54
ui/hv2-ui/src/app/token.service.ts
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||||
|
import { UserCreds } from './userCreds'
|
||||||
|
import jwt_decode from 'jwt-decode'
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class TokenService {
|
||||||
|
|
||||||
|
public static Id_Token_Key : string = "id_token";
|
||||||
|
|
||||||
|
constructor(private http: HttpClient, private messageService: MessageService) {
|
||||||
|
}
|
||||||
|
|
||||||
|
checkAuthenticated(): boolean {
|
||||||
|
let result: boolean = false
|
||||||
|
|
||||||
|
const token = localStorage.getItem(TokenService.Id_Token_Key)
|
||||||
|
if (token) {
|
||||||
|
let expiration = jwt_decode(token)["exp"]
|
||||||
|
if ((expiration * 1000) > Date.now()) {
|
||||||
|
result = true
|
||||||
|
} else {
|
||||||
|
this.logout()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
logout() {
|
||||||
|
localStorage.removeItem(TokenService.Id_Token_Key)
|
||||||
|
this.messageService.add("Token removed from local storage")
|
||||||
|
}
|
||||||
|
|
||||||
|
async login(login: string, password: string) {
|
||||||
|
this.messageService.add(`TokenService: trying to login and obtain token`);
|
||||||
|
const userCreds : UserCreds = {
|
||||||
|
"application": "hv2",
|
||||||
|
"login": login,
|
||||||
|
"password": password
|
||||||
|
}
|
||||||
|
const token = await this.http.post(
|
||||||
|
"https://authservice.hottis.de/token",
|
||||||
|
userCreds,
|
||||||
|
{responseType:'text'}
|
||||||
|
).toPromise()
|
||||||
|
localStorage.setItem(TokenService.Id_Token_Key, token)
|
||||||
|
this.messageService.add("Token saved")
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
5
ui/hv2-ui/src/app/userCreds.ts
Normal file
5
ui/hv2-ui/src/app/userCreds.ts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
export interface UserCreds {
|
||||||
|
application: string
|
||||||
|
login: string
|
||||||
|
password: string
|
||||||
|
}
|
0
ui/hv2-ui/src/assets/.gitkeep
Normal file
0
ui/hv2-ui/src/assets/.gitkeep
Normal file
3
ui/hv2-ui/src/environments/environment.prod.ts
Normal file
3
ui/hv2-ui/src/environments/environment.prod.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export const environment = {
|
||||||
|
production: true
|
||||||
|
};
|
16
ui/hv2-ui/src/environments/environment.ts
Normal file
16
ui/hv2-ui/src/environments/environment.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
// This file can be replaced during build by using the `fileReplacements` array.
|
||||||
|
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
|
||||||
|
// The list of file replacements can be found in `angular.json`.
|
||||||
|
|
||||||
|
export const environment = {
|
||||||
|
production: false
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For easier debugging in development mode, you can import the following file
|
||||||
|
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
|
||||||
|
*
|
||||||
|
* This import should be commented out in production mode because it will have a negative impact
|
||||||
|
* on performance if an error is thrown.
|
||||||
|
*/
|
||||||
|
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
|
BIN
ui/hv2-ui/src/favicon.ico
Normal file
BIN
ui/hv2-ui/src/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 948 B |
16
ui/hv2-ui/src/index.html
Normal file
16
ui/hv2-ui/src/index.html
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>Hv2Ui</title>
|
||||||
|
<base href="/">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||||
|
<link rel="preconnect" href="https://fonts.gstatic.com">
|
||||||
|
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
|
||||||
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||||
|
</head>
|
||||||
|
<body class="mat-typography">
|
||||||
|
<app-root></app-root>
|
||||||
|
</body>
|
||||||
|
</html>
|
12
ui/hv2-ui/src/main.ts
Normal file
12
ui/hv2-ui/src/main.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { enableProdMode } from '@angular/core';
|
||||||
|
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
||||||
|
|
||||||
|
import { AppModule } from './app/app.module';
|
||||||
|
import { environment } from './environments/environment';
|
||||||
|
|
||||||
|
if (environment.production) {
|
||||||
|
enableProdMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||||
|
.catch(err => console.error(err));
|
63
ui/hv2-ui/src/polyfills.ts
Normal file
63
ui/hv2-ui/src/polyfills.ts
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
/**
|
||||||
|
* This file includes polyfills needed by Angular and is loaded before the app.
|
||||||
|
* You can add your own extra polyfills to this file.
|
||||||
|
*
|
||||||
|
* This file is divided into 2 sections:
|
||||||
|
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
|
||||||
|
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
|
||||||
|
* file.
|
||||||
|
*
|
||||||
|
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
|
||||||
|
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
|
||||||
|
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
|
||||||
|
*
|
||||||
|
* Learn more in https://angular.io/guide/browser-support
|
||||||
|
*/
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* BROWSER POLYFILLS
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** IE11 requires the following for NgClass support on SVG elements */
|
||||||
|
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Web Animations `@angular/platform-browser/animations`
|
||||||
|
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
|
||||||
|
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
|
||||||
|
*/
|
||||||
|
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* By default, zone.js will patch all possible macroTask and DomEvents
|
||||||
|
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
||||||
|
* because those flags need to be set before `zone.js` being loaded, and webpack
|
||||||
|
* will put import in the top of bundle, so user need to create a separate file
|
||||||
|
* in this directory (for example: zone-flags.ts), and put the following flags
|
||||||
|
* into that file, and then add the following code before importing zone.js.
|
||||||
|
* import './zone-flags';
|
||||||
|
*
|
||||||
|
* The flags allowed in zone-flags.ts are listed here.
|
||||||
|
*
|
||||||
|
* The following flags will work for all browsers.
|
||||||
|
*
|
||||||
|
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
|
||||||
|
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
|
||||||
|
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
|
||||||
|
*
|
||||||
|
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
|
||||||
|
* with the following flag, it will bypass `zone.js` patch for IE/Edge
|
||||||
|
*
|
||||||
|
* (window as any).__Zone_enable_cross_context_check = true;
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* Zone JS is required by default for Angular itself.
|
||||||
|
*/
|
||||||
|
import 'zone.js/dist/zone'; // Included with Angular CLI.
|
||||||
|
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* APPLICATION IMPORTS
|
||||||
|
*/
|
9
ui/hv2-ui/src/styles.css
Normal file
9
ui/hv2-ui/src/styles.css
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
/* You can add global styles to this file, and also import other style files */
|
||||||
|
|
||||||
|
html, body { height: 100%; }
|
||||||
|
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
|
||||||
|
|
||||||
|
|
||||||
|
.defaultCard {
|
||||||
|
margin: 5px;
|
||||||
|
}
|
25
ui/hv2-ui/src/test.ts
Normal file
25
ui/hv2-ui/src/test.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
||||||
|
|
||||||
|
import 'zone.js/dist/zone-testing';
|
||||||
|
import { getTestBed } from '@angular/core/testing';
|
||||||
|
import {
|
||||||
|
BrowserDynamicTestingModule,
|
||||||
|
platformBrowserDynamicTesting
|
||||||
|
} from '@angular/platform-browser-dynamic/testing';
|
||||||
|
|
||||||
|
declare const require: {
|
||||||
|
context(path: string, deep?: boolean, filter?: RegExp): {
|
||||||
|
keys(): string[];
|
||||||
|
<T>(id: string): T;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
// First, initialize the Angular testing environment.
|
||||||
|
getTestBed().initTestEnvironment(
|
||||||
|
BrowserDynamicTestingModule,
|
||||||
|
platformBrowserDynamicTesting()
|
||||||
|
);
|
||||||
|
// Then we find all the tests.
|
||||||
|
const context = require.context('./', true, /\.spec\.ts$/);
|
||||||
|
// And load the modules.
|
||||||
|
context.keys().map(context);
|
15
ui/hv2-ui/tsconfig.app.json
Normal file
15
ui/hv2-ui/tsconfig.app.json
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "./out-tsc/app",
|
||||||
|
"types": []
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/main.ts",
|
||||||
|
"src/polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
20
ui/hv2-ui/tsconfig.json
Normal file
20
ui/hv2-ui/tsconfig.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"compileOnSave": false,
|
||||||
|
"compilerOptions": {
|
||||||
|
"baseUrl": "./",
|
||||||
|
"outDir": "./dist/out-tsc",
|
||||||
|
"sourceMap": true,
|
||||||
|
"declaration": false,
|
||||||
|
"downlevelIteration": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"importHelpers": true,
|
||||||
|
"target": "es2015",
|
||||||
|
"module": "es2020",
|
||||||
|
"lib": [
|
||||||
|
"es2018",
|
||||||
|
"dom"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
18
ui/hv2-ui/tsconfig.spec.json
Normal file
18
ui/hv2-ui/tsconfig.spec.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "./out-tsc/spec",
|
||||||
|
"types": [
|
||||||
|
"jasmine"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/test.ts",
|
||||||
|
"src/polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.spec.ts",
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
152
ui/hv2-ui/tslint.json
Normal file
152
ui/hv2-ui/tslint.json
Normal file
@ -0,0 +1,152 @@
|
|||||||
|
{
|
||||||
|
"extends": "tslint:recommended",
|
||||||
|
"rulesDirectory": [
|
||||||
|
"codelyzer"
|
||||||
|
],
|
||||||
|
"rules": {
|
||||||
|
"align": {
|
||||||
|
"options": [
|
||||||
|
"parameters",
|
||||||
|
"statements"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"array-type": false,
|
||||||
|
"arrow-return-shorthand": true,
|
||||||
|
"curly": true,
|
||||||
|
"deprecation": {
|
||||||
|
"severity": "warning"
|
||||||
|
},
|
||||||
|
"eofline": true,
|
||||||
|
"import-blacklist": [
|
||||||
|
true,
|
||||||
|
"rxjs/Rx"
|
||||||
|
],
|
||||||
|
"import-spacing": true,
|
||||||
|
"indent": {
|
||||||
|
"options": [
|
||||||
|
"spaces"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"max-classes-per-file": false,
|
||||||
|
"max-line-length": [
|
||||||
|
true,
|
||||||
|
140
|
||||||
|
],
|
||||||
|
"member-ordering": [
|
||||||
|
true,
|
||||||
|
{
|
||||||
|
"order": [
|
||||||
|
"static-field",
|
||||||
|
"instance-field",
|
||||||
|
"static-method",
|
||||||
|
"instance-method"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"no-console": [
|
||||||
|
true,
|
||||||
|
"debug",
|
||||||
|
"info",
|
||||||
|
"time",
|
||||||
|
"timeEnd",
|
||||||
|
"trace"
|
||||||
|
],
|
||||||
|
"no-empty": false,
|
||||||
|
"no-inferrable-types": [
|
||||||
|
true,
|
||||||
|
"ignore-params"
|
||||||
|
],
|
||||||
|
"no-non-null-assertion": true,
|
||||||
|
"no-redundant-jsdoc": true,
|
||||||
|
"no-switch-case-fall-through": true,
|
||||||
|
"no-var-requires": false,
|
||||||
|
"object-literal-key-quotes": [
|
||||||
|
true,
|
||||||
|
"as-needed"
|
||||||
|
],
|
||||||
|
"quotemark": [
|
||||||
|
true,
|
||||||
|
"single"
|
||||||
|
],
|
||||||
|
"semicolon": {
|
||||||
|
"options": [
|
||||||
|
"always"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"space-before-function-paren": {
|
||||||
|
"options": {
|
||||||
|
"anonymous": "never",
|
||||||
|
"asyncArrow": "always",
|
||||||
|
"constructor": "never",
|
||||||
|
"method": "never",
|
||||||
|
"named": "never"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"typedef": [
|
||||||
|
true,
|
||||||
|
"call-signature"
|
||||||
|
],
|
||||||
|
"typedef-whitespace": {
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"call-signature": "nospace",
|
||||||
|
"index-signature": "nospace",
|
||||||
|
"parameter": "nospace",
|
||||||
|
"property-declaration": "nospace",
|
||||||
|
"variable-declaration": "nospace"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"call-signature": "onespace",
|
||||||
|
"index-signature": "onespace",
|
||||||
|
"parameter": "onespace",
|
||||||
|
"property-declaration": "onespace",
|
||||||
|
"variable-declaration": "onespace"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"variable-name": {
|
||||||
|
"options": [
|
||||||
|
"ban-keywords",
|
||||||
|
"check-format",
|
||||||
|
"allow-pascal-case"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"whitespace": {
|
||||||
|
"options": [
|
||||||
|
"check-branch",
|
||||||
|
"check-decl",
|
||||||
|
"check-operator",
|
||||||
|
"check-separator",
|
||||||
|
"check-type",
|
||||||
|
"check-typecast"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"component-class-suffix": true,
|
||||||
|
"contextual-lifecycle": true,
|
||||||
|
"directive-class-suffix": true,
|
||||||
|
"no-conflicting-lifecycle": true,
|
||||||
|
"no-host-metadata-property": true,
|
||||||
|
"no-input-rename": true,
|
||||||
|
"no-inputs-metadata-property": true,
|
||||||
|
"no-output-native": true,
|
||||||
|
"no-output-on-prefix": true,
|
||||||
|
"no-output-rename": true,
|
||||||
|
"no-outputs-metadata-property": true,
|
||||||
|
"template-banana-in-box": true,
|
||||||
|
"template-no-negated-async": true,
|
||||||
|
"use-lifecycle-interface": true,
|
||||||
|
"use-pipe-transform-interface": true,
|
||||||
|
"directive-selector": [
|
||||||
|
true,
|
||||||
|
"attribute",
|
||||||
|
"app",
|
||||||
|
"camelCase"
|
||||||
|
],
|
||||||
|
"component-selector": [
|
||||||
|
true,
|
||||||
|
"element",
|
||||||
|
"app",
|
||||||
|
"kebab-case"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user