Skip to content

Commit

Permalink
Merge pull request #108 from kbss-cvut/reformat-with-prettier
Browse files Browse the repository at this point in the history
[Upd] Reformat with prettier
  • Loading branch information
blcham authored Mar 2, 2024
2 parents fa117be + 4aa0627 commit 0586fcc
Show file tree
Hide file tree
Showing 186 changed files with 14,322 additions and 13,206 deletions.
33 changes: 18 additions & 15 deletions .docker/error.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta charset="utf-8" />
<title>
<!--# echo var="status" default="" --> <!--# echo var="status_text" default="Something goes wrong" -->
| SGoV Data Management
<!--# echo var="status" default="" --> <!--# echo var="status_text" default="Something goes wrong" --> | SGoV Data
Management
</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!--# if expr="$status = 502" -->
<meta http-equiv="refresh" content="2">
<meta http-equiv="refresh" content="2" />
<!--# endif -->
</head>
<style type="text/css">
body {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
color: #fff;
height: 100vh;
margin: 0;
Expand All @@ -24,12 +24,15 @@
justify-content: center;
}
</style>
<body>
<!--# if expr="$status = 502" -->
<h1>We are updating our website </h1>
<body>
<!--# if expr="$status = 502" -->
<h1>We are updating our website</h1>
<p>This is only for a few seconds, you will be redirected.</p>
<!--# else -->
<h1><!--# echo var="status" default="" --> <!--# echo var="status_text" default="Something goes wrong" --></h1>
<!--# endif -->
</body>
</html>
<!--# else -->
<h1>
<!--# echo var="status" default="" -->
<!--# echo var="status_text" default="Something goes wrong" -->
</h1>
<!--# endif -->
</body>
</html>
4 changes: 2 additions & 2 deletions .github/workflows/merge-to-protected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: CI
# events but only for the master branch
on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Publish Docker Image

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]
workflow_dispatch:
env:
# Last fragment of identifier of the docker image
Expand Down
39 changes: 17 additions & 22 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,28 @@
module.exports = {
"plugins": [
plugins: [
"lodash",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime",
"@babel/plugin-transform-nullish-coalescing-operator",
"@babel/plugin-transform-modules-commonjs"
"@babel/plugin-transform-modules-commonjs",
],
"presets": [
presets: [
[
"@babel/preset-env",
{
"modules": false,
"useBuiltIns": "usage",
"corejs": {
"version": 3,
"proposals": true
}
}
modules: false,
useBuiltIns: "usage",
corejs: {
version: 3,
proposals: true,
},
},
],
"@babel/preset-react"
"@babel/preset-react",
],
"env": {
"test": {
"presets": [
[
"@babel/preset-env"
],
"@babel/preset-react"
]
}
}
}
env: {
test: {
presets: [["@babel/preset-env"], "@babel/preset-react"],
},
},
};
6 changes: 2 additions & 4 deletions config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ export const getEnv = (name, defaultValue) => {
export const API_URL = getEnv("API_URL");
export const APP_TITLE = getEnv("APP_TITLE", "Record Manager");
export const LANGUAGE = getEnv("LANGUAGE", "en");
export const NAVIGATOR_LANGUAGE = JSON.parse(
getEnv("NAVIGATOR_LANGUAGE", "true")
);
export const NAVIGATOR_LANGUAGE = JSON.parse(getEnv("NAVIGATOR_LANGUAGE", "true"));
export const BASENAME = getEnv("BASENAME", "");
export const EXTENSIONS = getEnv("EXTENSIONS", "");
export const APP_INFO = getEnv("APP_INFO", "© KBSS at FEE CTU in Prague, 2024");
export const APP_INFO = getEnv("APP_INFO", "© KBSS at FEE CTU in Prague, 2024");
12 changes: 6 additions & 6 deletions deploy/internal-auth/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3.9'
version: "3.9"

# Provide access to record-manager-ui that runs locally in dev mode
x-access-for-local-development: &local-dev-env
cors.allowedOrigins: "http://localhost:4173,http://localhost:5173"
cors.allowedOrigins: "http://localhost:4173,http://localhost:5173"

services:
nginx:
Expand Down Expand Up @@ -45,7 +45,7 @@ services:
image: ghcr.io/kbss-cvut/kbss-cvut/record-manager:latest
container_name: ${RECORD_SET_NAME:-rm}-record-manager-server
expose:
- "8080"
- "8080"
restart: always
depends_on:
- s-pipes-engine
Expand All @@ -61,7 +61,7 @@ services:
image: ghcr.io/kbss-cvut/s-pipes/s-pipes-engine:latest
container_name: ${RECORD_SET_NAME:-rm}-s-pipes-engine
expose:
- "8080"
- "8080"
restart: always
depends_on:
- db-server
Expand All @@ -78,11 +78,11 @@ services:
environment:
GDB_JAVA_OPTS: "-Dgraphdb.external-url=${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/services/db-server"
expose:
- "7200"
- "7200"
restart: always
volumes:
- ../shared/db-server/init-data/forms:/root/graphdb-import/forms:ro
- db-server:/opt/graphdb/home

volumes:
db-server:
db-server:
33 changes: 15 additions & 18 deletions deploy/internal-auth/nginx/error.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
<!-- Record manager Nginx reverse proxy-->
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>
<!--# echo var="status" default="" -->
| Record manager
</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8" />
<title><!--# echo var="status" default="" --> | Record manager</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!--# if expr="$status = 502" -->
<meta http-equiv="refresh" content="2">
<meta http-equiv="refresh" content="2" />
<!--# endif -->
</head>
<style type="text/css">
body {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
color: #fff;
height: 100vh;
margin: 0;
Expand All @@ -25,14 +22,14 @@
justify-content: center;
}
</style>
<body>
<!--# if expr="$status = 502" -->
<h1>The application is currently being updated</h1>
<p>You will be redirected to the new version in a few seconds.</p>
<p>If you see this message for more than a minute, something has gone wrong.</p>
<!--# else -->
<h1>Sorry, something went wrong.</h1>
<body>
<!--# if expr="$status = 502" -->
<h1>The application is currently being updated</h1>
<p>You will be redirected to the new version in a few seconds.</p>
<p>If you see this message for more than a minute, something has gone wrong.</p>
<!--# else -->
<h1>Sorry, something went wrong.</h1>
<p><!--# echo var="status" default="" --></p>
<!--# endif -->
</body>
<!--# endif -->
</body>
</html>
10 changes: 5 additions & 5 deletions deploy/keycloak-auth/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3.9'
version: "3.9"

# Provide access to record-manager-ui that runs locally in dev mode
x-access-for-local-development: &local-dev-env
cors.allowedOrigins: "http://localhost:3000"
cors.allowedOrigins: "http://localhost:3000"

services:
nginx:
Expand Down Expand Up @@ -48,7 +48,7 @@ services:
image: ghcr.io/kbss-cvut/kbss-cvut/record-manager:latest
container_name: ${RECORD_SET_NAME:-rm}-record-manager-server
expose:
- "8080"
- "8080"
restart: always
depends_on:
- s-pipes-engine
Expand All @@ -67,7 +67,7 @@ services:
image: ghcr.io/kbss-cvut/s-pipes/s-pipes-engine:latest
container_name: ${RECORD_SET_NAME:-rm}-s-pipes-engine
expose:
- "8080"
- "8080"
restart: always
depends_on:
- db-server
Expand All @@ -84,7 +84,7 @@ services:
environment:
GDB_JAVA_OPTS: "-Dgraphdb.external-url=${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/services/db-server"
expose:
- "7200"
- "7200"
restart: always
volumes:
- ../shared/db-server/init-data/forms:/root/graphdb-import/forms:ro
Expand Down
Loading

0 comments on commit 0586fcc

Please sign in to comment.