Skip to content

Commit

Permalink
Merge pull request #878 from ErvinRacz/node-version-update
Browse files Browse the repository at this point in the history
Node version update
  • Loading branch information
tormath1 authored Jan 20, 2025
2 parents 699348f + 3905d3d commit a014ed8
Show file tree
Hide file tree
Showing 144 changed files with 26,783 additions and 63,148 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
matrix:
node-version: [16.x]
node-version: [22]

steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ COPY ./backend ./
RUN make build

# Frontend build
FROM docker.io/library/node:15 as frontend-install
FROM docker.io/library/node:22 as frontend-install
WORKDIR /app/frontend
COPY frontend/package*.json ./
RUN npm install
Expand Down
14 changes: 13 additions & 1 deletion frontend/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
module.exports = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],

addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/preset-create-react-app',
],

framework: {
name: '@storybook/react-webpack5',
options: {}
},

staticDirs: ['../public'],

docs: {
autodocs: true
}
};
11 changes: 7 additions & 4 deletions frontend/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import themesConf from '../src/lib/themes';
import { StylesProvider } from '@material-ui/core/styles';
import { StylesProvider } from '@mui/styles';
import '../src/i18n/config';
import ThemeProviderNexti18n from '../src/i18n/ThemeProviderNexti18n';
import { StyledEngineProvider } from '@mui/material/styles';

const darkTheme = themesConf['dark'];
const lightTheme = themesConf['light'];
Expand All @@ -12,9 +13,11 @@ const withThemeProvider = (Story, context) => {
const theme = backgroundColor !== 'dark' ? lightTheme : darkTheme;

const ourThemeProvider = (
<ThemeProviderNexti18n theme={theme}>
<Story {...context} />
</ThemeProviderNexti18n>
<StyledEngineProvider injectFirst>
<ThemeProviderNexti18n theme={theme}>
<Story {...context} />
</ThemeProviderNexti18n>
</StyledEngineProvider>
);
if (process.env.NODE_ENV !== 'test') {
return ourThemeProvider;
Expand Down
Loading

0 comments on commit a014ed8

Please sign in to comment.