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.

Sign up for GitHub

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

The copyright data has updated #365

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

The copyright data has updated #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9871088
The copyright data has updated
oneOfThePeakyBlinders Jun 26, 2023
1d9b5fd
The copyright data has updated
oneOfThePeakyBlinders Jun 26, 2023
f3d708e
Добавлена возможность вернуться назад из профиля
oneOfThePeakyBlinders Jun 27, 2023
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: 2 additions & 1 deletion src/components/layout/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const StyledFooter = styled.div`
`;

export const Footer = () => {
const currentYear = new Date().getFullYear();
return (
<StyledFooter>
<div className="container">
Expand All @@ -36,7 +37,7 @@ export const Footer = () => {
</div>
<div className="ms-3 footer_text">
Interview Questions And Answers Application <br />
Intocode, 2016-2022
Intocode, {`2016-${currentYear}`}
kuduzow marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
<div className="d-flex d-none d-sm-flex">
Expand Down
18 changes: 16 additions & 2 deletions src/features/profile/ProfileUser.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import styled from 'styled-components';
import dayjs from 'dayjs';
import { useSelector } from 'react-redux';
import { Paper } from 'components/layout/Paper';
import { Typography } from 'antd';
import { theme } from 'app/theme';
import { Link } from 'react-router-dom';
import { selectProfile } from './profileSlice';

const ProfileUser = () => {
Expand All @@ -16,6 +18,7 @@ const ProfileUser = () => {
border-radius: 50%;
cursor: pointer;
}

@media screen and (max-width: 576px) {
& > img {
margin: auto;
Expand All @@ -28,25 +31,31 @@ const ProfileUser = () => {
.pageUser {
margin-left: 0px;
}

.registration-date {
color: ${theme.colors.gray.main};
font-size: 12px;
}

.nameUser {
font-size: 22px;
}

.userName {
font-size: 20px;
font-weight: 400;
margin-top: 20px;
}

.userEmail {
margin-top: 20px;
font-size: 20px;
}

.userData {
margin: 20px 0 26px 20px;
}

@media screen and (min-width: 576px) {
.pageUser {
margin-left: -20px;
Expand All @@ -56,15 +65,20 @@ const ProfileUser = () => {

return (
<div className="container">
<div className="d-flex justify-content-end mt-4 p-2">
<Link to="/" component={Typography.Link}>
Вернуться назад
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не относящееся к задаче должно быть убрано

</Link>
</div>
<StyledPageUser>
<div className="row flex-column flex-sm-row">
<div className="col-12 col-sm-4 mt-3">
<div className="col-12 col-sm-4">
<span className="nameUser">Профиль @{profile.name}</span>
<StyledAvatar className="d-flex justify-content-center mt-3">
<img className="mt-auto" src={profile.avatar?.full} alt="" />
</StyledAvatar>
</div>
<div className="col-12 col-sm-8 mt-sm-5 mt-3">
<div className="col-12 col-sm-8 mt-sm-4 mt-3">
<Paper className="pageUser">
<div className="userData">
<div className="registration-date">
Expand Down