Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • cf2023-euro
  • cf2023-offline
  • cf2024
  • cf2025
  • main
5 results

Target

Select target project
No results found
Select Git revision
  • master
1 result
Show changes
87 files
+ 23427
14089
Compare changes
  • Side-by-side
  • Inline

Files

+4 −3
Original line number Diff line number Diff line
REACT_APP_STYLEGUIDE_URL=http://localhost:3001
REACT_APP_API_BASE_URL=https://cf2021.pirati.cz/api
REACT_APP_WS_BASE_URL=wss://cf2021.pirati.cz/ws
REACT_APP_STYLEGUIDE_URL=https://styleguide.pirati.cz/2.11.0
REACT_APP_API_BASE_URL=https://cf2024.online/api
REACT_APP_MATOMO_ID=135
REACT_APP_SENTRY_DSN=https://aa80453ff4d54b9a9c1b49e79060498a@sentry.pirati.cz/14

.env.development

0 → 100644
+1 −0
Original line number Diff line number Diff line
REACT_APP_STYLEGUIDE_URL=http://localhost:3001
+8 −8
Original line number Diff line number Diff line
image: node:buster
image: node:18.20.4-bullseye

variables:
  SITE_NAME: cf2021.pirati.cz
  SITE_NAME: cf2024.online

  ARTIFACTS_PATH: build
  REACT_APP_STYLEGUIDE_URL: https://styleguide.pir-test.eu/latest
  API_URL: https://cf2021.pirati.cz/api
  REACT_APP_API_BASE_URL: /api
  WEBHOOK_URL: https://ha-web.pirati.cz

before_script:
@@ -13,11 +13,11 @@ before_script:
build:
  stage: build
  script:
    - npm install
    - npm install --legacy-peer-deps
    - npm run build
  after_script:
    - echo "{\"job_token\":\"$CI_JOB_TOKEN\", \"name\":\"$SITE_NAME\" }" > request.json
    - "curl -H 'Content-Type: application/json' -X POST -d @request.json $WEBHOOK_URL"
    - echo "{\"name\":\"$SITE_NAME\" }" > request.json
    - "curl -k -H 'Content-Type: application/json' -X POST -d @request.json $WEBHOOK_URL"
  artifacts:
    expire_in: 30 min
    paths:
+1 −1
Original line number Diff line number Diff line
14.13
 No newline at end of file
18.20.4
+7 −6
Original line number Diff line number Diff line
FROM node:14.13-alpine3.12 as build
FROM node:18.20.4-alpine AS build

ARG BUILD_REACT_APP_STYLEGUIDE_URL

ENV REACT_APP_STYLEGUIDE_URL=${BUILD_REACT_APP_STYLEGUIDE_URL}
ENV REACT_APP_STYLEGUIDE_URL="https://styleguide.pirati.cz/2.12.1"
ENV REACT_APP_API_BASE_URL=https://cf2024.online/api
ENV REACT_APP_MATOMO_ID=135
ENV REACT_APP_SENTRY_DSN=https://aa80453ff4d54b9a9c1b49e79060498a@sentry.pirati.cz/14

RUN mkdir -p /home/node/cf2021

@@ -10,7 +11,7 @@ WORKDIR /home/node/cf2021

COPY package*.json ./

RUN npm ci
RUN npm ci --legacy-peer-deps

COPY . .

@@ -18,7 +19,7 @@ RUN npm run build

# ---

FROM nginx:alpine as production
FROM nginx:alpine AS production

COPY --from=build /home/node/cf2021/build /usr/share/nginx/html/
COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
Original line number Diff line number Diff line
FROM node:14.13-alpine3.12
FROM node:18.20.4-alpine

#  libs for development -- most of theme needed for canvas support in tests
RUN apk add --no-cache \
@@ -17,7 +17,7 @@ WORKDIR /app/cf2021

COPY package*.json ./

RUN npm ci
RUN npm ci --legacy-peer-deps

COPY . .

compose.yaml

0 → 100644
+6 −0
Original line number Diff line number Diff line
services:
  app:
    image: cf-online
    ports:
      - "3000:80"

eslint.config.mjs

0 → 100644
+67 −0
Original line number Diff line number Diff line
import { fixupConfigRules, fixupPluginRules } from "@eslint/compat";
import { FlatCompat } from "@eslint/eslintrc";
import js from "@eslint/js";
import jestDom from "eslint-plugin-jest-dom";
import simpleImportSort from "eslint-plugin-simple-import-sort";
import testingLibrary from "eslint-plugin-testing-library";
import path from "node:path";
import { fileURLToPath } from "node:url";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
  baseDirectory: __dirname,
  recommendedConfig: js.configs.recommended,
  allConfig: js.configs.all,
});

const eslintConfig = [
  ...fixupConfigRules(
    compat.extends(
      "react-app",
      "plugin:prettier/recommended",
      "plugin:testing-library/dom",
      "plugin:jest-dom/recommended",
    ),
  ),
  {
    plugins: {
      "simple-import-sort": simpleImportSort,
      "testing-library": fixupPluginRules(testingLibrary),
      "jest-dom": fixupPluginRules(jestDom),
    },

    rules: {
      "sort-imports": "off",
      "prettier/prettier": "warn",
      "react/no-unknown-property": [1],

      "simple-import-sort/imports": [
        "warn",
        {
          groups: [
            ["^react", "^@?\\w"],
            [
              "^(api|actions|config|hooks|components|containers|pages|utils|stores|keycloak|markdown|ws)(/.*|$)",
            ],
            ["^(test-utils)(/.*|$)"],
            ["^\\u0000"],
            ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
            ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
            ["^.+\\.s?css$"],
          ],
        },
      ],

      "testing-library/await-async-queries": "error",
      "testing-library/no-await-sync-queries": "error",
      "testing-library/no-debugging-utils": "warn",
      "jest-dom/prefer-checked": "error",
      "jest-dom/prefer-enabled-disabled": "error",
      "jest-dom/prefer-required": "error",
      "jest-dom/prefer-to-have-attribute": "error",
    },
  },
];

export default eslintConfig;
+19983 −12891

File changed.

Preview size limit exceeded, changes collapsed.