Skip to content

Commit b42f18a

Browse files
committed
responsive home + email domains
1 parent 510d131 commit b42f18a

File tree

6 files changed

+90
-32
lines changed

6 files changed

+90
-32
lines changed

package-lock.json

Lines changed: 51 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "fintrack",
2+
"name": "fintracker",
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
@@ -14,6 +14,7 @@
1414
"@testing-library/jest-dom": "^5.11.4",
1515
"@testing-library/react": "^11.1.0",
1616
"@testing-library/user-event": "^12.1.10",
17+
"@types/react-router-dom": "^5.3.3",
1718
"bootstrap": "^5.2.3",
1819
"firebase": "^8.6.1",
1920
"framer-motion": "^4",
@@ -52,4 +53,4 @@
5253
"last 1 safari version"
5354
]
5455
}
55-
}
56+
}

src/App.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Team from "./pages/Team";
1414
import GroupTransaction from "./pages/Transaction/GroupTransaction";
1515
import UserTransaction from "./pages/Transaction/UserTransaction";
1616
import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
17-
import './App.css'
17+
import './App.css';
1818

1919

2020
function App() {
@@ -34,6 +34,7 @@ function App() {
3434
<Route path="/forgot-password" component={ForgotPassword} />
3535
<Route path="/reset-password" component={ResetPassword} />
3636
<Route path="/team" component={Team} />
37+
<Route path="*" element={()=> "404"}/>
3738
</Switch>
3839
</div>
3940
<Footer />

src/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import "./index.css";
66
import App from "./App";
77
import reportWebVitals from "./reportWebVitals";
88
import { AuthProvider } from "./components/Authentication/AuthProvider";
9-
import "./index.css"
109

1110
ReactDOM.render(
1211
<React.StrictMode>

src/pages/Home/index.js

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useContext, useEffect, useState } from "react";
2-
import { Container } from "react-bootstrap";
2+
import { Col, Container, Row } from "react-bootstrap";
33
import Card from "../../components/Card";
44
import AddGroup from "./Sections/AddGroup";
55
import GroupCard from "./Sections/GroupCard";
@@ -73,30 +73,38 @@ const Home = () => {
7373
return (
7474
<>
7575
<Container id="feedback">
76-
<Card
77-
className="fbcard"
78-
imgUrl={img3}
79-
head="Total Expenditure"
80-
text={`₹ ${amount.total}`}
81-
textColor={'info'}
82-
link="/transaction"
83-
/>
84-
<Card
85-
className="fbcard"
86-
imgUrl={img2}
87-
head="I OWE PEOPLE"
88-
text={`₹ ${amount.iOwe}`}
89-
textColor={'danger'}
90-
link="/transaction"
91-
/>
92-
<Card
93-
className="fbcard"
94-
imgUrl={img1}
95-
head="PEOPLE OWE ME"
96-
text={`₹ ${amount.peopleOwe}`}
97-
textColor={'success'}
98-
link="/user"
99-
/>
76+
<Row>
77+
<Col>
78+
<Card
79+
className="fbcard"
80+
imgUrl={img3}
81+
head="Total Expenditure"
82+
text={`₹ ${amount.total}`}
83+
textColor={'info'}
84+
link="/transaction"
85+
/>
86+
</Col>
87+
<Col>
88+
<Card
89+
className="fbcard"
90+
imgUrl={img2}
91+
head="I OWE PEOPLE"
92+
text={`₹ ${amount.iOwe}`}
93+
textColor={'danger'}
94+
link="/transaction"
95+
/>
96+
</Col>
97+
<Col>
98+
<Card
99+
className="fbcard"
100+
imgUrl={img1}
101+
head="PEOPLE OWE ME"
102+
text={`₹ ${amount.peopleOwe}`}
103+
textColor={'success'}
104+
link="/user"
105+
/>
106+
</Col>
107+
</Row>
100108
</Container>
101109
<br />
102110
<Container id="content">

src/utils/validator/loginResolver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const loginSchema = Joi.object({
55
email: Joi.string()
66
.email({
77
minDomainSegments: 2,
8-
tlds: { allow: ["com", "net"] },
8+
tlds: { allow: ["com", "net", "dev", "co", "in"] },
99
})
1010
.message("Please enter a valid email"),
1111
password: Joi.string()

0 commit comments

Comments
 (0)