Skip to content

Commit

Permalink
Merge pull request #7 from TusharSSurve/test
Browse files Browse the repository at this point in the history
[test] : Foundation
  • Loading branch information
TusharSSurve authored Apr 17, 2024
2 parents 96a4e2a + 3835859 commit 9a35941
Show file tree
Hide file tree
Showing 10 changed files with 83 additions and 61 deletions.
38 changes: 0 additions & 38 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,38 +0,0 @@
.App {
text-align: center;
}

.App-logo {
height: 40vmin;
pointer-events: none;
}

@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}

.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}

.App-link {
color: #61dafb;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
3 changes: 2 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { createBrowserRouter, RouterProvider } from "react-router-dom";
import ErrorPage from "./pages/ErrorPage";
import Homepage from "./pages/Homepage";
import Root from "./pages/Root";

const router = createBrowserRouter([
{
path: "/",
Expand All @@ -16,7 +17,7 @@ const router = createBrowserRouter([
},
]);

function App() {
const App = () => {
return <RouterProvider router={router} />;
}

Expand Down
10 changes: 10 additions & 0 deletions src/global/Footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react";

const Footer = () => {
return (
<footer>
<h1>Footer</h1>
</footer>
);
}
export default Footer;
Empty file added src/global/Footer.module.css
Empty file.
10 changes: 10 additions & 0 deletions src/global/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react";

const Header = () => {
return (
<header>
<h1>Header</h1>
</header>
);
}
export default Header;
Empty file added src/global/Header.module.css
Empty file.
53 changes: 44 additions & 9 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,48 @@
:root {
/*colors*/
--white-color: #f5f5f7;
--black-color: #1d1d1f;
--warm-black: #171717;
--grey-color: #444445;
--neon-orange-color: #FF5F1F;

/* fonts */
--font-64: 64px;
--font-56: 56px;
--font-48: 48px;
--font-36: 36px;
--font-32: 32px;
--font-28: 28px;
--font-26: 26px;
--font-24: 24px;
--font-22: 22px;
--font-20: 20px;
--font-18: 18px;
--font-16: 16px;
--font-12: 12px;

/*font weight*/
--font-weight-400: 400;
--font-weight-500: 500;
--font-weight-700: 700;
--font-weight-800: 800;

/*line height*/
--line-height-25: 25px;
--line-height-33: 33px;
--line-height-36: 36px;
--line-height-38: 38px;
--line-height-40: 40px;
--line-height-30: 30px;
--line-height-17: 17.5px;
--line-height-19: 19px;

/*font*/

}

body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}
}
2 changes: 1 addition & 1 deletion src/pages/ErrorPage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";

function ErrorPage() {
const ErrorPage = () => {
return (
<>
<h1>404 Error Page</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Homepage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";

function Homepage() {
const Homepage = () => {
return (
<>
<h1>Homepage</h1>
Expand Down
26 changes: 15 additions & 11 deletions src/pages/Root.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import React from 'react';
import { Outlet } from 'react-router-dom';
import Footer from '../global/Footer';
import Header from '../global/Header';

function Root() {
return (
<>
<main>
<Outlet />
</main>
</>
);
}

export default Root;
const Root = () => {
return (
<>
<Header />
<main>
<Outlet />
</main>
<Footer />
</>
);
}

export default Root;

0 comments on commit 9a35941

Please sign in to comment.