Skip to content

Commit a8a3f91

Browse files
milofrankemilofranke
authored
Merge pull request #61 from mnestix/dev
Version 1.1.0
2 parents 73966fd + 32db260 commit a8a3f91

File tree

147 files changed

+7496
-2547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+7496
-2547
lines changed

‎.env.example

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
AD_CLIENT_ID: '<<Azure client ID>>'
2-
AD_TENANT_ID: '<<Azure tenant ID>>'
3-
MNESTIX_BACKEND_API_KEY: '<<YOUR_API_KEY>>'
1+
AD_SECRET_VALUE: '<<YOUR_SECRET>>'
2+
MNESTIX_BACKEND_API_KEY: '<<YOUR_API_KEY>>'
3+
NEXTAUTH_SECRET: '<<YOUR_SECRET>>'

‎.env.local

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
APPLICATION_ID_URI: 'api://mnestix-test-web-api/'
22
LOCK_TIMESERIES_PERIOD_FEATURE_FLAG: true
3-
AUTHENTICATION_FEATURE_FLAG: true
43
COMPARISON_FEATURE_FLAG: true
54
AAS_LIST_FEATURE_FLAG: true
65
AAS_REPO_API_URL: 'http://localhost:5064/repo'
76
MNESTIX_BACKEND_API_URL: 'http://localhost:5064'
87
DISCOVERY_API_URL: 'http://localhost:5064/discovery'
98
REGISTRY_API_URL: 'http://localhost:8083'
109
THEME_LOGO_MIME_TYPE: 'image/svg+xml'
11-
THEME_PRIMARY_COLOR: '#0d4453'
10+
THEME_PRIMARY_COLOR: '#005962'
1211
THEME_SECONDARY_COLOR: '#147f8a'
13-
THEME_LOGO_URL: https://xitaso.com/wp-content/uploads/XITASO-Logo-quer.svg
12+
THEME_LOGO_URL:
13+
14+
AUTHENTICATION_FEATURE_FLAG: true
15+
AD_CLIENT_ID: 'c8fa36e4-a260-40b2-9298-8279bbd872e8'
16+
AD_TENANT_ID: '6c4ccecf-2dd4-4241-b7fc-6e95b32dcfac'
17+
18+
KEYCLOAK_ENABLED: false
19+
KEYCLOAK_CLIENT_ID: "mnestix-browser-client-demo"
20+
KEYCLOAK_LOCAL_URL: ""
21+
KEYCLOAK_REALM: "BaSyx"
22+
KEYCLOAK_ISSUER: "http://localhost:8080"
23+
NEXTAUTH_URL: http://localhost:3000

‎.github/workflows/autoAddReviewer.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Auto Add Reviewer
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Add Reviewers
12+
uses: madrapps/add-reviewers@v1
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
reviewers: GailMelanie,hofermo,JonathanXITASO,pawel-baran-se,XAlinaGS,Xmilofranke,NilsXitaso

‎.github/workflows/docker-build.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,40 @@ name: Docker
22

33
on:
44
push:
5-
branches: [ "**" ]
6-
tags: [ 'v*.*.*' ]
5+
branches: ['**']
6+
tags: ['v*.*.*']
77
pull_request:
8-
branches: [ "**" ]
8+
branches: ['**']
99

1010
env:
1111
# github.repository as <account>/<repo>
1212
IMAGE_NAME: mnestix-browser
1313
IMAGE_TAG: latest
1414
# Update the version manually
15-
IMAGE_TAG_VERSION: 1.0.0
16-
AD_CLIENT_ID: ${{ secrets.AD_CLIENT_ID }}
17-
AD_TENANT_ID: ${{ secrets.AD_TENANT_ID }}
15+
IMAGE_TAG_VERSION: 1.1.0
16+
AD_CLIENT_ID: ${{ secrets.AD_CLIENT_ID }}
17+
AD_TENANT_ID: ${{ secrets.AD_TENANT_ID }}
1818
REGISTRY_USER: ${{ vars.REGISTRY_USER }}
1919
REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
2020
AZURE_REGISTRY_PASS: ${{ secrets.AZURE_REGISTRY_PASS }}
2121
AZURE_REGISTRY_USER: ${{ vars.AZURE_REGISTRY_USER }}
22-
22+
2323
jobs:
2424
default:
2525
name: build, test and push image
2626
runs-on: ubuntu-latest
2727
permissions:
2828
contents: read
2929
packages: write
30-
31-
steps:
30+
31+
steps:
3232
- name: Extract branch name
3333
id: extract_branch
3434
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
3535

3636
- name: Checkout repository
3737
uses: actions/checkout@v4
38-
38+
3939
# Login against a Docker registry except on PR
4040
# https://github.com/docker/login-action
4141
- name: Log into docker hub
@@ -44,40 +44,40 @@ jobs:
4444
with:
4545
username: ${{ env.REGISTRY_USER }}
4646
password: ${{ env.REGISTRY_PASS }}
47-
47+
4848
# Build Docker image
4949
- name: Build image
5050
id: build
51-
run: docker compose -f docker-compose/compose.yml build mnestix-frontend
52-
51+
run: docker compose build mnestix-browser
52+
5353
- name: E2E test
54-
id: test
55-
run: docker compose -f docker-compose/common-services.yml pull &&
56-
docker compose -f docker-compose/compose.test.yml down &&
57-
docker compose -f docker-compose/compose.test.yml up -d &&
58-
docker compose -f docker-compose/compose.test.yml attach cypress-test
59-
54+
id: test
55+
run: docker compose -f compose.yml -f docker-compose/compose.test.yml --profile tests pull &&
56+
docker compose -f compose.yml -f docker-compose/compose.test.yml --profile tests down &&
57+
docker compose -f compose.yml -f docker-compose/compose.test.yml --profile tests up -d &&
58+
docker compose -f compose.yml -f docker-compose/compose.test.yml attach cypress-test
59+
6060
- name: E2E test collect artifact
6161
id: test_artifact
62+
if: always()
6263
uses: actions/upload-artifact@master
63-
with:
64+
with:
6465
name: cypress-artifacts
6566
path: cypress-artifacts/
66-
67+
6768
- name: Push Image to Production
6869
id: push-prod
6970
if: github.ref == 'refs/heads/main'
7071
run: docker tag mnestix/$IMAGE_NAME mnestix/$IMAGE_NAME:$IMAGE_TAG &&
71-
docker tag mnestix/$IMAGE_NAME mnestix/$IMAGE_NAME:$IMAGE_TAG_VERSION &&
72-
docker push mnestix/$IMAGE_NAME:$IMAGE_TAG &&
73-
docker push mnestix/$IMAGE_NAME:$IMAGE_TAG_VERSION
72+
docker tag mnestix/$IMAGE_NAME mnestix/$IMAGE_NAME:$IMAGE_TAG_VERSION &&
73+
docker push mnestix/$IMAGE_NAME:$IMAGE_TAG &&
74+
docker push mnestix/$IMAGE_NAME:$IMAGE_TAG_VERSION
7475

7576
- name: Push Image to development
7677
id: push-dev
7778
if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging'
7879
env:
7980
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
8081
run: docker tag mnestix/$IMAGE_NAME mnestixcr.azurecr.io/$IMAGE_NAME:$BRANCH_NAME &&
81-
docker login -u $AZURE_REGISTRY_USER -p $AZURE_REGISTRY_PASS mnestixcr.azurecr.io &&
82-
docker push mnestixcr.azurecr.io/$IMAGE_NAME:$BRANCH_NAME
83-
82+
docker login -u $AZURE_REGISTRY_USER -p $AZURE_REGISTRY_PASS mnestixcr.azurecr.io &&
83+
docker push mnestixcr.azurecr.io/$IMAGE_NAME:$BRANCH_NAME

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ node_modules
66
cypress-artifacts
77
/.idea/.idea.mnestix-frontend.dir/.idea/
88
.env
9+
/cypress/videos/
10+
/cypress/screenshots/

‎.gitlab-ci.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
FROM node:18-alpine as base
1+
FROM node:18-alpine AS base
22

3-
FROM base as deps
3+
FROM base AS deps
44
WORKDIR /app
55
COPY package*.json yarn.lock* ./
66
RUN yarn install --frozen-lockfile --production
77

88
# Next.js collects completely anonymous telemetry data about general usage. Learn more here: https://nextjs.org/telemetry
99
# Comment the following line to enable telemetry at run time
10-
ENV NEXT_TELEMETRY_DISABLED 1
10+
ENV NEXT_TELEMETRY_DISABLED=1
1111

12-
FROM deps as builder
12+
FROM deps AS builder
1313
WORKDIR /app
1414
COPY . .
1515

1616
RUN yarn build
1717

18-
FROM base as production
18+
FROM base AS production
1919
WORKDIR /app
2020

2121
ENV NODE_ENV=production
@@ -35,8 +35,8 @@ COPY ./scripts scripts
3535
ENTRYPOINT [ "/bin/sh" ]
3636
CMD [ "/app/scripts/start.sh" ]
3737

38-
FROM deps as dev
38+
FROM deps AS dev
3939
ENV NODE_ENV=development
4040
COPY . .
4141

42-
CMD yarn dev
42+
CMD [ "yarn", "dev"]

0 commit comments

Comments
 (0)