Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #641

Merged
merged 46 commits into from
Oct 28, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
587616c
Merge branch 'master' into release
NabokinAlexandr Aug 20, 2021
7da86c6
hotFix wrong redirect on author page (#539)
0shar0 Aug 20, 2021
bc6cd28
Merge branch 'release' into develop
NabokinAlexandr Aug 20, 2021
f4444ea
hotFix wrong redirect on author page (#539) (#540)
NabokinAlexandr Aug 20, 2021
a9e88e5
Bugfix Styles in the login popup do not work (#542)
shedanny Aug 23, 2021
18821ff
Bug fix #169 materials are not sorted properly (#544)
0shar0 Aug 25, 2021
76a4743
Add content text checks at editor (#543)
0shar0 Aug 25, 2021
5b73df3
Merge branch 'develop' into release
NabokinAlexandr Aug 25, 2021
732b37e
Develop to Release (#545)
NabokinAlexandr Aug 25, 2021
6ba79d3
fixed (#547)
NabokinAlexandr Aug 26, 2021
61f03d3
Develop to Release (#548)
NabokinAlexandr Aug 26, 2021
3fccb9e
Increase selectors priority in the login popup
shedanny Aug 28, 2021
7fe9f33
Bug Fix incorrect working of scroll (#551)
0shar0 Aug 29, 2021
a8a6c3a
Editor bug fix Bug REport #200 (#550)
0shar0 Aug 30, 2021
b4bb142
Fix main page responsiveness and blocks spacing (#555)
shedanny Sep 1, 2021
0e0b1d1
Issue#204 burger menu & issue#203 header mobile version (#557)
0shar0 Sep 1, 2021
af02cb6
edit Important mobile view (#558)
0shar0 Sep 2, 2021
386ed80
Fix experts page and checkboxes responsiveness (#556)
shedanny Sep 2, 2021
89f0e19
bug fixed (#553)
NabokinAlexandr Sep 3, 2021
c789f2b
bugfix (#559)
0shar0 Sep 7, 2021
9aff9a0
Remove filter properties (#560)
shedanny Sep 7, 2021
43e6614
Fix materials page and expert materials page responsiveness (#562)
shedanny Sep 10, 2021
99a1433
Fix/remove carousel limit (#561)
niksonax Sep 10, 2021
d5b7ce1
Fix styles of the link inside the post (#563)
shedanny Sep 10, 2021
ca6f8c9
Merge branch 'release' of https://github.com/ita-social-projects/doka…
NabokinAlexandr Sep 10, 2021
902f0b5
Merge branch 'develop' into release
NabokinAlexandr Sep 10, 2021
d55aeb0
fixed assemble script
NabokinAlexandr Sep 10, 2021
80e33b5
fixed assemble script (#564)
NabokinAlexandr Sep 10, 2021
c9e35c7
linter updated
NabokinAlexandr Sep 10, 2021
b33ccbc
Merge branch 'develop' into release
NabokinAlexandr Sep 10, 2021
9c15ff9
Merge branch 'release' of https://github.com/ita-social-projects/doka…
NabokinAlexandr Sep 10, 2021
53906f4
linter fix
NabokinAlexandr Sep 10, 2021
ec00339
Develop to Release (#570)
NabokinAlexandr Sep 15, 2021
aabe8f2
Develop to release (#572)
0shar0 Sep 15, 2021
bd5af12
Develop to release (#581)
0shar0 Sep 22, 2021
050414f
Develop to release (#597)
0shar0 Sep 29, 2021
f54bbd5
conflictFix
0shar0 Sep 29, 2021
57a7132
Develop to release (#606)
0shar0 Oct 6, 2021
336b870
Merge branch 'master' into release
0shar0 Oct 13, 2021
99278db
Develop to release (#626)
0shar0 Oct 20, 2021
059344b
Develop to release (#627)
0shar0 Oct 20, 2021
da78446
Merge branch 'master' into release
0shar0 Oct 27, 2021
136461f
hotfix
0shar0 Oct 28, 2021
4d201cf
hotfix
0shar0 Oct 28, 2021
9889557
Merge remote-tracking branch 'origin/release' into release
0shar0 Oct 28, 2021
42cff6e
Update Dockerfile.prod
0shar0 Oct 28, 2021
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
Prev Previous commit
Next Next commit
bugfix (#559)
* hot fix, postView title margin bottom

* hot fix, autofill find post author field on update post

* hot fix, autofill find post author field on update post

* edit testCase

* edit postCreation files
  • Loading branch information
0shar0 authored Sep 7, 2021
commit c789f2b4e71e0ac826d3f1720d603506420dd1c1
3 changes: 2 additions & 1 deletion src/old/modules/posts/styles/PostView.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const useStyles = makeStyles(
position: 'relative',
minHeight: '550px',
padding: '70px 225px 150px',
wordBreak:'break-word',
wordBreak: 'break-word',
},
wrapper: {
display: 'flex',
Expand Down Expand Up @@ -34,6 +34,7 @@ export const useStyles = makeStyles(
flexDirection: 'column',
'& h1': {
marginTop: theme.spacing(14),
marginBottom: theme.spacing(10),
},
},
createdAt: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe('PostAuthorSeclection', () => {
const { getAllByTestId } = render(
<PostAuthorSelection
authors={authors}
isDisplayTable
onAuthorTableClick={onAuthorTableClick}
handleOnChange={() => {}}
/>,
Expand All @@ -97,6 +98,7 @@ describe('PostAuthorSeclection', () => {
render(
<PostAuthorSelection
authors={authors}
isDisplayTable
searchValue="Ivan"
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChangeMock}
Expand All @@ -113,6 +115,7 @@ describe('PostAuthorSeclection', () => {
const { getByPlaceholderText } = render(
<PostAuthorSelection
authors={authors}
isDisplayTable
searchValue="Ivan"
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChangeMock}
Expand All @@ -131,6 +134,7 @@ describe('PostAuthorSeclection', () => {
const { getByPlaceholderText } = render(
<PostAuthorSelection
authors={authors}
isDisplayTable
searchValue="Ivan"
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChangeMock}
Expand All @@ -149,6 +153,7 @@ describe('PostAuthorSeclection', () => {
const { getByRole, rerender } = render(
<PostAuthorSelection
authors={[]}
isDisplayTable
searchValue=""
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChangeMock}
Expand All @@ -161,6 +166,7 @@ describe('PostAuthorSeclection', () => {
rerender(
<PostAuthorSelection
authors={newAuthors}
isDisplayTable
searchValue="I"
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChangeMock}
Expand Down
43 changes: 23 additions & 20 deletions src/views/postCreation/PostAuthorSelection/PostAuthorSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@ interface IPostAuthorSelectionProps {
onAuthorTableClick: (value: number, item: ExpertResponseType) => void;
authors?: ExpertResponseType[];
searchValue?: string;
authorsLength?: number|null;
authorsLength?: number | null;
isDisplayTable?: boolean;
}

export const PostAuthorSelection: React.FC<IPostAuthorSelectionProps> = ({
handleOnChange,
onAuthorTableClick,
searchValue,
authors,
authorsLength
authorsLength,
isDisplayTable,
}) => {
const { t } = useTranslation();
const classes = useStyle();
Expand Down Expand Up @@ -64,24 +66,25 @@ export const PostAuthorSelection: React.FC<IPostAuthorSelectionProps> = ({
/>
</FormControl>

{authors?.length !== 0 ? (
<Table>
<TableHead>
<TableRow>
<TableCell>#</TableCell>
<TableCell>First Name</TableCell>
<TableCell>Second Name</TableCell>
</TableRow>
</TableHead>
<TableBody>{table}</TableBody>
</Table>
) : (
authorsLength === 0 && searchValue?.length !== 0 && (
<div style={{ color: 'red' }}>
{t(langTokens.common.noFoundAuthors)}
</div>
)
)}
{authors?.length !== 0
? isDisplayTable && (
<Table>
<TableHead>
<TableRow>
<TableCell>#</TableCell>
<TableCell>First Name</TableCell>
<TableCell>Second Name</TableCell>
</TableRow>
</TableHead>
<TableBody>{table}</TableBody>
</Table>
)
: authorsLength === 0 &&
searchValue?.length !== 0 && (
<div style={{ color: 'red' }}>
{t(langTokens.common.noFoundAuthors)}
</div>
)}

<div style={{ marginBottom: '24px' }} />
</>
Expand Down
1 change: 1 addition & 0 deletions src/views/postCreation/TextPostCreation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ export const TextPostCreation: React.FC<IPostCreationProps> = ({

const postAuthorSelection = isAdmin && (
<PostAuthorSelection
isDisplayTable
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChange}
authors={authors}
Expand Down
1 change: 1 addition & 0 deletions src/views/postCreation/VideoCreation/VideoPostCreation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ export const VideoPostCreation: React.FC<IVideoPostCreationProps> = ({

const postAuthorSelection = isAdmin && (
<PostAuthorSelection
isDisplayTable
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChange}
authors={authors}
Expand Down
5 changes: 4 additions & 1 deletion src/views/postUpdation/TextPostUpdation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ export const TextPostUpdation: React.FC<ITextPostUpdationProps> = ({
const [authors, setAuthors] = useState<ExpertResponseType[]>([]);
const [authorId, setAuthorId] = useState<number | null>(null);
const [author, setAuthor] = useState<ExpertResponseType>();
const [searchValue, setSearchValue] = useState('');
const [searchValue, setSearchValue] = useState(`${post.author.firstName} ${post.author.lastName}`);
const [authorLength, setAuthorLength] = useState<number | null>(null);
const [typing, setTyping] = useState({ content: false, preview: false });
const [previewing, setPreviewing] = useState(false);
const [isDisplayTable, setIsDisplayTable] = useState(false);

const { t } = useTranslation();

Expand Down Expand Up @@ -113,6 +114,7 @@ export const TextPostUpdation: React.FC<ITextPostUpdationProps> = ({
);

const handleOnChange = (value: string) => {
setIsDisplayTable(true);
setSearchValue(value);
};

Expand Down Expand Up @@ -219,6 +221,7 @@ export const TextPostUpdation: React.FC<ITextPostUpdationProps> = ({

const postAuthorSelection = isAdmin && (
<PostAuthorSelection
isDisplayTable={isDisplayTable}
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChange}
authors={authors}
Expand Down
5 changes: 4 additions & 1 deletion src/views/postUpdation/VideoUpdation/VideoPostUpdation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ export const VideoPostUpdation: React.FC<ITextPostUpdationProps> = ({
const [authors, setAuthors] = useState<ExpertResponseType[]>([]);
const [authorId, setAuthorId] = useState<number | null>(null);
const [author, setAuthor] = useState<ExpertResponseType>();
const [searchValue, setSearchValue] = useState('');
const [searchValue, setSearchValue] = useState(`${post.author.firstName} ${post.author.lastName}`);
const [authorLength, setAuthorLength] = useState<number | null>(null);
const [typing, setTyping] = useState({ content: false, preview: false });
const [previewing, setPreviewing] = useState(false);
const [isDisplayTable, setIsDisplayTable] = useState(false);

const { t } = useTranslation();

Expand Down Expand Up @@ -105,6 +106,7 @@ export const VideoPostUpdation: React.FC<ITextPostUpdationProps> = ({
);

const handleOnChange = (value: string) => {
setIsDisplayTable(true);
setSearchValue(value);
};

Expand Down Expand Up @@ -197,6 +199,7 @@ export const VideoPostUpdation: React.FC<ITextPostUpdationProps> = ({

const postAuthorSelection = isAdmin && (
<PostAuthorSelection
isDisplayTable={isDisplayTable}
onAuthorTableClick={onAuthorTableClick}
handleOnChange={handleOnChange}
authors={authors}
Expand Down