diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index 5656d5c..f83c266 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -21,7 +21,7 @@ jobs: cache: pnpm - name: Install packages - run: pnpm install --frozen-lockfile + run: pnpm install --no-frozen-lockfile - name: Run relay run: mkdir -p ./__generated__ && pnpm run relay @@ -49,7 +49,7 @@ jobs: cache: pnpm - name: Install packages - run: pnpm install --frozen-lockfile + run: pnpm install --no-frozen-lockfile - name: Run prettier run: pnpm run check-format diff --git a/Dockerfile b/Dockerfile index 560dcf7..7a0ed14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache libc6-compat WORKDIR /app COPY package.json pnpm-lock.yaml* ./ -RUN yarn global add pnpm@latest-8 && pnpm i --frozen-lockfile +RUN yarn global add pnpm && pnpm i --no-frozen-lockfile # Rebuild the source code only when needed @@ -18,7 +18,7 @@ COPY . . ENV NEXT_TELEMETRY_DISABLED 1 ARG NEXT_PUBLIC_BACKEND_URL="/graphql" ARG NEXT_PUBLIC_OAUTH_REDIRECT_URL="https://orange.informatik.uni-stuttgart.de" -ARG NEXT_PUBLIC_OAUTH_CLIENT_ID="gits-frontend" +ARG NEXT_PUBLIC_OAUTH_CLIENT_ID="frontend" ARG NEXT_PUBLIC_OAUTH_AUTHORITY="https://orange.informatik.uni-stuttgart.de/keycloak/realms/GITS" RUN yarn global add pnpm@latest-8 \ diff --git a/app/layout.tsx b/app/layout.tsx index d8bfde6..7920330 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -31,7 +31,7 @@ dayjs.extend(isBetween); const oidcConfig: AuthProviderProps = { redirect_uri: process.env.NEXT_PUBLIC_OAUTH_REDIRECT_URL ?? "http://localhost:3005", - client_id: process.env.NEXT_PUBLIC_OAUTH_CLIENT_ID ?? "gits-frontend", + client_id: process.env.NEXT_PUBLIC_OAUTH_CLIENT_ID ?? "frontend", authority: process.env.NEXT_PUBLIC_OAUTH_AUTHORITY ?? "http://localhost:9009/realms/GITS", diff --git a/docker-compose.yml b/docker-compose.yml index 10b3207..03a7e26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,14 @@ version: "3.7" services: - gits-frontend: + frontend: build: - context: ./../gits-frontend + context: ./../frontend dockerfile: Dockerfile args: NEXT_PUBLIC_BACKEND_URL: "http://localhost:8080/graphql" NEXT_PUBLIC_OAUTH_REDIRECT_URL: "http://localhost:3005" - NEXT_PUBLIC_OAUTH_CLIENT_ID: "gits-frontend" + NEXT_PUBLIC_OAUTH_CLIENT_ID: "frontend" NEXT_PUBLIC_OAUTH_AUTHORITY: "http://localhost:9009/realms/GITS" ports: - "3005:3000" @@ -23,5 +23,5 @@ services: command: start-dev --import-realm volumes: - type: bind - source: ./../gits-frontend/keycloak-realm + source: ./../frontend/keycloak-realm target: /opt/keycloak/data/import diff --git a/keycloak-realm/GITS-realm.json b/keycloak-realm/GITS-realm.json index d7b8318..8f70035 100644 --- a/keycloak-realm/GITS-realm.json +++ b/keycloak-realm/GITS-realm.json @@ -289,7 +289,7 @@ ], "security-admin-console": [], "admin-cli": [], - "gits-frontend": [], + "frontend": [], "account-console": [], "broker": [ { @@ -622,7 +622,7 @@ }, { "id": "e08162a0-a822-4b1a-8951-abc0f1d2c63a", - "clientId": "gits-frontend", + "clientId": "frontend", "name": "", "description": "", "rootUrl": "", diff --git a/package.json b/package.json index 417b2fa..b79725d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "gits-frontend", + "name": "frontend", "version": "0.1.0", "private": true, "scripts": {