Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ build
coverage
.next
out
AdminPanel/client/src/pages/AiIntegration/ai/**
AdminPanel/client/src/pages/AiIntegration/js/plugins.js
AdminPanel/client/src/pages/AiIntegration/js/plugins-ui.js
*.min.js
*.min.css
package-lock.json
Expand Down
2 changes: 1 addition & 1 deletion AdminPanel/client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ body::-webkit-scrollbar-thumb {
}

a {
color: #0082C9;
color: #0082c9;
text-decoration: underline;
font-weight: 400;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}

.addButton {
background: #0082C9;
background: #0082c9;
color: #ffffff;
border: none;
height: 48px;
Expand Down
4 changes: 2 additions & 2 deletions AdminPanel/client/src/components/Button/Button.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.button {
background: #0082C9;
background: #0082c9;
width: 154px;
height: 48px;
padding: 13px 24px;
Expand All @@ -25,7 +25,7 @@
}

&--loading {
background: #0082C9;
background: #0082c9;
cursor: wait;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
}

.checkbox:checked ~ .checkmark {
background: #0082C9;
border-color: #0082C9;
background: #0082c9;
border-color: #0082c9;

&::after {
display: block;
Expand Down
4 changes: 2 additions & 2 deletions AdminPanel/client/src/components/Note/Note.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@

/* Note variant - Orange */
.note {
border-left: 2px solid #0082C9;
border-left: 2px solid #0082c9;

.title {
color: #0082C9;
color: #0082c9;
}
}

Expand Down
2 changes: 1 addition & 1 deletion AdminPanel/client/src/components/Select/Select.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
}

&--selected {
color: #0082C9;
color: #0082c9;
font-weight: 600;
}
}
6 changes: 3 additions & 3 deletions AdminPanel/client/src/components/Tabs/Tabs.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
}

&--active {
color: #0082C9;
color: #0082c9;

&:hover,
&:focus,
&:active {
color: #0082C9; /* ensure orange while focused/pressed */
color: #0082c9; /* ensure orange while focused/pressed */
}

&::after {
Expand All @@ -54,7 +54,7 @@
left: 0;
right: 0;
height: 2px;
background: #0082C9;
background: #0082c9;
}
}
}
Expand Down
12 changes: 5 additions & 7 deletions AdminPanel/client/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ const CopyPlugin = require('copy-webpack-plugin');
const webpack = require('webpack');
const dotenv = require('dotenv');

const outputDir = process.env.BUILD_ROOT
? path.resolve(process.env.BUILD_ROOT, 'build')
: path.resolve(__dirname, 'build');
const outputDir = process.env.BUILD_ROOT ? path.resolve(process.env.BUILD_ROOT, 'build') : path.resolve(__dirname, 'build');

const appName = process.env.APP_NAME || 'Euro-Office';

Expand Down Expand Up @@ -56,8 +54,8 @@ module.exports = (env, argv) => {
new HtmlWebpackPlugin({
template: path.join(__dirname, 'public', 'index.html'),
templateParameters: {
appName,
},
appName
}
}),
new CopyPlugin({
patterns: [
Expand Down Expand Up @@ -96,8 +94,8 @@ module.exports = (env, argv) => {
}),
new webpack.DefinePlugin({
'process.env.REACT_APP_BACKEND_URL': JSON.stringify(process.env.REACT_APP_BACKEND_URL),
'process.env.APP_NAME': JSON.stringify(appName),
}),
'process.env.APP_NAME': JSON.stringify(appName)
})
],

module: {
Expand Down
23 changes: 23 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ const globals = require('globals');
const prettier = require('eslint-config-prettier');
const {includeIgnoreFile} = require('@eslint/compat');
const path = require('node:path');
const react = require('eslint-plugin-react');
const reactHooks = require('eslint-plugin-react-hooks');

const gitignorePath = path.resolve(__dirname, '.gitignore');

module.exports = [
Expand All @@ -15,6 +18,9 @@ module.exports = [
'coverage/',
'.next/',
'out/',
'AdminPanel/client/src/pages/AiIntegration/ai/**',
'AdminPanel/client/src/pages/AiIntegration/js/plugins.js',
'AdminPanel/client/src/pages/AiIntegration/js/plugins-ui.js',
'*.min.js',
'package-lock.json',
'npm-shrinkwrap.json',
Expand Down Expand Up @@ -62,5 +68,22 @@ module.exports = [
'max-lines': ['warn', 5000]
}
},
{
files: ['AdminPanel/client/**/*.{js,jsx}'],
plugins: {react, 'react-hooks': reactHooks},
languageOptions: {
ecmaVersion: 2022,
sourceType: 'module',
parserOptions: {ecmaFeatures: {jsx: true}},
globals: {...globals.browser, ...globals.es2022}
},
settings: {react: {version: 'detect'}},
rules: {
'react/react-in-jsx-scope': 'off',
'react/jsx-uses-vars': 'error',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn'
}
},
prettier
];
18 changes: 12 additions & 6 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"cross-env": "7.0.3",
"eslint": "9.16.0",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.2.0",
"express": "4.21.2",
"globals": "15.12.0",
"husky": "8.0.3",
Expand Down
Loading