Compare commits
No commits in common. "e21b41f9ca410109cf3dbe9fac90ee3ee04ae19e" and "65216843ac78e74359915aa5ef30526251649515" have entirely different histories.
e21b41f9ca
...
65216843ac
4
index.d.ts
vendored
4
index.d.ts
vendored
@ -1,6 +1,4 @@
|
|||||||
declare module '*.svg' {
|
declare module '*.svg' {
|
||||||
const src: string;
|
const src: string;
|
||||||
export default src;
|
export default src;
|
||||||
}
|
}
|
||||||
|
|
||||||
declare const __webpack_public_path__: string;
|
|
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "journal.pl",
|
"name": "journal.pl",
|
||||||
"version": "3.1.1",
|
"version": "3.1.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "journal.pl",
|
"name": "journal.pl",
|
||||||
"version": "3.1.1",
|
"version": "3.1.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brojs/cli": "^0.0.4-alpha.9",
|
"@brojs/cli": "^0.0.4-alpha.9",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "journal.pl",
|
"name": "journal.pl",
|
||||||
"version": "3.1.1",
|
"version": "3.1.0",
|
||||||
"description": "bro-js platform journal ui repo",
|
"description": "bro-js platform journal ui repo",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
32
src/app.tsx
32
src/app.tsx
@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Helmet } from 'react-helmet';
|
import { Helmet } from 'react-helmet';
|
||||||
import { Global, css } from '@emotion/react'
|
import { Global, css } from '@emotion/react'
|
||||||
import { BrowserRouter } from 'react-router-dom';
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
import ruLocale from 'dayjs/locale/ru';
|
import ruLocale from 'dayjs/locale/ru';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
@ -10,15 +10,16 @@ import { Dashboard } from './dashboard';
|
|||||||
|
|
||||||
dayjs.locale('ru', ruLocale);
|
dayjs.locale('ru', ruLocale);
|
||||||
|
|
||||||
const App = ({ store }) => (
|
const App = ({ store }) => {
|
||||||
<ChakraProvider>
|
return(
|
||||||
<BrowserRouter>
|
<ChakraProvider>
|
||||||
<Helmet>
|
<BrowserRouter>
|
||||||
<meta name="viewport" content="width=device-width, user-scalable=no" />
|
<Helmet>
|
||||||
<title>Журнал</title>
|
<meta name="viewport" content="width=device-width, user-scalable=no" />
|
||||||
</Helmet>
|
<title>Журнал</title>
|
||||||
<Global
|
</Helmet>
|
||||||
styles={css`
|
<Global
|
||||||
|
styles={css`
|
||||||
html {
|
html {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
@ -75,11 +76,12 @@ const App = ({ store }) => (
|
|||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
`}
|
`}
|
||||||
/>
|
/>
|
||||||
<Dashboard store={store} />
|
<Dashboard store={store} />
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</ChakraProvider>
|
</ChakraProvider>
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user