Skip to content

Commit

Permalink
Merge pull request #6 from sonuku092/Backend
Browse files Browse the repository at this point in the history
Backend
  • Loading branch information
sonuku092 authored Feb 24, 2024
2 parents 25761af + 70a1573 commit ecb92c5
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 61 deletions.
19 changes: 13 additions & 6 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "chatbot-backend",
"name": "backend",
"version": "0.0.1",
"description": "",
"author": "",
Expand Down Expand Up @@ -27,6 +27,7 @@
"@nestjs/platform-ws": "^10.2.3",
"@nestjs/websockets": "^10.2.5",
"axios": "^1.5.0",
"caseless": "^0.12.0",
"cors": "^2.8.5",
"express": "^4.18.2",
"firebase-admin": "^12.0.0",
Expand All @@ -41,6 +42,7 @@
"@nestjs/cli": "^10.0.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@types/caseless": "^0.12.5",
"@types/express": "^4.17.17",
"@types/jasmine": "^4.3.6",
"@types/jest": "^29.5.2",
Expand Down
18 changes: 9 additions & 9 deletions frontend/.firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ logo192.png,1707622405361,79e2b749561016bc8af300ea19f48347ceed3cb1a54f48ae456172
logo512.png,1707622405632,212b102aa09e51b3b3e06647e81f7801a61333e171f6582e8124379aabccb41d
manifest.json,1707622403656,ee04fb47e525c67d8424ffe9b4d8a8a24e434504478afca4e0ca602146836d4c
robots.txt,1707622406100,bfe106a3fb878dc83461c86818bf74fc1bdc7f28538ba613cd3e775516ce8b49
static/css/main.1e8bb69a.css,1707983385716,d749401a15e8ee5e150a0093a1f9a198dc0dadadde73526f50e0d93661238d8f
asset-manifest.json,1707983385697,8a4321e812c110b991048aeb8c3c1f9ef36da02b688992dc966eafc734ea0084
index.html,1707983385697,b417d1f5b538b6907aa34bc1a579a41a01a08a569bc540c998e58414bca3cf25
static/css/main.1e8bb69a.css.map,1707983385716,d71d0045faa91e9d16cdea3ca8e96b713312ae1f7c0ff6804949623e59c3595f
static/js/592.bf6ca574.chunk.js,1707983385716,ceb1a2891fce4a5d9b217bf1069e8cbcb4995bcc5c19135b57ca88faf4888f0d
static/js/592.bf6ca574.chunk.js.map,1707983385716,33c226d34291dd6423a33a5834e0a7b9e93d8c083785e5fe06c9c1cc089d4dd2
static/js/main.ffc6eb2a.js.LICENSE.txt,1707983385716,0d9df4c0c4d6a70297138fabfcd9c219d225b469455dd98cc647fd0e0765b985
static/js/main.ffc6eb2a.js,1707983385716,41a17f64bc5ac6b1087359186cce92b3b787edcc4720a5a90b55ae9393603e54
static/js/main.ffc6eb2a.js.map,1707983385716,93b24724cf8511a2191f6295ceead2bc562297ec2ee89e8ef668506e899e9232
index.html,1708777678730,4b5df53af3f1de0b583f2f9a96bad5be2be908bf269bdfdf3fadb136bb88d6fb
static/css/main.07a682d1.css,1708777678768,4af5ef12ab0b7131441941464efcfaba53d6bbbf3f4629fa6cb343a92d479b22
static/css/main.07a682d1.css.map,1708777678750,e453c36efb409214c28e41ac5aeed200bf2895b9ce003ffeac5d690140e61d5a
static/js/592.bf6ca574.chunk.js,1708777678751,ceb1a2891fce4a5d9b217bf1069e8cbcb4995bcc5c19135b57ca88faf4888f0d
static/js/592.bf6ca574.chunk.js.map,1708777678768,33c226d34291dd6423a33a5834e0a7b9e93d8c083785e5fe06c9c1cc089d4dd2
static/js/main.7db92d07.js.LICENSE.txt,1708777678751,cb277ff5bc4b194700e44480efc2f5958c09d4551502d4dc85c77d39674fe289
asset-manifest.json,1708777678731,a401745be6b1ae3ebb4aa308849f903ae93664e3bfb4251c0097b59664745f17
static/js/main.7db92d07.js,1708777678751,db78494e0e4410150121c7fc20e34c2fdbb3316bf6f9c8b4164109fb33e12d43
static/js/main.7db92d07.js.map,1708777678752,89135905772682d705a492af291af4365a3e0e3463f87044c922a9611b0c76d4
2 changes: 1 addition & 1 deletion frontend/src/components/Chats/Chats.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function Chats(props) {
<div className="h-screen">
<div className="w-full px-14 py-1 ">
<div className="flex gap-1">
<div className="flex-none px-10 max-h-max rounded-sm py-2 items-center">
<div className="flex-none px-4 max-h-max rounded-sm py-2 items-center ">
<h1>Chatbot</h1>
</div>
<div className="flex-grow max-h-max rounded-sm py-2">
Expand Down
19 changes: 19 additions & 0 deletions frontend/src/components/Chats/Chats.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.body{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh;
background-color: #f5f5f5;
}

button{
background-color: #f5f5f5;
cursor: pointer;
transition: all 0.3s ease;
}

button:hover{
background-color: #e0e0e0;
}

28 changes: 14 additions & 14 deletions frontend/src/components/Home/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ function Home(props) {
});

return (
<div className={styles.container}>
<div className={styles.intro}>
<div className={`${styles.container} md:flex`}>
<div className={`${styles.intro}`}>
<h1>Welcome to the Home Page</h1>
<p>
This is a simple authentication app built using React and Firebase.
</p>
</div>
<div className={styles.right}>
<div className={styles.Link}>
<h1>
Get started
</h1>
<h1>
<Link to="/login">Login</Link>
</h1>
<h1>
<Link to="/signup">Signup</Link>
</h1>
<h1>
Get started
</h1>
<div className={`${styles.Link} md:flex gap-1`}>
<Link to="/login">
<button>Login</button>
</Link>
<Link to="/signup">
<button>Sign up</button>
</Link>
</div>
<h2 className={styles["welcome-message"]}>
{props.name ? `Welcome - ${props.name}` : "Please Login"}
<h2 className=" text-2px mt-10">
Please login or signup to continue
</h2>
</div>
</div>
Expand Down
41 changes: 25 additions & 16 deletions frontend/src/components/Home/Home.module.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
/* Home.css */

/* Styles for the container */
body{
background-color: rgb(255, 255, 255);
/* font-family: Arial, sans-serif; */
font-family: 'Roboto', sans-serif;
margin: 0;
padding: 0;
box-sizing: border-box;
}

.container {
margin: 0 auto;
padding: 20px;
display: flex;
height: 100vh;
align-items: center;
justify-content: center;
}

.intro{
Expand All @@ -19,43 +23,48 @@ body{
display: flex;
flex-direction: column;
align-items: center;
border: 1px solid black;
}

/* Styles for the links */
.right {
width: 40%;
height: fit-content;
margin: 0 auto;
padding: 20px;
display: flex;
flex-direction: column;
align-items: center;
border: 1px solid black;
}

/* Styles for the buttons */
.button {
button {
width: 200px;
background-color: #007bff;
color: #fff;
border: none;
font-weight: 600;
padding: 10px 20px;
border-radius: 5px;
cursor: pointer;
}

.button:hover {
button:hover {
background-color: #0056b3;
}

/* Styles for the welcome message */
.welcome-message {
font-size: 24px;
margin-top: 20px;
.intro h1 {
/* Apply styles using a preprocessor like Sass or Less */
font-size: 3rem;
font-weight: bold;
margin-bottom: 20px;
}

/* Styles for the logout button */
.logout-button {
margin-top: 20px;
.intro p {
font-size: 1rem;
margin-bottom: 20px;
}

.right h1 {
font-size: 3rem;
font-weight: bold;
margin-bottom: 20px;
}

2 changes: 1 addition & 1 deletion frontend/src/components/Login/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function Login() {
Login
</button>
<p>
Already have an account?{' '}
If you don'n have an account?{' '}
<span>
<Link to="/signup"> Sign up</Link>
</span>
Expand Down
17 changes: 10 additions & 7 deletions frontend/src/components/Login/Login.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
display: flex;
justify-content: center;
align-items: center;
background-color: #f7feff;
}

.heading{
Expand Down Expand Up @@ -35,8 +36,9 @@
}

.footer .errorMsg {
font-weight: bold;
font-size: 0.875rem;
text-align: end;
font-weight: 500;
font-size: 12px;
color: #ff3300;
}

Expand All @@ -59,16 +61,17 @@
}

.footer button:hover {
background-color: rgb(3, 84, 57);
background-color: #0056b3;
}

.footer p {
font-weight: 700;
color: black;
text-align: center;
font-weight: 500;
color: rgb(59, 59, 59);
}

.footer p span a {
font-weight: bold;
.footer p span {
font-weight: 700;
color: #12aafc;
letter-spacing: 1px;
font-size: 1rem;
Expand Down
21 changes: 15 additions & 6 deletions frontend/src/components/Signup/Signup.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
.body{
margin: 0;
padding: 0;
font-family: 'Poppins', sans-serif;
background: #f2f2f2;
}

.container {
height: 100%;
min-height: 100vh;
width: 100%;
background: white;
background: #f7feff;
display: flex;
justify-content: center;
align-items: center;
Expand Down Expand Up @@ -35,8 +42,9 @@
}

.footer .errorMsg{
font-weight: bold;
font-size: 0.875rem;
text-align: end;
font-weight: 500;
font-size: 12px;
color: #ff3300;
}
.footer button{
Expand All @@ -59,12 +67,13 @@
}

.footer button:hover{
background-color: rgb(3, 84, 57);
background-color: rgb(32, 158, 255);
}

.footer p{
font-weight: 700;
color: black;
text-align: center;
font-weight: 500;
color: rgb(59, 59, 59);
}
.footer p span a{
font-weight: bold;
Expand Down

0 comments on commit ecb92c5

Please sign in to comment.