Unmei/Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change npm to yarn; some changes

Browse Source
This commit is contained in:
ScuroNeko
2020-10-29 22:17:01 +03:00
parent 438868b58c
commit 05c8f36bda
12 changed files with 12107 additions and 16915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
-16884
View File
File diff suppressed because it is too large Load Diff
package.json
+15 -11
View File
@@ -6,27 +6,31 @@
"@fortawesome/fontawesome-svg-core": "1.2.32", "@fortawesome/fontawesome-svg-core": "1.2.32",
"@fortawesome/free-brands-svg-icons": "5.15.1", "@fortawesome/free-brands-svg-icons": "5.15.1",
"@fortawesome/free-solid-svg-icons": "5.15.1", "@fortawesome/free-solid-svg-icons": "5.15.1",
"@fortawesome/react-fontawesome": "0.1.11", "@fortawesome/react-fontawesome": "0.1.12",
"@sentry/browser": "5.26.0", "@sentry/react": "5.27.2",
"bbcode-to-react": "0.2.9", "bbcode-to-react": "0.2.9",
"react": "16.14.0", "react": "17.0.1",
"react-dom": "16.14.0", "react-dom": "17.0.1",
"react-loader-spinner": "3.1.14", "react-loader-spinner": "3.1.14",
"redux": "4.0.5", "redux": "4.0.5",
"react-redux": "7.2.1", "react-redux": "7.2.2",
"react-router-dom": "5.2.0" "react-router-dom": "5.2.0",
"eruda": "2.4.1",
"eruda-dom": "2.0.0",
"eruda-memory": "2.0.0",
"eruda-features": "2.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "14.11.8", "@types/node": "14.14.6",
"@types/react": "16.9.52", "@types/react": "16.9.55",
"@types/react-dom": "16.9.8", "@types/react-dom": "16.9.9",
"@types/react-redux": "7.1.9", "@types/react-redux": "7.1.9",
"@types/react-router-dom": "5.1.6", "@types/react-router-dom": "5.1.6",
"@types/react-transition-group": "4.4.0", "@types/react-transition-group": "4.4.0",
"node-sass": "4.14.1", "node-sass": "4.14.1",
"redux-devtools-extension": "2.13.8", "redux-devtools-extension": "2.13.8",
"typescript": "4.0.3", "typescript": "4.0.5",
"react-scripts": "3.4.3" "react-scripts": "4.0.0"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
public/index.html
+1 -1
View File
@@ -2,7 +2,7 @@
<html lang="ru"> <html lang="ru">
<head> <head>
<title>Unmei</title> <title>Unmei</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://www.google.com/recaptcha/api.js" async defer></script> <script src="https://www.google.com/recaptcha/api.js" async defer></script>
src/api/api.ts
-3
View File
@@ -29,15 +29,12 @@ async function request<T>(url: string, method: string, body?: string | FormData)
function get<T>(url: string, data?: object): Promise<T> { function get<T>(url: string, data?: object): Promise<T> {
return request<T>(url, 'GET', JSON.stringify(data)); return request<T>(url, 'GET', JSON.stringify(data));
} }
function post<T>(url: string, data?: object | FormData): Promise<T> { function post<T>(url: string, data?: object | FormData): Promise<T> {
return request(url, 'POST', data instanceof FormData ? data : JSON.stringify(data)); return request(url, 'POST', data instanceof FormData ? data : JSON.stringify(data));
} }
function put<T>(url: string, data?: object): Promise<T> { function put<T>(url: string, data?: object): Promise<T> {
return request<T>(url, 'PUT', JSON.stringify(data)); return request<T>(url, 'PUT', JSON.stringify(data));
} }
function del<T>(url: string, data?: object): Promise<T> { function del<T>(url: string, data?: object): Promise<T> {
return request<T>(url, 'DELETE', JSON.stringify(data)); return request<T>(url, 'DELETE', JSON.stringify(data));
} }
src/index.tsx
+9 -3
View File
@@ -1,14 +1,20 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { BrowserRouter } from "react-router-dom"; import { BrowserRouter} from "react-router-dom";
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import store from "./store/store"; import store from "./store/store";
import * as Sentry from '@sentry/browser'; import * as Sentry from '@sentry/react';
import App from './pages/App/App'; import App from './pages/App/App';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
// @ts-ignore
import eruda from 'eruda';
if(process.env.NODE_ENV === 'production') if(process.env.NODE_ENV === 'production')
Sentry.init({ dsn: "https://27a5473611834ece9aca26216d79ad86@sentry.io/1810028" }); Sentry.init({
dsn: "https://27a5473611834ece9aca26216d79ad86@sentry.io/1810028"
});
eruda.init();
ReactDOM.render( ReactDOM.render(
<BrowserRouter> <BrowserRouter>
src/pages/App/App.tsx
+2 -1
View File
@@ -27,6 +27,7 @@ import { getVersion, version } from "../../api/api";
import Settings from "../User/Settings/Settings"; import Settings from "../User/Settings/Settings";
import { setUser } from "../../store/ducks/currentUser"; import { setUser } from "../../store/ducks/currentUser";
import { setSettings } from "../../store/ducks/userSettings"; import { setSettings } from "../../store/ducks/userSettings";
import { withProfiler } from "@sentry/react";
type Props = { type Props = {
notifications: React.ReactNode[] notifications: React.ReactNode[]
@@ -138,4 +139,4 @@ export default connect(
setUser: (userData: UserType) => dispatch(setUser(userData)), setUser: (userData: UserType) => dispatch(setUser(userData)),
setSettings: (settings: UserSettingsType) => dispatch(setSettings(settings)) setSettings: (settings: UserSettingsType) => dispatch(setSettings(settings))
}) })
)(App); )(withProfiler(App));
src/pages/Modals/LoginModal.tsx
+1 -1
View File
@@ -47,7 +47,7 @@ class LoginModal extends React.Component<Props, State> {
setUser(user); setUser(user);
const successful = ( const successful = (
<NotificationMessage level={"success"}> <NotificationMessage level={"success"} position={"center"}>
Ты успешно вошел! Ты успешно вошел!
</NotificationMessage> </NotificationMessage>
); );
src/pages/Navbar/Navbar.tsx
+3 -4
View File
@@ -31,13 +31,12 @@ class Navbar extends React.Component<Props, State> {
this.props.logout(); this.props.logout();
localStorage.removeItem('user'); localStorage.removeItem('user');
localStorage.removeItem('theme'); localStorage.removeItem('theme');
document.querySelector('body')!!.removeAttribute('theme'); document.body.removeAttribute('theme');
userLogout().catch(() => { userLogout().catch(() => {});
});
}; };
changeSize = () => { changeSize = () => {
this.setState({ expand: !this.state.expand }) this.setState({ expand: !this.state.expand });
} }
componentDidMount() { componentDidMount() {
src/pages/Novel/Novel.tsx
+2 -1
View File
@@ -125,12 +125,13 @@ class Novel extends React.Component<Props, State> {
this.setState({ errorCode: err.code }); this.setState({ errorCode: err.code });
}); });
if(currentUser.authorized) if(currentUser.authorized) {
fetchUserNovel(currentUser.id, params.novelId).then((userData: UserNovelType) => { fetchUserNovel(currentUser.id, params.novelId).then((userData: UserNovelType) => {
this.setState({ userData }); this.setState({ userData });
}).catch((err: ApiError) => { }).catch((err: ApiError) => {
if(err.code !== 100) console.error(err.text); if(err.code !== 100) console.error(err.text);
}); });
}
} }
updateNovelMark = (mark: number) => { updateNovelMark = (mark: number) => {
src/store/store.ts
+7 -4
View File
@@ -1,9 +1,12 @@
import { createStore } from "redux"; import { createStore } from "redux";
import { composeWithDevTools } from "redux-devtools-extension"; import { composeWithDevTools } from "redux-devtools-extension";
import reducers from "./ducks/index"; import reducers from "./ducks/index";
import * as Sentry from "@sentry/react";
const composeEnhancers = composeWithDevTools({ const composeEnhancers = composeWithDevTools({ trace: true });
trace: true const sentryReduxEnhancer = Sentry.createReduxEnhancer({});
});
const store = process.env.NODE_ENV === 'development' ? createStore(reducers, composeEnhancers()) : createStore(reducers); const store = process.env.NODE_ENV === 'development'
? createStore(reducers, composeEnhancers())
: createStore(reducers, sentryReduxEnhancer);
export default store; export default store;
src/ui/Notifications/NotificationMessage.tsx
+2 -2
View File
@@ -6,7 +6,7 @@ type Props = {
children: React.ReactNode children: React.ReactNode
level?: 'info' | 'success' | 'error' level?: 'info' | 'success' | 'error'
hideTime?: number hideTime?: number
position?: 'left' | 'bottom' | 'right' position?: 'left' | 'center' | 'right'
} & React.DetailedHTMLProps<React.AllHTMLAttributes<HTMLDivElement>, HTMLDivElement> } & React.DetailedHTMLProps<React.AllHTMLAttributes<HTMLDivElement>, HTMLDivElement>
type State = { type State = {
@@ -77,7 +77,7 @@ class NotificationMessage extends React.Component<Props, State> {
case "left": case "left":
Object.assign(style, { bottom: 0, left: 0 }); Object.assign(style, { bottom: 0, left: 0 });
break; break;
case "bottom": case "center":
Object.assign(style, { bottom: 0, left: '50%', transform: 'translateX(-50%)' }); Object.assign(style, { bottom: 0, left: '50%', transform: 'translateX(-50%)' });
break; break;
case "right": case "right":
yarn.lock
+12065
View File
File diff suppressed because it is too large Load Diff