Skip to content

Россомахина Арина, M3337 #9

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

Open
airosso wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Россомахина Арина, M3337 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17eb6c9
typescript and css modules
May 5, 2019
bb79a06
letter
airosso May 5, 2019
7daa2fe
react-window
airosso May 6, 2019
7383e43
dark theme
airosso May 8, 2019
0718703
dark theme
airosso May 8, 2019
937e564
dark theme
airosso May 8, 2019
71d586e
update
airosso May 17, 2019
11883fa
fix
airosso May 23, 2019
bdb954a
fix2
airosso May 23, 2019
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
237 changes: 171 additions & 66 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,20 @@
"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",
"@types/react-transition-group": "2.9.1",
"@types/react-virtualized-auto-sizer": "1.0.0",
"@types/react-window": "1.8.0",
"@typescript-eslint/eslint-plugin": "1.7.0",
"@typescript-eslint/parser": "1.7.0",
"react": "16.8.6",
"react-dom": "16.8.6"
"react-dom": "16.8.6",
"react-transition-group": "4.0.0",
"react-virtualized-auto-sizer": "1.0.2",
"react-window": "1.8.1"
},
"devDependencies": {
"@hellroot/eslint-config": "1.8.0",
Expand Down
27 changes: 0 additions & 27 deletions src/app/app.css
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/app/app.jsx
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/app/app.test.jsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/app/index.js
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions src/components/App/App.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.app {
font-family: 'HelveticaNeue', sans-serif;
}

.app--light {
background-color: var(--accent-background);
}

.app--dark {
background-color: var(--accent-background--dark);
}
1,062 changes: 1,062 additions & 0 deletions src/components/App/App.ts
View file
Open in desktop

Large diffs are not rendered by default.

117 changes: 117 additions & 0 deletions src/components/App/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
import * as React from 'react';
import { Component } from 'react';

import { Menu } from '../Menu/Menu';
import { Main } from '../Main/Main';

import { generate1000Letters, generateLetter, ILetter, initialStateLetters, startSendingRandomLetters } from './App';
import { getThemed, Theme, ThemeContext } from '../theme';

// @ts-ignore
import style from './App.module.css';


interface AppState {
letters: ILetter[]
theme: Theme;
}


export class App extends Component<{}, AppState> {
readonly state: AppState = {
letters: initialStateLetters,
theme: (theme => theme ? theme : 'dark')(localStorage.getItem('theme') as Theme)
};

componentDidMount() {
startSendingRandomLetters(() => this.newMail())
}

allSelected = () => {
return this.state.letters.every(x => x.selected ? x.selected : false);
};

toggleAll = () => {
const cur = this.allSelected();
this.setState(({ letters, theme }) => {
const allSelected = letters.map(({ selected, ...fields }) => {
return {
selected: !cur,
...fields
};
});
return { letters: allSelected, theme };
});
};

deleteSelected = () => {
const deletedKeys = this.state.letters.filter(x => !!x.selected).map(x => x.key);
this.setState(({ letters, theme }) => {
const after = letters.map(({ selected, ...rest }) => {
if (selected) {
return {
deleted: true,
...rest
};
}
return {
...rest
};
});
return { letters: after, theme };
});
setTimeout(() => {
this.setState(({ letters, theme }) => {
const newLetters = letters.filter(({ key }) => !deletedKeys.includes(key));
return { letters: newLetters, theme };
});
}, 500);
};

newMail = () => {
this.setState(({ letters: [...oldLetters], theme }) => {
const newLetter = generateLetter();
setTimeout(() => newLetter.new = false, 500);
return {
letters: [newLetter, ...oldLetters], theme
};
});
};

newBatchMail = () => {
const newLetters = generate1000Letters();
setTimeout(() => {
newLetters.forEach(x => x.new = false);
}, 500);
this.setState(({ letters: [...oldLetters], theme }) => ({
letters: [...newLetters, ...oldLetters], theme
}))
};

toggleTheme = () => {
this.setState(({ theme, ...rest }) => {
const newTheme = theme === 'dark' ? 'light' : 'dark';
localStorage.setItem('theme', newTheme);
return {
...rest,
theme: newTheme
}
})
};

render() {
return (
<ThemeContext.Provider value={this.state.theme}>
<div className={getThemed(style.app, style, this.state.theme)}>
<Menu newMail={this.newMail} newBatchMail={this.newBatchMail} toggleTheme={this.toggleTheme} />
<Main
letters={this.state.letters}
deleteSelected={this.deleteSelected}
toggleAll={this.toggleAll}
allSelected={this.allSelected()}
/>
</div>
</ThemeContext.Provider>
);
}
}
71 changes: 71 additions & 0 deletions src/components/Finder/Finder.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
.finder {
width: 100%;
height: 36px;
padding: 14px 0;
}

.buttonClose {
width: 10px;
padding-left: 0;
margin: auto auto auto -25px;

border: none;
background-color: inherit;
border-radius: 3px;
font-size: 24px;
text-align: start;
transform: translateY(2px);
}

.buttonClose--light {
color: var(--tertiary);
}

.buttonClose--dark {
color: var(--tertiary--dark);
}

.buttonClose:hover {
cursor: pointer;
}

.buttonClose--light:hover {
color: var(--secondary);
}

.buttonClose--dark:hover {
color: var(--secondary--dark);
}

.input {
position: relative;

width: 40%;
height: 32px;
padding-right: 30px;
padding-left: 16px;
margin-left: 30%;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
font-size: 16px;
opacity: 0.5;
}

.input--light::placeholder {
color: var(--secondary);
}

.input--dark::placeholder {
color: var(--secondary--dark);
}

.input--light {
border: solid 1px var(--tertiary);
background-color: var(--primary-background);
color: var(--secondary);
}

.input--dark {
border: solid 1px var(--tertiary--dark);
background-color: var(--primary-background--dark);
color: var(--secondary--dark);
}
17 changes: 17 additions & 0 deletions src/components/Finder/Finder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React, { useContext } from 'react';

import { getThemed, ThemeContext } from '../theme';

import style from './Finder.module.css';

export const Finder = () => {
const theme = useContext(ThemeContext);
return (
<div className={style.finder}>
<input className={getThemed(style.input, style, theme)} placeholder="Поиск" type="text" />
<button className={getThemed(style.buttonClose, style, theme)} type="button">
&times;
</button>
</div>
);
};
21 changes: 21 additions & 0 deletions src/components/Hamburger/Hamburger.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.hamburger {
width: 20px;
height: 30px;
padding-top: 8px;
float: left;
}

.slice {
width: 20px;
height: 2px;
min-height: 2px;
margin-bottom: 5px;
}

.slice--light {
background-color: var(--primary);
}

.slice--dark {
background-color: var(--primary--dark);
}
17 changes: 17 additions & 0 deletions src/components/Hamburger/Hamburger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React, { useContext } from 'react';
import style from './Hamburger.module.css';

import { getThemed, ThemeContext } from '../theme';


export const Hamburger = () => {
const theme = useContext(ThemeContext);
const themed = getThemed(style.slice, style, theme);
return (
<div className={style.hamburger}>
<div className={themed} />
<div className={themed} />
<div className={themed} />
</div>
);
};
Loading