Skip to content
Snippets Groups Projects
Commit fd135c6e authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch '244-global-menu-visual-update' into 'develop'

update dockerfile and formio

See merge request !61
parents c9971c6d 389db0ef
Branches
Tags
2 merge requests!62Develop,!61update dockerfile and formio
......@@ -5,10 +5,10 @@ WORKDIR /build
RUN apk add nodejs npm
RUN npm install -g @angular/cli@17
RUN npm i --force --legacy-peer-deps
RUN npm i --force
RUN ng build --base-href / --configuration production
FROM nginx:1.23-alpine
FROM nginx:1.27-alpine
MAINTAINER nmaas@lists.geant.org
ARG webdir=/usr/share/nginx/html
......
......@@ -20,7 +20,7 @@
"@angular/platform-browser-dynamic": "17.3.12",
"@angular/router": "17.3.12",
"@auth0/angular-jwt": "^5.2.0",
"@formio/angular": "^7.0.0",
"@formio/angular": "7.0.0",
"@formio/js": "^5.0.0",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
......@@ -640,9 +640,9 @@
}
},
"node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
"version": "22.10.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz",
"integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==",
"version": "22.10.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
"integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
"dev": true,
"optional": true,
"peer": true,
......@@ -8474,15 +8474,15 @@
}
},
"node_modules/formiojs": {
"version": "4.19.0",
"resolved": "https://registry.npmjs.org/formiojs/-/formiojs-4.19.0.tgz",
"integrity": "sha512-0Cft6mfvqglEDUngYSVhBHr003T7DdznSF4yMjNPLSr5QUwJnJe+sIJyhmHj4/9MvZnn7+s7wmq0DG6bHCrIBQ==",
"version": "4.21.6",
"resolved": "https://registry.npmjs.org/formiojs/-/formiojs-4.21.6.tgz",
"integrity": "sha512-Ky2lGjxO5ujk4vKu0V8OJyI79qyJxacEMWjGJcu6FTiUbT70o61Q5pZxo87tTwMpaw6uzncGlkhMr6t4pzby7A==",
"peer": true,
"dependencies": {
"@formio/bootstrap3": "2.12.4-rc.1",
"@formio/choices.js": "10.2.1",
"@formio/semantic": "2.6.1",
"@formio/text-mask-addons": "^3.8.0-formio.2",
"@formio/text-mask-addons": "^3.8.0-formio.4",
"@formio/vanilla-text-mask": "^5.1.1-formio.1",
"abortcontroller-polyfill": "^1.7.5",
"autocompleter": "^7.0.1",
......@@ -8502,6 +8502,7 @@
"fetch-ponyfill": "^7.1.0",
"i18next": "22.4.12",
"idb": "^7.1.1",
"inputmask": "^5.0.9",
"ismobilejs": "^1.1.1",
"json-logic-js": "^2.0.2",
"jstimezonedetect": "^1.0.7",
......@@ -16264,9 +16265,9 @@
"optional": true
},
"@types/node": {
"version": "22.10.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz",
"integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==",
"version": "22.10.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
"integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
"dev": true,
"optional": true,
"peer": true,
......@@ -21967,15 +21968,15 @@
}
},
"formiojs": {
"version": "4.19.0",
"resolved": "https://registry.npmjs.org/formiojs/-/formiojs-4.19.0.tgz",
"integrity": "sha512-0Cft6mfvqglEDUngYSVhBHr003T7DdznSF4yMjNPLSr5QUwJnJe+sIJyhmHj4/9MvZnn7+s7wmq0DG6bHCrIBQ==",
"version": "4.21.6",
"resolved": "https://registry.npmjs.org/formiojs/-/formiojs-4.21.6.tgz",
"integrity": "sha512-Ky2lGjxO5ujk4vKu0V8OJyI79qyJxacEMWjGJcu6FTiUbT70o61Q5pZxo87tTwMpaw6uzncGlkhMr6t4pzby7A==",
"peer": true,
"requires": {
"@formio/bootstrap3": "2.12.4-rc.1",
"@formio/choices.js": "10.2.1",
"@formio/semantic": "2.6.1",
"@formio/text-mask-addons": "^3.8.0-formio.2",
"@formio/text-mask-addons": "^3.8.0-formio.4",
"@formio/vanilla-text-mask": "^5.1.1-formio.1",
"abortcontroller-polyfill": "^1.7.5",
"autocompleter": "^7.0.1",
......@@ -21995,6 +21996,7 @@
"fetch-ponyfill": "^7.1.0",
"i18next": "22.4.12",
"idb": "^7.1.1",
"inputmask": "^5.0.9",
"ismobilejs": "^1.1.1",
"json-logic-js": "^2.0.2",
"jstimezonedetect": "^1.0.7",
......@@ -25,6 +25,7 @@ import {ServiceUnavailableModule} from './service-unavailable/service-unavailabl
import {ServiceUnavailableService} from './service-unavailable/service-unavailable.service';
import {NgTerminalModule} from 'ng-terminal';
import { provideZxvbnServiceForPSM } from 'angular-password-strength-meter/zxcvbn';
import { FormioModule } from '@formio/angular';
export function appConfigFactory(config: AppConfigService) {
return function create() {
......@@ -76,7 +77,8 @@ export const jwtOptionsFactory = (appConfig: AppConfigService) => ({
deps: [HttpClient, AppConfigService, ServiceUnavailableService]
}
}),
NgTerminalModule
NgTerminalModule,
FormioModule
],
providers: [
AuthGuard,
......
......@@ -2,7 +2,7 @@
@import '../node_modules/primeng/resources/themes/nova/theme.css';
@import '../node_modules/primeicons/primeicons.css';
@import '../node_modules/primeng/resources/primeng.min.css';
@import '../node_modules/formiojs/dist/formio.full.min.css';
/* @import '../node_modules/@formio/core/dist/formio.ful.min.css'; */
/* These classes are copy pasted from bootstrap 4 to work with formio panel display */
/* remove when applying actual bootstrap 4 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment