Skip to content

Commit

Permalink
Dev to Stage (#75)
Browse files Browse the repository at this point in the history
* Fixed the login wrong credentials error msg

* remove conflict

* add show hide eye icon in login form,DR-734,DR-736

* merge aiswarya change

* add logout api to invalidate token and apiuser also login from usernam and pwd

* use old process login for all user and remove console

* removing client info in apiuser login and remove popup for copy

* fix bug DR-746 and work on DR_754 apiuser register process added new get access key api

* wrok on bugs DR-746 755 and 768

* dropdown organization listing fixed

* Backend url port changed

* removed all console log from all code (#30)

* removed all console log from all code

* removed console log from remaining code

* version change

* fix issue in apiuser register, removed herder in all auth service and remove comment lines

* Dr 758 777:Production frontend is running in developer mode (#34)

* fixed bug and added enableprodmode

* change backend url prot,in backend default port is 3040

* enable prod mode when env production is true

* removed unrelated changes in this story

* removeing unrelated thing from ralated story

* removeing unrelated thing from ralated story after review

* removeing unrelated thing from ralated story after commit review

* removeing unrelated thing from ralated story need  only in one file change

* make change only in main ts file

* removeing unrelated thing from ralated story after review and reset commit

* work on bug DR-758 (#39)

* delay redirect to login in apiuser resgister (#41)

* update version (#42)

* update version

* update new version

* fix apiuser register with new version (#43)

* Dr 754 api issue (#44)

* reviwe apiuser register issue to redirect to login

* reviwe apiuser register issue to redirect to login again

* update new version (#45)

* Form add reservation target capacity is now mandatory (#47)

* add popup message for download accesskey of apiuser (#48)

* expiry date field added in reservation detailspage (#49)

* Bump version change (#50)

* expiry date field added in reservation detailspage

* version upgrade

* New versionbupm (#51)

* added new version bump

* added new version bump with register componenet change

* removing client info from header in forgot password form and reset password form (#55)

* new version bump (#56)

* fixed permission deselect after row deselecet issue (#59)

* DR-781 Fixed the expiry date saved as end date of reservation (#58)

* expiry date field added in reservation detailspage

* Fixed the expiry date saved as end date of reservation

* updated new version (#60)

* DR-805 Add Organization: Error message fixed when request for existing email (#62)

* expiry date field added in reservation detailspage

* Add Organization: Error message fixed when request for existing email

* versionBump Version Upgrade (#63)

* expiry date field added in reservation detailspage

* VersionBump

* Add `prettier` and `eslint`

* Add Github Actions

* removing @tsignore script in all pages (#68)

* Apply `prettier` to repo

* Enable strict Prettier CI

* Add `.git-blame-ignore-revs`

* DR-804:commit remaining one file of typescript code (#71)

* commit remaining one file of typescript code

* fix prettier

* fix prettier error issue

* Add more linters

* Fix `yamllint`

* Update `.prettierrc`

* Fix `markdownlint`

* Update `.editorconfig`

* Remove accidentally commited file

* remove eslint error in all component pages (#73)

* remove eslint error in all component pages

* fixed prettier issue

* Version bump.1 (#70)

* expiry date field added in reservation detailspage

* version upgraded

* Enable ESlint Error check

* Stage Backport to Dev => Stage Update (#52)  (#76)

* Stage Update (#52)

* Fixed the login wrong credentials error msg

* remove conflict

* add show hide eye icon in login form,DR-734,DR-736

* merge aiswarya change

* add logout api to invalidate token and apiuser also login from usernam and pwd

* use old process login for all user and remove console

* removing client info in apiuser login and remove popup for copy

* fix bug DR-746 and work on DR_754 apiuser register process added new get access key api

* wrok on bugs DR-746 755 and 768

* dropdown organization listing fixed

* Backend url port changed

* removed all console log from all code (#30)

* removed all console log from all code

* removed console log from remaining code

* version change

* fix issue in apiuser register, removed herder in all auth service and remove comment lines

* Dr 758 777:Production frontend is running in developer mode (#34)

* fixed bug and added enableprodmode

* change backend url prot,in backend default port is 3040

* enable prod mode when env production is true

* removed unrelated changes in this story

* removeing unrelated thing from ralated story

* removeing unrelated thing from ralated story after review

* removeing unrelated thing from ralated story after commit review

* removeing unrelated thing from ralated story need  only in one file change

* make change only in main ts file

* removeing unrelated thing from ralated story after review and reset commit

* work on bug DR-758 (#39)

* delay redirect to login in apiuser resgister (#41)

* update version (#42)

* update version

* update new version

* fix apiuser register with new version (#43)

* Dr 754 api issue (#44)

* reviwe apiuser register issue to redirect to login

* reviwe apiuser register issue to redirect to login again

* update new version (#45)

* Form add reservation target capacity is now mandatory (#47)

* add popup message for download accesskey of apiuser (#48)

* expiry date field added in reservation detailspage (#49)

* Bump version change (#50)

* expiry date field added in reservation detailspage

* version upgrade

* New versionbupm (#51)

* added new version bump

* added new version bump with register componenet change

* removing client info from header in forgot password form and reset password form (#55)

* new version bump (#56)

* fixed permission deselect after row deselecet issue (#59)

* DR-781 Fixed the expiry date saved as end date of reservation (#58)

* expiry date field added in reservation detailspage

* Fixed the expiry date saved as end date of reservation

* updated new version (#60)

* DR-805 Add Organization: Error message fixed when request for existing email (#62)

* expiry date field added in reservation detailspage

* Add Organization: Error message fixed when request for existing email

* versionBump Version Upgrade (#63)

* expiry date field added in reservation detailspage

* VersionBump

---------

Co-authored-by: Aish1990 <akumaravadivu@sweyainfotech.com>
Co-authored-by: Aish1990 <141120187+Aish1990@users.noreply.github.com>
Co-authored-by: Daniel Mohns <daniel.mohns@posteo.de>
Co-authored-by: Daniel Mohns <dmohns@users.noreply.github.com>

* Resolved conflicts

* prettier fix

---------

Co-authored-by: NamrataSweya <102014274+NamrataSweya@users.noreply.github.com>
Co-authored-by: Daniel Mohns <daniel.mohns@posteo.de>
Co-authored-by: Daniel Mohns <dmohns@users.noreply.github.com>

* Stage backport new (#77)

* add show hide eye icon in login form,DR-734,DR-736

* resolve the conflict in merge from dev to stage

* prettier fix

---------

Co-authored-by: Aish1990 <141120187+Aish1990@users.noreply.github.com>
Co-authored-by: Aish1990 <akumaravadivu@sweyainfotech.com>

* Stage backport new.1 (#78)

* add show hide eye icon in login form,DR-734,DR-736

* resolve the conflict in merge from dev to stage

* prettier fix

---------

Co-authored-by: NamrataSweya <102014274+NamrataSweya@users.noreply.github.com>

---------

Co-authored-by: NamrataSweya <102014274+NamrataSweya@users.noreply.github.com>
Co-authored-by: Daniel Mohns <daniel.mohns@posteo.de>
Co-authored-by: Daniel Mohns <dmohns@users.noreply.github.com>
  • Loading branch information
4 people authored May 28, 2024
1 parent 0bda159 commit b41f728
Show file tree
Hide file tree
Showing 166 changed files with 9,566 additions and 6,636 deletions.
16 changes: 3 additions & 13 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
# Editor configuration, see https://editorconfig.org
root = true
# EditorConfig is awesome: https://EditorConfig.org

[*]
# Ensure consistent file encoding in UNIX style
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
end_of_line = lf
25 changes: 25 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
],
root: true,
env: {
node: true,
jest: true,
},
rules: {
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
};
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Apply `prettier` to repo
370b95199370e17696c7e79a1c023f8126161578
40 changes: 40 additions & 0 deletions .github/workflows/check-generic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Generic checks to ease collaboration:
# - consistent file encoding in UNIX style
# - whitespaces in all purposes files like markdown, yaml, etc
name: Check Generic

on:
push:
branches:
- develop
pull_request:
branches:
- develop

jobs:
editorconfig-checker:
name: Run editorconfig-checker
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Run editorconfig-checker
run: docker run --rm --volume=$PWD:/check mstruebing/editorconfig-checker

markdownlint:
name: Run markdownlint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Run markdownlint-cli2
uses: DavidAnson/markdownlint-cli2-action@v13

yamllint:
name: Run yamllint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Run yamllint
run: yamllint .
64 changes: 64 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Code Quality

on:
push:
branches:
- develop
pull_request:
branches:
- develop

jobs:
lint-prettier:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/setup-node@v4
with:
node-version: lts/gallium

- name: Install drec-ui
run: npm install

- name: Run Prettier
run: npm run prettier

lint-eslint:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/setup-node@v4
with:
node-version: lts/gallium

- name: Install drec-ui
run: npm install

- name: Run ESLint (error)
run: npm run lint:error

- name: Run ESLint (all)
run: npm run lint

check-build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/setup-node@v4
with:
node-version: lts/gallium

- name: Install drec-ui
run: npm install

- name: Build drec-origin
run: npm run build
14 changes: 14 additions & 0 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Disable some built-in rules
config:
line-length: false
no-inline-html: false
first-line-h1: false
code-fence-style:
style: backtick

# Define glob expressions to use (only valid at root)
globs:
- "**/*.md"

# Ignore files that are not part of version control
gitignore: true
12 changes: 12 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"singleQuote": true,
"trailingComma": "all",
"overrides": [
{
"files": "*.{yaml,yml}",
"options": {
"singleQuote": false
}
}
]
}
18 changes: 18 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
extends: default

ignore-from-file:
- .gitignore
- .yamllintignore

rules:
document-start: disable
indentation:
spaces: 2
line-length: disable
quoted-strings:
quote-type: double
required: only-when-needed
allow-quoted-quotes: true
check-keys: true
truthy:
check-keys: false
1 change: 1 addition & 0 deletions .yamllintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm-lock.yaml
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# DRec UI CHANGELOG.md

## 0.0.1

- Dockerfile and buildspec.yml changes
- CICD testing
- CICD testing
70 changes: 35 additions & 35 deletions buildspec.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
version: 0.2
env:
parameter-store:
docker_username: /powertrust/docker/username
docker_password: /powertrust/docker/password
phases:
install:
# runtime-versions:
# nodejs: 18
# docker: 18
commands:
- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2 &
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
- curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
- chmod +x ./kubectl
- curl -Lo aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v0.5.9/aws-iam-authenticator_0.5.9_linux_amd64
- chmod +x ./aws-iam-authenticator
- export PATH=$PWD/:$PATH
pre_build:
commands:
- IMAGE="drec-ui"
- BUILD_NUMBER=$(cat version)
- aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin 895706603967.dkr.ecr.eu-west-1.amazonaws.com
- export KUBECONFIG=$HOME/.kube/config
build:
commands:
- echo $docker_password | docker login --username $docker_username --password-stdin
- docker build -t $IMAGE:$BUILD_NUMBER -f Dockerfile --build-arg build_environment=$environment .
- docker tag $IMAGE:$BUILD_NUMBER 895706603967.dkr.ecr.eu-west-1.amazonaws.com/$IMAGE:$environment-$BUILD_NUMBER
post_build:
commands:
- docker push 895706603967.dkr.ecr.eu-west-1.amazonaws.com/$IMAGE:$environment-$BUILD_NUMBER
- aws eks update-kubeconfig --name drec
- template=`cat "$IMAGE-$environment.yaml" | sed "s/{{BUILD_NUMBER}}/$environment-$BUILD_NUMBER/g"`
- echo "$template" | kubectl apply -f -
version: 0.2
env:
parameter-store:
docker_username: /powertrust/docker/username
docker_password: /powertrust/docker/password
phases:
install:
# runtime-versions:
# nodejs: 18
# docker: 18
commands:
- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2 &
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
- curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
- chmod +x ./kubectl
- curl -Lo aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v0.5.9/aws-iam-authenticator_0.5.9_linux_amd64
- chmod +x ./aws-iam-authenticator
- export PATH=$PWD/:$PATH
pre_build:
commands:
- IMAGE="drec-ui"
- BUILD_NUMBER=$(cat version)
- aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin 895706603967.dkr.ecr.eu-west-1.amazonaws.com
- export KUBECONFIG=$HOME/.kube/config
build:
commands:
- echo $docker_password | docker login --username $docker_username --password-stdin
- docker build -t $IMAGE:$BUILD_NUMBER -f Dockerfile --build-arg build_environment=$environment .
- docker tag $IMAGE:$BUILD_NUMBER 895706603967.dkr.ecr.eu-west-1.amazonaws.com/$IMAGE:$environment-$BUILD_NUMBER
post_build:
commands:
- docker push 895706603967.dkr.ecr.eu-west-1.amazonaws.com/$IMAGE:$environment-$BUILD_NUMBER
- aws eks update-kubeconfig --name drec
- template=`cat "$IMAGE-$environment.yaml" | sed "s/{{BUILD_NUMBER}}/$environment-$BUILD_NUMBER/g"`
- echo "$template" | kubectl apply -f -
18 changes: 9 additions & 9 deletions drec-ui-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ spec:
app.kubernetes.io/name: drec-ui
spec:
containers:
- image: 895706603967.dkr.ecr.eu-west-1.amazonaws.com/drec-ui:{{BUILD_NUMBER}}
imagePullPolicy: Always
name: drec-ui
envFrom:
- secretRef:
name: drec-dev-env
ports:
- containerPort: 80
- image: 895706603967.dkr.ecr.eu-west-1.amazonaws.com/drec-ui:{{BUILD_NUMBER}}
imagePullPolicy: Always
name: drec-ui
envFrom:
- secretRef:
name: drec-dev-env
ports:
- containerPort: 80
---
apiVersion: v1
kind: Service
Expand All @@ -35,4 +35,4 @@ spec:
protocol: TCP
type: NodePort
selector:
app.kubernetes.io/name: drec-ui
app.kubernetes.io/name: drec-ui
16 changes: 8 additions & 8 deletions drec-ui-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ spec:
app.kubernetes.io/name: drec-ui
spec:
containers:
- image: 895706603967.dkr.ecr.eu-west-1.amazonaws.com/drec-ui:{{BUILD_NUMBER}}
imagePullPolicy: Always
name: drec-ui
envFrom:
- secretRef:
name: drec-prod-env
ports:
- containerPort: 80
- image: 895706603967.dkr.ecr.eu-west-1.amazonaws.com/drec-ui:{{BUILD_NUMBER}}
imagePullPolicy: Always
name: drec-ui
envFrom:
- secretRef:
name: drec-prod-env
ports:
- containerPort: 80
---
apiVersion: v1
kind: Service
Expand Down
16 changes: 8 additions & 8 deletions drec-ui-stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ spec:
app.kubernetes.io/name: drec-ui
spec:
containers:
- image: 895706603967.dkr.ecr.eu-west-1.amazonaws.com/drec-ui:{{BUILD_NUMBER}}
imagePullPolicy: Always
name: drec-ui
envFrom:
- secretRef:
name: drec-stage-env
ports:
- containerPort: 80
- image: 895706603967.dkr.ecr.eu-west-1.amazonaws.com/drec-ui:{{BUILD_NUMBER}}
imagePullPolicy: Always
name: drec-ui
envFrom:
- secretRef:
name: drec-stage-env
ports:
- containerPort: 80
---
apiVersion: v1
kind: Service
Expand Down
Loading

0 comments on commit b41f728

Please sign in to comment.