Skip to content

Commit e4fb317

Browse files
weaponsforgeweaponsforge
authored
Merge pull request #13 from weaponsforge/wip/weaponsforge-5
Feature/weaponsforge 5
2 parents 42244bb + b870865 commit e4fb317

File tree

26 files changed

+797
-135
lines changed

26 files changed

+797
-135
lines changed

‎client/jsconfig.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
22
"compilerOptions": {
33
"paths": {
4-
"@/*": ["./src/*"]
4+
"@/*": ["./src/*"],
5+
"@/hooks/*": ["./src/lib/hooks/*"],
6+
"@/public/*": ["./public/*"],
7+
"@/services/*": ["./src/lib/services/*"],
8+
"@/store/*": ["./src/lib/store/*"],
9+
"@/utils/*": ["./src/lib/utils/*"]
510
}
611
}
712
}

‎client/package-lock.json‎

Lines changed: 154 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
"export": "npm run build && next export"
1616
},
1717
"dependencies": {
18+
"@reduxjs/toolkit": "^1.9.3",
1819
"eslint": "8.36.0",
1920
"eslint-config-next": "13.2.4",
2021
"next": "13.2.4",
2122
"react": "18.2.0",
22-
"react-dom": "18.2.0"
23+
"react-dom": "18.2.0",
24+
"react-redux": "^8.0.5"
2325
}
2426
}

‎client/src/common/layout/head/index.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Head from 'next/head'
2+
3+
export default function HeadComponent () {
4+
return (
5+
<Head>
6+
<title>React Hooks Playground</title>
7+
<meta name="description" content="React Hooks Playground" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1" />
9+
<link rel="icon" href="/favicon.ico" />
10+
</Head>
11+
)
12+
}

‎client/src/common/layout/page/index.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import HeadComponent from '../head'
2+
3+
export default function Page ({ children }) {
4+
return (
5+
<div style={{
6+
height: '100vh',
7+
width: '100%' }}
8+
>
9+
<HeadComponent />
10+
{ children }
11+
</div>
12+
)
13+
}

‎client/src/common/ui/card/Card.module.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.card {
2+
border: 1px solid;
3+
min-width: 400px;
4+
max-width: 600px;
5+
min-height: 100px;
6+
border-radius: 16px;
7+
padding: 16px;
8+
}

‎client/src/common/ui/card/index.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import styles from './Card.module.css'
2+
3+
function Card ({ children }) {
4+
return (
5+
<div className={styles.card}>
6+
{children}
7+
</div>
8+
)
9+
}
10+
11+
export default Card

‎client/src/styles/Home.module.css‎ renamed to ‎client/src/components/home/Home.module.css‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.main {
2-
display: flex;
3-
flex-direction: column;
4-
justify-content: space-between;
5-
align-items: center;
2+
3+
height: 100vh;
4+
display: grid;
5+
place-content: center;
66
padding: 6rem;
7-
min-height: 100vh;
7+
88
}
99

1010
.description {
@@ -16,6 +16,7 @@
1616
width: 100%;
1717
z-index: 2;
1818
font-family: var(--font-mono);
19+
margin: auto;
1920
}
2021

2122
.description a {
@@ -72,6 +73,11 @@
7273
max-width: 30ch;
7374
}
7475

76+
.h2 {
77+
text-align: center;
78+
margin-bottom: 24px;
79+
}
80+
7581
.center {
7682
display: flex;
7783
justify-content: center;

‎client/src/components/home/index.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import Link from 'next/link'
2+
import Page from '@/common/layout/page'
3+
4+
import { Inter } from 'next/font/google'
5+
import styles from './Home.module.css'
6+
import navlinks from './items.json'
7+
8+
const inter = Inter({ subsets: ['latin'] })
9+
10+
export default function HomeComponent() {
11+
return (
12+
<Page>
13+
<main className={styles.main}>
14+
<div className={styles.description}>
15+
<div className={styles.h2}>
16+
<h1 className={inter.className}>
17+
React Hooks Playground
18+
</h1>
19+
</div>
20+
21+
{navlinks.map((item, index) => (
22+
<Link href={item.link} key={index} className={styles.card}>
23+
{item.name}
24+
</Link>
25+
))}
26+
</div>
27+
</main>
28+
</Page>
29+
)
30+
}

‎client/src/components/home/items.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[
2+
{
3+
"name": "useSyncExternalStore",
4+
"link": "/usesyncexternalstore"
5+
},
6+
{
7+
"name": "redux toolkit",
8+
"link": "/redux"
9+
},
10+
{
11+
"name": "useState",
12+
"link": "/usestate"
13+
}
14+
]

0 commit comments

Comments
 (0)