Skip to content

Commit

Permalink
Merge pull request #8 from ola-9/fix
Browse files Browse the repository at this point in the history
fix linter config and clean errors
  • Loading branch information
ola-9 committed Jul 11, 2023
2 parents 7be3f9b + ddc4b59 commit 3710d63
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 35 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/.eslintrc.yml → .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ plugins:
rules:
import/extensions: 0
no-console: 0

react/prop-types: 0
2 changes: 1 addition & 1 deletion .github/workflows/nodeci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- name: Install
run: make install
- name: Run linter
run: make lint
run: make lint-frontend
# - name: Run tests
# run: make test
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ deploy:

lint-frontend:
make -C frontend lint

install:
make -C frontend install
63 changes: 33 additions & 30 deletions frontend/package-lock.json

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

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"axios": "^0.27.2",
"bootstrap": "^5.1.3",
"formik": "^2.2.9",
"i18next": "^23.2.8",
"react": "^18.2.0",
"react-bootstrap": "^2.4.0",
"react-dom": "^18.2.0",
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/init.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
// @ts-check

import React from 'react';
import i18next from 'i18next';
import { I18nextProvider, initReactI18next } from 'react-i18next';

import i18next from 'i18next';
import App from './components/App.jsx';
import resources from './locales/index.js';


export default async () => {
const i18n = i18next.createInstance();

Expand Down
1 change: 1 addition & 0 deletions frontend/src/locales/en.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-anonymous-default-export */
export default {
translation: {
loading: 'Loading...',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/locales/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-anonymous-default-export */
// @ts-check

import en from './en.js';
Expand Down
1 change: 1 addition & 0 deletions frontend/src/locales/ru.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-anonymous-default-export */
export default {
translation: {
loading: 'Загрузка...',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/routes.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-anonymous-default-export */
// @ts-check

const apiPath = '/api/v1';
Expand Down

0 comments on commit 3710d63

Please sign in to comment.