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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ WebStorm включает в себя всё необходимое для ра
- [React](https://reactjs.org) 🇺🇸
- [React](https://ru.reactjs.org) 🇷🇺
- [Create React App](https://facebook.github.io/create-react-app/docs/getting-started) 🇺🇸
- [TypeScript Handbook](https://www.typescriptlang.org/docs/handbook/basic-types.html) 🇺🇸
- [TypeScript Handbook](https://www.typescriptlang.org/docs/handbook/basic-types.html) 🇺🇸
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@
"not op_mini all"
],
"dependencies": {
"@types/jest": "24.0.12",
"@types/node": "12.0.0",
"@types/react": "16.8.16",
"@types/react-dom": "16.8.4",
"react": "16.8.6",
"react-dom": "16.8.6"
"react-dom": "16.8.6",
"typescript": "3.3.4000"
},
"devDependencies": {
"@hellroot/eslint-config": "1.8.0",
Expand Down
16 changes: 6 additions & 10 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<!DOCTYPE html>
<html lang="ru">
<html>
<head>
<meta name="description" content="Yandex.Mail Sample" />
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<title>React App</title>
<title>Yandex.Mail</title>
<!--link rel="stylesheet" type="text/css" href="index.css"-->
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<section id="root">
</section>
</body>
</html>
29 changes: 8 additions & 21 deletions src/app/app.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
.app {
text-align: center;
}
.main {
position: static;

.app-header {
display: flex;
min-height: 100vh;
flex-direction: column;
align-items: center;
justify-content: center;
background-color: #282c34;
color: #fff;
font-size: calc(10px + 2vmin);
width: 800px;
height: 600px;
}

.app-link {
color: #61dafb;
.light {
background-color: #e5eaf0;
}

@keyframes app-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
.dark {
background-color: #061f2f;
}
25 changes: 0 additions & 25 deletions src/app/app.jsx

This file was deleted.

210 changes: 210 additions & 0 deletions src/app/app.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
import React, { Component } from 'react';

import './app.css';
import Menu from '../menu/menu';
import Writebox from '../writebox/writebox';
import Search from '../search/search';
import Letters from '../letters/letters';
import Logo from '../logo/logo';
import ThemeSwitch from '../theme-switch/theme-switch';
import { ILetter } from '../letters/__letter/letters__letter';
import { contents, getRandomInt, rndAuthor, rndTheme } from '../letters/content';

interface IState {
letters: ILetter[];
theme: string;
filter: string;
filterProcessingDisplay: boolean;
}

export class App extends Component<{}, IState> {
public constructor(props: {}) {
super(props);
this.state = {
theme: 'light',
filter: '',
filterProcessingDisplay: false,
letters: [
{
author: 'Яндекс.Паспорт',
theme: 'Доступ к аккаунту восстановлен',
date: '6 авг',
authorImage: Letters.createYandexAuthorImage(),
read: false,
checked: false,
display: true
},
{
author: 'Команда Яндекс.Почты',
theme: 'Как читать почту с мобильного',
date: '6 июл',
authorImage: Letters.createYandexAuthorImage(),
read: false,
checked: false,
display: true
},
{
author: 'Команда Яндекс.Почты',
theme: 'Как читать почту с мобильного',
date: '6 июл',
authorImage: Letters.createYandexAuthorImage(),
read: true,
checked: false,
display: true
},
{
author: 'Яндекс',
theme: 'Соберите всю почту в этот ящик',
date: '6 июл',
authorImage: Letters.createYandexAuthorImage(),
read: true,
checked: false,
display: true
}
]
};
this.changeTheme = this.changeTheme.bind(this);
this.handleFilterChange = this.handleFilterChange.bind(this);
this.setFilter = this.setFilter.bind(this);
this.setFilterProcessingDisplay = this.setFilterProcessingDisplay.bind(this);
this.newLetter = this.newLetter.bind(this);
this.deleteOnclick = this.deleteOnclick.bind(this);
this.handleCheckbox = this.handleCheckbox.bind(this);
this.selectAll = this.selectAll.bind(this);
this.processFilter = this.processFilter.bind(this);
}

public changeTheme(checkbox: React.ChangeEvent<HTMLInputElement>): void {
console.log(this.state.theme);
console.log(checkbox.currentTarget);
console.log(checkbox.currentTarget.checked);
const b = checkbox.target.checked;
this.setState(() => {
if (b) {
console.log('kek');
return {
theme: 'dark'
};
}
return {
theme: 'light'
};
});
console.log(this.state.theme);
}

private handleFilterChange(event: React.ChangeEvent<HTMLInputElement>) {
console.log(event.target.value);
this.processFilter(event.target.value);
this.setState({});
}

private setFilter(s: string) {
this.setState({ filter: s });
}

public setFilterProcessingDisplay(display: boolean) {
console.log('app setFilterProcessingDisplay');
//this.setState({ filterProcessingDisplay: display });
}

private removeSearchTextInput(event: React.MouseEvent<HTMLElement, MouseEvent>) {}

private processFilter(s: string) {
if (s === '') {
for (let i = 0; i < this.state.letters.length; i++) {
this.state.letters[i].display = true;
}
return;
}
for (let i = 0; i < this.state.letters.length; i++) {
this.state.letters[i].display = this.state.letters[i].theme
.toLowerCase()
.includes(s.toLowerCase());
}
}

public componentDidMount() {
let sum = 0;

for (let i = 1; i < 20; i++) {
sum += 10 * getRandomInt(1, 600);
setTimeout(this.newLetter, sum);
}
}

private handleCheckbox(checkbox: React.ChangeEvent<HTMLInputElement>, number: number) {
this.state.letters[number].checked = checkbox.target.checked;
this.setState(state => {
return state;
});
}

private selectAll(checkbox: React.ChangeEvent<HTMLInputElement>) {
for (let i = 0; i < this.state.letters.length; i++) {
this.state.letters[i].checked = checkbox.target.checked;
}
this.setState({});
}

private deleteOnclick() {
let kek = 0;
while (kek++ < 4) {
let hasAny = false;
for (let i = 0; i < this.state.letters.length; i++) {
if (this.state.letters[i].checked) {
this.state.letters.splice(i, 1);
hasAny = true;
break;
}
}
if (hasAny) {
continue;
}
break;
}
this.setState(state => {
return state;
});
}

private newLetter() {
const author = rndAuthor();
this.state.letters.unshift({
author,
theme: rndTheme(author),
date: '6 июл',
read: false,
checked: false,
authorImage: Letters.createYandexAuthorImage(),
display: true
});
this.setState({});
}

public render() {
return (
<div className={`main ${this.state.theme}`}>
<Logo theme={this.state.theme} />
<Menu theme={this.state.theme} />
<Writebox theme={this.state.theme} />
<Search
theme={this.state.theme}
handleFilterChange={this.handleFilterChange}
removeSearchTextInput={this.removeSearchTextInput}
display={this.state.filterProcessingDisplay}
/>
<ThemeSwitch changeTheme={this.changeTheme} />
<Letters
theme={this.state.theme}
filter={this.state.filter}
setFilterProcessingDisplay={this.setFilterProcessingDisplay}
deleteOnclick={this.deleteOnclick}
handleCheckbox={this.handleCheckbox}
letters={this.state.letters}
selectAll={this.selectAll}
/>
</div>
);
}
}
Binary file added src/fonts/HelveticaNeueCyr-Bold.otf
Binary file not shown.
Binary file added src/fonts/HelveticaNeueCyr-Light.otf
Binary file not shown.
Binary file added src/fonts/HelveticaNeueCyr-Medium.otf
Binary file not shown.
Binary file added src/fonts/YandexSansText-Bold.ttf
Binary file not shown.
Binary file added src/fonts/YandexSansText-Light.ttf
Binary file not shown.
Binary file added src/fonts/YandexSansText-Regular.ttf
Binary file not shown.
Binary file added src/images/Fill-154.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Oval-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Oval.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/nut.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
@font-face {
font-family: 'Yandex Sans Light';
src: url(fonts/YandexSansText-Light.ttf);
}

@font-face {
font-family: 'Yandex Sans Bold';
src: url(fonts/YandexSansText-Bold.ttf);
}

@font-face {
font-family: 'Yandex Sans Regular';
src: url(fonts/YandexSansText-Regular.ttf);
}

@font-face {
font-family: 'Helvetica Neue Bold';
src: url(fonts/HelveticaNeueCyr-Bold.otf);
}

@font-face {
font-family: 'Helvetica Neue Medium';
src: url(fonts/HelveticaNeueCyr-Medium.otf);
}

@font-face {
font-family: 'Helvetica Neue Light';
src: url(fonts/HelveticaNeueCyr-Light.otf);
}

p {
overflow: hidden;
}

body {
padding: 0;
margin: 0;
Expand Down
2 changes: 2 additions & 0 deletions src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ import { App } from './app';
import './index.css';

ReactDOM.render(<App />, document.getElementById('root'));

// document.getElementById('root').newLetters();
23 changes: 23 additions & 0 deletions src/letters/Letters.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.letters {
position: absolute;

width: 589px;
height: 530px;
margin-top: 56px;

margin-left: 191px;

box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.34);
}

#letters__footer-line {
margin-top: 499px;
}

.light {
background-color: #fff;
}

.dark {
background-color: #1e3543;
}
Loading