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: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
webpack.config.js
*.d.ts
403 changes: 145 additions & 258 deletions dist/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/main.js.map

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"react-dom": "^17.0.1"
},
"devDependencies": {
"@svgr/webpack": "^5.4.0",
"@types/classnames": "^2.2.11",
"@types/react": "^16.9.55",
"@types/react-dom": "^16.9.9",
Expand All @@ -46,8 +47,10 @@
"sass-loader": "^10.0.5",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.7",
"typed-scss-modules": "^3.3.0",
"typescript": "^4.0.5",
"typescript-plugin-css-modules": "^2.8.0",
"url-loader": "^4.1.1",
"webpack": "^4.44.2",
"webpack-cli": "^4.1.0",
"webpack-dev-server": "^3.11.0"
Expand All @@ -58,7 +61,7 @@
}
},
"lint-staged": {
"src/**/*.{js,jsx,ts,tsx,json,css}": [
"src/**/*.{js,jsx,ts,tsx,json}": [
"pretty-quick --staged",
"eslint ./src"
]
Expand Down
8 changes: 2 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import React from 'react';

import s from './App.module.scss';
import Footer from './components/Footer';
import Header from './components/Header';
import HomePage from './pages/Home';

const App = () => {
return (
<div>
<Header />
<div className={s.content}>This is App Component!</div>
<Footer />
<HomePage />
</div>
);
};
Expand Down
6 changes: 6 additions & 0 deletions src/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$third: #f5db13;
$primary: #f2b807;
$second: #f28f16;
$danger: #d93e30;
$white: #f2f2f2;
$dark: #212121;
8 changes: 0 additions & 8 deletions src/components/Footer.module.scss

This file was deleted.

9 changes: 0 additions & 9 deletions src/components/Footer.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions src/components/Header.module.scss

This file was deleted.

10 changes: 0 additions & 10 deletions src/components/Header.tsx

This file was deleted.

64 changes: 64 additions & 0 deletions src/components/Header/Header.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
@import '../../variables';

.root {
height: 93px;
display: flex;
justify-content: center;
align-items: center;
}

.wrap {
width: 100%;
max-width: 1125px;
height: 63px;
display: flex;
justify-content: space-between;
align-items: center;
}

.pokemonLogo {
width: 158px;
height: 63px;
}

.menuWrap {
display: flex;
align-items: center;
max-width: 658px;
width: 100%;
justify-content: space-between;
}

.menuLink {
font-style: normal;
font-weight: normal;
font-size: 25px;
line-height: 29px;
color: $dark;
text-decoration: none;
position: relative;

&:after {
content: '';
display: block;
position: absolute;
bottom: -8px;
height: 1px;
width: 1%;
background: $dark;
border: 1px solid $dark;
border-radius: 6px;
opacity: 0;
left: 50%;
transform: translate(-50%, 0);
transition: opacity, width ease-in-out 0.25s;
}

&:hover,
&.activeLink {
&:after {
width: 100%;
opacity: 1;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
header: string;
'activeLink': string;
'menuLink': string;
'menuWrap': string;
'pokemonLogo': string;
'root': string;
'wrap': string;
}
export const cssExports: CssExports;
export default cssExports;
File renamed without changes
55 changes: 55 additions & 0 deletions src/components/Header/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import React from 'react';

import s from './Header.module.scss';

import { ReactComponent as PokemonLogoSvg } from './assets/Logo.svg';

interface IMenu {
id: number;
value: string;
link: string;
}

const MENU: IMenu[] = [
{
id: 1,
value: 'Home',
link: '#',
},
{
id: 2,
value: 'Pokédex',
link: '#',
},
{
id: 3,
value: 'Legendaries',
link: '#',
},
{
id: 4,
value: 'Documentation',
link: '#',
},
];

const Header = () => {
return (
<div className={s.root}>
<div className={s.wrap}>
<div className={s.pokemonLogo}>
<PokemonLogoSvg />
</div>
<div className={s.menuWrap}>
{MENU.map(({ value, link, id }, index) => (
<a key={id} href={link} className={s.menuLink}>
{value}
</a>
))}
</div>
</div>
</div>
);
};

export default Header;
12 changes: 9 additions & 3 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
* {
box-sizing: border-box;
}

html,
body {
min-height: 100vh;
background: linear-gradient(180deg, #F5DB13 0%, #F2B807 100%);
}
background: linear-gradient(180deg, #f5db13 0%, #f2b807 100%);
margin: 0;
padding: 0;
}
6 changes: 6 additions & 0 deletions src/pages/Home/Home.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import '../../variables';

.root {
min-height: 100vh;
background: linear-gradient(180deg, #third 0%, #primary 100%);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
footer: string;
'root': string;
}
export const cssExports: CssExports;
export default cssExports;
14 changes: 14 additions & 0 deletions src/pages/Home/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';
import Header from '../../components/Header';

import s from './Home.module.scss';

const HomePage = () => {
return (
<div className={s.root}>
<Header />
</div>
);
};

export default HomePage;
9 changes: 9 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ module.exports = {
path: path.resolve(__dirname, 'dist'),
filename: 'main.js',
},
watch: true,
watchOptions: {
ignored: /node_modules/,
poll: 1000,
},
module: {
rules: [
{
Expand Down Expand Up @@ -41,6 +46,10 @@ module.exports = {
'sass-loader',
],
},
{
test: /\.svg$/,
use: ['@svgr/webpack', 'url-loader'],
},
],
},
plugins: [
Expand Down
Loading