Skip to content

Commit

Permalink
Merge branch 'main' into cr-4534/yellow-contrast
Browse files Browse the repository at this point in the history
  • Loading branch information
Resaki1 authored Jan 27, 2025
2 parents 7aff5e2 + 989f4f9 commit 51ec3e8
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 8 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/sonarqube.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Build
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
sonarqube:
name: SonarQube
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: SonarQube Scan
uses: SonarSource/sonarqube-scan-action@v4
with:
args: >
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: SonarQube Quality Gate
uses: SonarSource/sonarqube-quality-gate-action@v1
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"url": "https://github.com/inovex/scrumlr.io/issues",
"email": "info@scrumlr.io"
},
"version": "3.10.2",
"version": "3.10.3",
"private": true,
"license": "MIT",
"dependencies": {
Expand Down Expand Up @@ -61,7 +61,7 @@
"@types/i18next-fs-backend": "^1.1.5",
"@types/jest": "^29.5.14",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.10.7",
"@types/node": "^22.10.9",
"@types/qrcode.react": "^3.0.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
Expand Down
15 changes: 15 additions & 0 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
sonar.projectKey=scrumlr_scrumlr
sonar.organization=scrumlr

# This is the name and version displayed in the SonarCloud UI.
#sonar.projectName=scrumlr
#sonar.projectVersion=1.0


# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
#sonar.sources=.

# Encoding of the source code. Default is default system encoding
#sonar.sourceEncoding=UTF-8

sonar.typescript.tsconfigPath=tsconfig.json
4 changes: 2 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, {Suspense} from "react";
import {createRoot} from "react-dom/client";
import {Provider} from "react-redux";
import Clarity from "@microsoft/clarity";
import "index.scss";
import {CookieNotice} from "components/CookieNotice";
import {store} from "store";
Expand Down Expand Up @@ -51,7 +50,8 @@ const root = createRoot(document.getElementById("root") as HTMLDivElement);

// If clarity ID is set and not empty in env variables, initialize Clarity
if (CLARITY_ID && CLARITY_ID !== "") {
Clarity.init(CLARITY_ID);
// TODO: tracking, including storing data using third party services has to be explicitly opt in!
// Clarity.init(CLARITY_ID);
}

root.render(
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2478,10 +2478,10 @@
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==

"@types/node@*", "@types/node@^22.10.7":
version "22.10.7"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.7.tgz#14a1ca33fd0ebdd9d63593ed8d3fbc882a6d28d7"
integrity sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==
"@types/node@*", "@types/node@^22.10.9":
version "22.10.9"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.9.tgz#b62b5e8485b9b412262466209280405525320108"
integrity sha512-Ir6hwgsKyNESl/gLOcEz3krR4CBGgliDqBQ2ma4wIhEx0w+xnoeTq3tdrNw15kU3SxogDjOgv9sqdtLW8mIHaw==
dependencies:
undici-types "~6.20.0"

Expand Down

0 comments on commit 51ec3e8

Please sign in to comment.