Skip to content

Commit b0c15d4

Browse files
authored
Merge pull request #110 from BinaryStudioAcademy/development
Merge development to production
2 parents 62f4153 + 725a464 commit b0c15d4

File tree

177 files changed

+3012
-2209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+3012
-2209
lines changed

.eslintrc.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,13 @@ rules:
5555
- error
5656
import/no-duplicates:
5757
- error
58-
'@typescript-eslint/non-nullable-type-assertion-style':
59-
- off
58+
no-unused-vars:
59+
- error
60+
- argsIgnorePattern: ^_
61+
ignoreRestSiblings: true
62+
sonarjs/cognitive-complexity:
63+
- error
64+
- 18
6065
quotes:
6166
- error
6267
- single

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- production
7+
- development
78

89
jobs:
910
lint:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ yarn-error.log
7272

7373
# production
7474
build
75+
dist
7576

7677
# misc
7778
.DS_Store

.lintstagedrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
'*': npm run lint:editorconfig && npm run lint:fs
2+
'*.{js,jsx,scss,json,md,html}': npm run prettify
23
shared/**/*.js: npm run lint:shared:js
34
client/src/**/*.{js,jsx}: npm run lint:client:js
45
client/src/**/*.scss: npm run lint:client:css

client/.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#
44
# default. own preference might be used
55
VITE_API_SERVER=http://localhost:3001
6-
VITE_SOCKET_SERVER=http://localhost:3002
6+
VITE_SOCKET_SERVER=ws://localhost:3001
77
VITE_API_PATH=/api
8+
VITE_SOCKET_PATH=/socket.io
89
VITE_PORT=3000
910
VITE_HOST=localhost

client/src/libs/components/checkbox/checkbox.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ const Checkbox = ({ name, label, control }) => {
1515
id="toggle-checkbox"
1616
className={`${styles.switch} ${styles.pointer}`}
1717
/>
18-
<label className={styles.pointer} htmlFor="toggle-checkbox">{label}</label>
18+
<label className={styles.pointer} htmlFor="toggle-checkbox">
19+
{label}
20+
</label>
1921
</div>
2022
);
2123
};

client/src/libs/components/message/message.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import PropTypes from 'prop-types';
33
import styles from './styles.module.scss';
44

55
const Message = ({ children }) => (
6-
<div className={styles.message}>
7-
{children}
8-
</div>
6+
<div className={styles.message}>{children}</div>
97
);
108

119
Message.propTypes = {
12-
children: PropTypes.oneOfType([PropTypes.element, PropTypes.arrayOf(PropTypes.element)]).isRequired
10+
children: PropTypes.oneOfType([
11+
PropTypes.element,
12+
PropTypes.arrayOf(PropTypes.element)
13+
]).isRequired
1314
};
1415

1516
export { Message };

client/src/libs/components/notifications/notifications.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'react-toastify/dist/ReactToastify.css';
22

33
import { ToastContainer } from 'react-toastify';
44

5-
import { useDispatch,useEffect } from '~/libs/hooks/hooks.js';
5+
import { useDispatch, useEffect } from '~/libs/hooks/hooks.js';
66
import { userType } from '~/libs/prop-types/property-types.js';
77
import { actions as notificationActionCreator } from '~/slices/notifications/notifications.js';
88

client/src/libs/components/post/post.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable react/jsx-no-bind */
12
import PropTypes from 'prop-types';
23

34
import { IconName } from '~/libs/enums/enums.js';
@@ -44,7 +45,11 @@ const Post = ({ post, onPostLike, onExpandedPostToggle, onSharePost }) => {
4445
label={likeCount}
4546
onClick={handlePostLike}
4647
/>
47-
<IconButton iconName={IconName.THUMBS_DOWN} label={dislikeCount} />
48+
<IconButton
49+
iconName={IconName.THUMBS_DOWN}
50+
label={dislikeCount}
51+
onClick={() => {}}
52+
/>
4853
<IconButton
4954
iconName={IconName.COMMENT}
5055
label={commentCount}

client/src/libs/components/segment/segment.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ import PropTypes from 'prop-types';
33
import styles from './styles.module.scss';
44

55
const Segment = ({ children }) => (
6-
<div className={styles.segment}>
7-
{children}
8-
</div>
6+
<div className={styles.segment}>{children}</div>
97
);
108

119
Segment.propTypes = {
1210
children: PropTypes.node.isRequired
1311
};
1412

1513
export { Segment };
16-

0 commit comments

Comments
 (0)