Skip to content

Commit

Permalink
Merge pull request #28 from samply/release-1.0.0
Browse files Browse the repository at this point in the history
Release 1.0.0
  • Loading branch information
djuarezgf authored Dec 13, 2023
2 parents 770b48d + 868664d commit 7c8932c
Show file tree
Hide file tree
Showing 185 changed files with 35,615 additions and 4,193 deletions.
16 changes: 0 additions & 16 deletions .browserslistrc

This file was deleted.

21 changes: 21 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
### Example user template template
### Example user template

# IntelliJ project files
.idea
.angular
.github
.vscode
*.iml
out
gen
### Example user template template
### Example user template

# IntelliJ project files
.idea
*.iml
out
gen
dist
node_modules
26 changes: 26 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Docker CI

on:
push:
branches:
- main
- develop
# Build then a new version is tagged
tags:
- '*.*.*'
pull_request:
branches:
- main
- develop
schedule:
# Build every night at 1am
- cron: '0 1 * * *'
jobs:
build:
uses: samply/github-workflows/.github/workflows/docker-ci.yml@main
with:
# The Docker Hub Repository you want eventually push to, e.g samply/share-client
image-name: "samply/teiler-dashboard"
secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,11 @@ testem.log
# System files
.DS_Store
Thumbs.db
### Example user template template
### Example user template

# IntelliJ project files
.idea
*.iml
out
gen
78 changes: 78 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.0] - 2023-11-14
### Added
- Init project
- Prototype
- Docker
- Environment variables
- i18n
- environment variables config
- remove nngm
- Adapt to teiler-core Teiler App
- Teiler Core Client
- Route Manager Service
- Single Spa
- TeilerApp Plugin Orchestrator
- external link
- Sort teiler apps
- Keycloak
- Keycloak environment variables
- donwload to configuration component
- Teiler-Box
- reachable frontend and backend
- Separate local from central components
- Teiler Welcome Component
- Quality Report Mockup
- Function Tests
- Event Log
- TeilerEnvironment
- Revert "TeilerEnvironment"
- TeilerEnvironment
- Call env.js in root-config (fix integration with single-spa)
- Only one server pro instance instead pro language for teiler ui and teiler apps.
- environment variables to docker-compose template
- Multi-language
- language selector
- Improve Quality Report UI
- Improve Function Tests UI
- Improve Event Log UI
- Uploads Teiler App
- Inquiries Teiler App
- Archived, Failed and Active Inquiries
- Inquiry
- Inquiry Sarkome Mock-Up
- Generate router link from window.location.pathname instead of router
- Excel export from teiler
- CSV export from teiler
- Docker ignore
- Is export ready
- Dockerignore
- Gitignore
- Default template variable for exporter and reporter
- Central Keycloak configuration based on groups
- KEYCLOAK_TOKEN_GROUP

## Fixed
- Update teiler apps in sidebar
- Login to main site
- i18n
- space after welcome
- Redirect to main if router link not found
- Copy Assets env.js in Docker
- Reporter Cors
- TEILER_USER and TEILER_ADMIN as default values for docker

## CHANGED
- Check for both frontend and backend
- Name: Bridgehead instead of Teiler
- Update Libraries for Keycloak 20
- Update all libraries
- Add http relative path (compatible with traefik)
- Rename developer to develop
- Rename: Teiler Dashboard
- Rename: Teiler Orchestrator and Teiler Dashboard
32 changes: 32 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 1st Stage: Build project
FROM node:alpine AS build
WORKDIR /app
COPY package.json package-lock.json ./
RUN npm install
COPY . .
RUN npm run build

# 2nd Stage: Create nginx image with built project
FROM nginx:alpine

### Install bash
RUN apk update
RUN apk upgrade
RUN apk add bash

### Configuration of NGINX
COPY docker/nginx.conf /etc/nginx/nginx.template.conf

EXPOSE 80

WORKDIR /usr/share/nginx/html

### Copy project from node image to nginx image
COPY --from=build /app/dist/teiler-dashboard .
COPY docker/env.template.js ./assets/
ADD docker/start.sh /samply/
RUN chmod +x /samply/start.sh

ENV EXAMPLE=[]

CMD ["/samply/start.sh"]
42 changes: 41 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TeilerUi
# MyAngularTest

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.1.0.

Expand All @@ -10,6 +10,30 @@ Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The appli

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`.

## Generate an embedded app

Run `python create-embedded-app.py [parameters]` to automatically perform all steps needed to integrate an embedded app into the Teiler-Dashboard.
There are 3 ways to specify the parameters:
- by using the CLI arguments (explained below)
- interactively during the runtime
- both combined

By default, if a parameter is not specified in the CLI a prompt will be created during the runtime.
For required parameters this prompt repeats until an acceptable input is given.
This interactive mode can be turned off by using the `-i` argument, in which case parameters can only be given in the CLI.
- `-n <string>`: The name of the embedded app (required).
- `-t <string>`: The title of the embedded app (default: "").
- `-r <string>`: Roles of the embedded app (default: PUBLIC, choices: PUBLIC, USER, ADMIN). Multiple arguments can be specified here. Example: `-r PUBLIC USER ADMIN`
- `-d <string>`: Description of the embedded app (default: "").<br />
- The app requires an icon, which can **either** be specified by the name of the icon class
- `-ic <string>`: Icon class of the embedded app.

or by the URL of the icon source
- `-is <string>`: URL of the icon for the embedded app.

Exactly one of those must be specified. The other one will default to `undefined`.
- `-i`: Turns off the interactive mode.

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
Expand All @@ -25,3 +49,19 @@ Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To u
## 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.

## Docker
docker build -t teiler-dashboard .
docker run teiler-dashboard -p 8085:80

# Docker-compose
docker-compose build
docker-compose up

# Deploy Development for default language
ng serve --configuration=development

# For developers:
## Internationalization
`ng extract-i18n --output-path src/i18n --format=xlf2`
After that: Compare messages.en.xlf with the new messages.xlf: Update and add new entries
67 changes: 48 additions & 19 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,57 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"teiler-ui": {
"teiler-dashboard": {
"projectType": "application",
"schematics": {},
"root": "",
"i18n": {
"sourceLocale": "de",
"locales": {
"en": "src/i18n/messages.en.xlf"
}
},
"sourceRoot": "src",
"prefix": "app",
"prefix": "samply",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"outputPath": "dist/teiler-ui",
"outputPath": "dist/teiler-dashboard",
"index": "src/index.html",
"main": "src/main.ts",
"main": "src/main.single-spa.ts",
"localize": true,
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
"./src/styles.css",
"./src/global-styles/form-styles.css"
],
"scripts": []
"scripts": [],
"customWebpackConfig": {
"path": "extra-webpack.config.js",
"libraryName": "teiler-dashboard",
"libraryTarget": "umd"
},
"baseHref": "http://localhost:4200/"
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumWarning": "11mb",
"maximumError": "15mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
"maximumWarning": "11mb",
"maximumError": "15mb"
}
],
"fileReplacements": [
Expand All @@ -47,35 +62,47 @@
"with": "src/environments/environment.prod.ts"
}
],
"outputHashing": "all"
"outputHashing": "none"
},
"development": {
"localize": ["de"],
"baseHref": "/de/",
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"namedChunks": true,
"outputHashing": "none"
},
"en": {
"localize": ["en"],
"baseHref": "/en/",
"outputHashing": "none"
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"configurations": {
"production": {
"browserTarget": "teiler-ui:build:production"
"browserTarget": "teiler-dashboard:build:production"
},
"development": {
"browserTarget": "teiler-ui:build:development"
"browserTarget": "teiler-dashboard:build:development"
},
"en": {
"browserTarget": "teiler-dashboard:build:en"
}

},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "teiler-ui:build"
"browserTarget": "teiler-dashboard:build"
}
},
"test": {
Expand All @@ -90,7 +117,9 @@
"src/assets"
],
"styles": [
"src/styles.css"
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
"./src/styles.css",
"./src/global-styles/form-styles.css"
],
"scripts": []
}
Expand All @@ -99,6 +128,6 @@
}
},
"cli": {
"analytics": "91b953dc-9f8e-4294-b538-89c4703d02aa"
"analytics": "55388b7c-70ad-4126-9de4-b2bd4975c8d2"
}
}
Loading

0 comments on commit 7c8932c

Please sign in to comment.