Got rid of scss files, fixet time format
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2022-03-19 15:41:32 +03:00
parent 76bf04f8de
commit 4f54d08666
11 changed files with 64 additions and 40 deletions

View File

@@ -1,9 +1,16 @@
import { Component } from 'react' import { Component } from 'react'
import { Box } from '@mui/material'
export default class Footer extends Component { export default class Footer extends Component {
render () { render () {
return ( return (
<div>Footer</div> <Box
sx={{
p: 12
}}
>
Warframe Center is not associated with Digital Extremes
</Box>
) )
} }
} }

View File

@@ -1,5 +1,6 @@
import Head from 'next/head' import Head from 'next/head'
import Footer from './Footer' import Footer from './Footer'
import { YMInitializer } from 'react-yandex-metrika'
export default function Layout ({ children }) { export default function Layout ({ children }) {
return ( return (
@@ -7,6 +8,7 @@ export default function Layout ({ children }) {
<Head> <Head>
<title>Warframe Center</title> <title>Warframe Center</title>
<link rel='icon' href='/favicon.ico' /> <link rel='icon' href='/favicon.ico' />
<YMInitializer accounts={[87671663]} />
</Head> </Head>
<main>{children}</main> <main>{children}</main>
<Footer /> <Footer />

16
app/package-lock.json generated
View File

@@ -15,6 +15,7 @@
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-moment": "^1.1.1", "react-moment": "^1.1.1",
"react-yandex-metrika": "^2.6.0",
"reset-css": "^5.0.1", "reset-css": "^5.0.1",
"sass": "^1.49.9", "sass": "^1.49.9",
"shared-stuff": "file:../shared-stuff", "shared-stuff": "file:../shared-stuff",
@@ -3939,6 +3940,15 @@
"react-dom": ">=16.6.0" "react-dom": ">=16.6.0"
} }
}, },
"node_modules/react-yandex-metrika": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/react-yandex-metrika/-/react-yandex-metrika-2.6.0.tgz",
"integrity": "sha512-8K4wExsNZtY3DTxh1G8a+zWH9Pg8fw23MJcoJ4I/562qrHRnh7L5nteq3lnNL58dnNQbuuHIRoGgMjIo+r1GjA==",
"peerDependencies": {
"prop-types": "*",
"react": "*"
}
},
"node_modules/readable-stream": { "node_modules/readable-stream": {
"version": "2.3.7", "version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -7313,6 +7323,12 @@
"prop-types": "^15.6.2" "prop-types": "^15.6.2"
} }
}, },
"react-yandex-metrika": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/react-yandex-metrika/-/react-yandex-metrika-2.6.0.tgz",
"integrity": "sha512-8K4wExsNZtY3DTxh1G8a+zWH9Pg8fw23MJcoJ4I/562qrHRnh7L5nteq3lnNL58dnNQbuuHIRoGgMjIo+r1GjA==",
"requires": {}
},
"readable-stream": { "readable-stream": {
"version": "2.3.7", "version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",

View File

@@ -16,6 +16,7 @@
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-moment": "^1.1.1", "react-moment": "^1.1.1",
"react-yandex-metrika": "^2.6.0",
"reset-css": "^5.0.1", "reset-css": "^5.0.1",
"sass": "^1.49.9", "sass": "^1.49.9",
"shared-stuff": "file:../shared-stuff", "shared-stuff": "file:../shared-stuff",

View File

@@ -1,13 +1,22 @@
import { createTheme, ThemeProvider } from '@mui/material/styles'
import 'reset-css' import 'reset-css'
import '../styles/global.scss' import '../styles/global.scss'
import Layout from '../components/layout' import Layout from '../components/layout'
function MyApp ({ Component, pageProps }) { function App ({ Component, pageProps }) {
const lightTheme = createTheme({
palette: {
mode: 'light'
}
})
return ( return (
<ThemeProvider theme={lightTheme}>
<Layout> <Layout>
<Component {...pageProps} /> <Component {...pageProps} />
</Layout> </Layout>
</ThemeProvider>
) )
} }
export default MyApp export default App

View File

@@ -1,13 +1,23 @@
import { Component } from 'react' import { Component } from 'react'
import Image from 'next/image' import Image from 'next/image'
import styles from './Hero.module.scss' import { Box } from '@mui/material'
import logo from './assets/warframe_logo.png' import logo from './assets/warframe_logo.png'
export default class Hero extends Component { export default class Hero extends Component {
render () { render () {
return ( return (
<div className={styles.hero}> <Box
<div className={styles.logo}> sx={{
py: 12,
textAlign: 'center'
}}
>
<Box
sx={{
width: 400,
m: 'auto'
}}
>
<Image <Image
src={logo} src={logo}
alt='logo' alt='logo'
@@ -15,12 +25,17 @@ export default class Hero extends Component {
width={500} width={500}
height={300} height={300}
/> />
</div> </Box>
<div className={styles.text}> <Box
sx={{
width: 400,
m: 'auto'
}}
>
<h1>Market Gaps</h1> <h1>Market Gaps</h1>
<p>Find a profitable difference between the price of the set and the price of the sum of it's parts.</p> <p>Find a profitable difference between the price of the set and the price of the sum of it's parts.</p>
</div> </Box>
</div> </Box>
) )
} }
} }

View File

@@ -1,23 +0,0 @@
.hero {
width: 100%;
padding: 128px 0;
position: relative;
background: white;
text-align: center;
overflow: hidden;
.text, .logo {
width: 400px;
margin: auto;
}
.logo {
img {
object-fit: contain;
}
}
.text {
}
}

View File

@@ -32,7 +32,7 @@ export default class Table extends Component {
</Link> </Link>
<Typography variant='caption' display='block'> <Typography variant='caption' display='block'>
<Moment <Moment
format='DD.MM hh:mm' format='DD.MM HH:mm'
> >
{cellValues.row.updatedAt} {cellValues.row.updatedAt}
</Moment> </Moment>

View File

@@ -1 +0,0 @@
$clr-text: #1f1f1f;

View File

@@ -1,2 +1 @@
@import './fonts'; @import './fonts';
@import './colors';

View File

@@ -5,7 +5,6 @@ body {
padding: 0; padding: 0;
margin: 0; margin: 0;
font: $font-r4; font: $font-r4;
color: $clr-text;
} }
* { * {