Skip to content

Commit

Permalink
Merge branch 'main' into Add/Animations
Browse files Browse the repository at this point in the history
  • Loading branch information
harshmishra19 committed May 29, 2024
2 parents 93ee58c + b5391f3 commit c2f1f39
Show file tree
Hide file tree
Showing 121 changed files with 200 additions and 70 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
permissions:
contents: write
pull-requests: write
issues: write
repository-projects: write
steps:
- uses: actions/checkout@v1
Expand All @@ -25,4 +26,4 @@ jobs:
Congratulations, @${{ github.actor }}! 🎉 Thank you for creating your issue. Your contribution is greatly appreciated, and we look forward to working with you to resolve the issue. Keep up the great work!
pr-message: |
Great job, @${{ github.actor }}! 🎉 Thank you for submitting your pull request. Your contribution is valuable, and we appreciate your efforts to improve our project.
footer: 'We will promptly review your changes and offer feedback. Keep up the excellent work! Kindly remember to check our [contributing guidelines](https://github.com/harshalhonde21/EcommerceSpectastyle/blob/main/README.md)'
footer: 'We will promptly review your changes and offer feedback. Keep up the excellent work! Kindly remember to check our [contributing guidelines](https://github.com/Nactore-Org/Nacto-Care/blob/main/CONTRIBUTING.md)'
2 changes: 0 additions & 2 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ fastapi==0.110.3
greenlet==3.0.3
h11==0.14.0
idna==3.7
pip==24.0
psycopg2==2.9.9
pydantic==2.7.1
pydantic_core==2.18.2
python-dotenv==1.0.1
pytz==2024.1
setuptools==65.5.0
sniffio==1.3.1
SQLAlchemy==2.0.29
SQLAlchemy-Utils==0.41.2
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en" class="scroll-smooth">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image" href="/assets/icon.png" />
<link rel="icon" type="image" href="/assets/icon.webp" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet">
<title>Nacto Care</title>
Expand Down
Binary file removed public/assets/Appstore.png
Binary file not shown.
Binary file added public/assets/Appstore.webp
Binary file not shown.
Binary file removed public/assets/C (1).webp
Binary file not shown.
Binary file removed public/assets/C (2).webp
Binary file not shown.
Binary file removed public/assets/C (3).webp
Binary file not shown.
Binary file removed public/assets/C (4).webp
Binary file not shown.
Binary file removed public/assets/C (5).webp
Binary file not shown.
Binary file removed public/assets/C (6).webp
Binary file not shown.
Binary file removed public/assets/C (7).webp
Binary file not shown.
Binary file removed public/assets/C (8).webp
Binary file not shown.
Binary file removed public/assets/C (9).webp
Binary file not shown.
Binary file removed public/assets/Clippathgroup.png
Binary file not shown.
Binary file added public/assets/Clippathgroup.webp
Binary file not shown.
Binary file removed public/assets/Cross.png
Binary file not shown.
Binary file added public/assets/Cross.webp
Binary file not shown.
Binary file removed public/assets/Currency.png
Binary file not shown.
Binary file added public/assets/Currency.webp
Binary file not shown.
Binary file removed public/assets/Drive.png
Binary file not shown.
Binary file added public/assets/Drive.webp
Binary file not shown.
Binary file removed public/assets/E (1).webp
Binary file not shown.
Binary file removed public/assets/E (10).webp
Binary file not shown.
Binary file removed public/assets/E (2).webp
Binary file not shown.
Binary file removed public/assets/E (3).png
Binary file not shown.
Binary file removed public/assets/E (4).webp
Binary file not shown.
Binary file removed public/assets/E (5).webp
Binary file not shown.
Binary file removed public/assets/E (6).webp
Binary file not shown.
Binary file removed public/assets/E (7).webp
Binary file not shown.
Binary file removed public/assets/E (8).webp
Binary file not shown.
Binary file removed public/assets/E (9).webp
Binary file not shown.
Binary file removed public/assets/Group 45 (1).png
Binary file not shown.
15 changes: 0 additions & 15 deletions public/assets/Nacto-Care-Logo/Nacto-CARE LOGO.svg

This file was deleted.

Binary file not shown.
Binary file removed public/assets/Nurse.png
Binary file not shown.
Binary file added public/assets/Nurse.webp
Binary file not shown.
Binary file removed public/assets/Select.png
Binary file not shown.
Binary file added public/assets/Select.webp
Binary file not shown.
11 changes: 0 additions & 11 deletions public/assets/Star.svg

This file was deleted.

Binary file added public/assets/Star.webp
Binary file not shown.
Binary file removed public/assets/Support.png
Binary file not shown.
Binary file added public/assets/Support.webp
Binary file not shown.
3 changes: 0 additions & 3 deletions public/assets/XMarkIcon.svg

This file was deleted.

Binary file added public/assets/XMarkIcon.webp
Binary file not shown.
Binary file removed public/assets/anytime.png
Binary file not shown.
Binary file added public/assets/anytime.webp
Binary file not shown.
Binary file removed public/assets/anytimehover.png
Binary file not shown.
Binary file added public/assets/anytimehover.webp
Binary file not shown.
Binary file removed public/assets/anywhere.png
Binary file not shown.
Binary file added public/assets/anywhere.webp
Binary file not shown.
Binary file removed public/assets/anywherehover.png
Binary file not shown.
Binary file added public/assets/anywherehover.webp
Binary file not shown.
Binary file removed public/assets/booknurse.png
Binary file not shown.
Binary file added public/assets/booknurse.webp
Binary file not shown.
Binary file removed public/assets/booknursehover.png
Binary file not shown.
Binary file added public/assets/booknursehover.webp
Binary file not shown.
Binary file removed public/assets/brand.avif
Binary file not shown.
Binary file added public/assets/brand.webp
Binary file not shown.
Binary file removed public/assets/care.png
Binary file not shown.
Binary file added public/assets/care.webp
Binary file not shown.
Binary file removed public/assets/careers.png
Binary file not shown.
Binary file added public/assets/careers.webp
Binary file not shown.
Binary file removed public/assets/caretaker.png
Binary file not shown.
Binary file added public/assets/caretaker.webp
Binary file not shown.
Binary file removed public/assets/customer.png
Binary file not shown.
Binary file added public/assets/customer.webp
Binary file not shown.
Binary file removed public/assets/dark.png
Binary file not shown.
Binary file added public/assets/dark.webp
Binary file not shown.
Binary file removed public/assets/debt.png
Binary file not shown.
Binary file added public/assets/debt.webp
Binary file not shown.
Binary file removed public/assets/empowering.png
Diff not rendered.
Binary file added public/assets/empowering.webp
Binary file not shown.
Binary file removed public/assets/en_badge_web_generic.png
Diff not rendered.
Binary file added public/assets/en_badge_web_generic.webp
Binary file not shown.
Binary file removed public/assets/group.png
Diff not rendered.
Binary file added public/assets/group.webp
Binary file not shown.
Binary file removed public/assets/guidelines.jpg
Diff not rendered.
Binary file added public/assets/guidelines.webp
Binary file not shown.
Binary file removed public/assets/health-insurance.png
Diff not rendered.
Binary file added public/assets/health-insurance.webp
Binary file not shown.
Binary file removed public/assets/health-professional.png
Diff not rendered.
Binary file added public/assets/health-professional.webp
Binary file not shown.
Binary file removed public/assets/hidden.png
Diff not rendered.
Binary file added public/assets/hidden.webp
Binary file not shown.
Binary file removed public/assets/icon.png
Diff not rendered.
Binary file added public/assets/icon.webp
Binary file not shown.
Binary file removed public/assets/india.png
Diff not rendered.
Binary file added public/assets/india.webp
Binary file not shown.
Binary file removed public/assets/light.png
Diff not rendered.
Binary file added public/assets/light.webp
Binary file not shown.
Binary file removed public/assets/nurseFlaticon.png
Diff not rendered.
Binary file added public/assets/nurseFlaticon.webp
Binary file not shown.
Binary file removed public/assets/nursecareer.png
Diff not rendered.
Binary file added public/assets/nursecareer.webp
Binary file not shown.
Binary file removed public/assets/nursecareerhover.png
Diff not rendered.
Binary file added public/assets/nursecareerhover.webp
Binary file not shown.
Binary file removed public/assets/nurses.png
Diff not rendered.
Binary file added public/assets/nurses.webp
Binary file not shown.
Binary file removed public/assets/ourstory.jpg
Diff not rendered.
Binary file added public/assets/ourstory.webp
Binary file not shown.
Binary file removed public/assets/reliable.png
Diff not rendered.
Binary file added public/assets/reliable.webp
Binary file not shown.
Binary file removed public/assets/times.png
Diff not rendered.
Binary file added public/assets/times.webp
Binary file not shown.
Binary file removed public/assets/up.png
Diff not rendered.
Binary file added public/assets/up.webp
Binary file not shown.
20 changes: 10 additions & 10 deletions src/Pages/AboutPage.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { useState } from "react";
import nurse from '../../public/assets/booknurse.png'
import nursehover from '../../public/assets/booknursehover.png'
import anywhere from '../../public/assets/anywhere.png'
import anywherehover from '../../public/assets/anywherehover.png'
import anytime from '../../public/assets/anytime.png'
import anytimehover from '../../public/assets/anytimehover.png'
import career from '../../public/assets/nursecareer.png'
import careerhover from '../../public/assets/nursecareerhover.png'
import nurse from '../../public/assets/booknurse.webp'
import nursehover from '../../public/assets/booknursehover.webp'
import anywhere from '../../public/assets/anywhere.webp'
import anywherehover from '../../public/assets/anywherehover.webp'
import anytime from '../../public/assets/anytime.webp'
import anytimehover from '../../public/assets/anytimehover.webp'
import career from '../../public/assets/nursecareer.webp'
import careerhover from '../../public/assets/nursecareerhover.webp'
import BackBtn from "../components/BackBtn/BackBtn";
import ourstory from '../../public/assets/ourstory.jpg'
import ourstory from '../../public/assets/ourstory.webp'
import "../styles/AboutPage.css"

const AboutPage = () => {
Expand Down Expand Up @@ -39,7 +39,7 @@ const AboutPage = () => {
</p>
</div>
<div className="">
<img src="/assets/group.png" width={400} height={400} alt="group" className="w-full lg:w-[35vw] rounded-xl" />
<img src="/assets/group.webp" width={400} height={400} alt="group" className="w-full lg:w-[35vw] rounded-xl" />
</div>
</div>

Expand Down
14 changes: 7 additions & 7 deletions src/Pages/BrandCenter.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import brand from "../../public/assets/brand.avif";
import guidelines from '../../public/assets/guidelines.jpg';
import care from '../../public/assets/care.png';
import caretaker from '../../public/assets/caretaker.png';
import reliable from '../../public/assets/reliable.png';
import brand from "../../public/assets/brand.webp";
import guidelines from '../../public/assets/guidelines.webp';
import care from '../../public/assets/care.webp';
import caretaker from '../../public/assets/caretaker.webp';
import reliable from '../../public/assets/reliable.webp';
import '../styles/BrandCenter.css';

const BrandCenter = () => {
Expand All @@ -25,12 +25,12 @@ const BrandCenter = () => {

<div className='flex flex-col lg:flex-row items-center justify-center lg:justify-between'>
<div className='w-full lg:w-2/5 flex items-start justify-center mb-8'>
<img width={70} src="\assets\icon.png" alt="Logo" className='h-2/3 w-2/3'/>
<img width={70} src="\assets\icon.webp" alt="Logo" className='h-2/3 w-2/3'/>
</div>
<div className='w-full lg:w-1/2'>
<h2 className='text-xl font-bold lg:text-3xl'>Download Brand Assets</h2><br/>
<p>Download our brand assets to access high-quality logos, images, fonts, and design elements. These assets adhere to our brand guidelines, ensuring consistency and professionalism in your communications. Whether you're creating posters, brochures, or digital content, our brand assets will help you maintain the integrity of our brand identity across all channels.</p><br/>
<a href="\assets\icon.png" className='text-blue-800 underline font-semibold link' download>Click here to Download Logo</a><br/>
<a href="\assets\icon.webp" className='text-blue-800 underline font-semibold link' download>Click here to Download Logo</a><br/>
</div>
</div>

Expand Down
8 changes: 4 additions & 4 deletions src/Pages/CareersPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function CareersPage() {
</div>
<div className="m-auto flex flex-col items-center">
<div className="m-auto object-contain my-0 px-12 sm:px-14 md:px-20 smd:px-14">
<img width={1000} src="\assets\careers.png" alt="careers" />
<img width={1000} src="\assets\careers.webp" alt="careers" />
</div>
<div className=" text-center smd:text-left smd:flex justify-between m-auto px-7 py-6 gap-11 mt-8 mb-5 ">
<div className="sm:px-[4vw]">
Expand All @@ -42,7 +42,7 @@ function CareersPage() {
<div className="flex flex-col gap-3 items-center smd:gap-5 smd:flex smd:flex-row max-w-[70ch] mb-4">
<div>
<img
src="\assets\empowering.png"
src="\assets\empowering.webp"
height={100}
width={100}
alt=""
Expand All @@ -61,7 +61,7 @@ function CareersPage() {
</div>
<div className="flex flex-col gap-3 items-center smd:gap-5 smd:flex smd:flex-row max-w-[70ch] mb-4">
<div>
<img src="\assets\times.png" height={100} width={100} alt="" className="w-[5rem] sm:w-[4rem] smd:w-[7rem] lg:w-[6rem] xl:w-[5rem]" />
<img src="\assets\times.webp" height={100} width={100} alt="" className="w-[5rem] sm:w-[4rem] smd:w-[7rem] lg:w-[6rem] xl:w-[5rem]" />
</div>
<div className="max-w-[70ch] mb-3">
<h2 className="text-zinc-700 font-bold text-xl sm:mb-2 smd:mb-0">
Expand All @@ -76,7 +76,7 @@ function CareersPage() {
</div>
<div className=" flex flex-col gap-3 items-center smd:gap-5 smd:flex smd:flex-row max-w-[70ch] mb-4">
<div>
<img src="\assets\up.png" height={100} width={100} className="w-[5rem] sm:w-[4rem] smd:w-[7rem] lg:w-[6rem] xl:w-[5rem]" />
<img src="\assets\up.webp" height={100} width={100} className="w-[5rem] sm:w-[4rem] smd:w-[7rem] lg:w-[6rem] xl:w-[5rem]" />
</div>
<div className="max-w-[70ch] mb-3">
<h2 className="text-zinc-700 font-bold text-xl sm:mb-2 smd:mb-0">
Expand Down
23 changes: 23 additions & 0 deletions src/Pages/Faq.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React, { useState } from 'react';
import '../styles/Faq.css';
import { questions } from '../components/FAQ/Faqdata';
import BackBtn from '../components/BackBtn/BackBtn';
import Faqpage from './Faqpage';

const Faq = () => {
const [data, setData] = useState(questions);
return (
<div className="py-8 mb-5 w-11/12 lg:w-[50vw] justify-start ml-auto mr-auto mt-10">
<BackBtn Page={"FAQ"} />
<div>
{
data.map((curr) => {
return <Faqpage key={curr.id} {...curr}/>
})
}
</div>
</div>
)
}

export default Faq
21 changes: 21 additions & 0 deletions src/Pages/Faqpage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React, { useState } from 'react'

const Faqpage = ({question, answer}) => {
const [show, setShow] = useState(false);
return (
<div>
<div className='main-heading' onClick={() => setShow(!show)}>
<p>
{show ? "➖" : "➕"}
</p>
<h3>{question}</h3>
</div>
{
show &&
<p className='answers'>{answer}</p>
}
</div>
)
}

export default Faqpage
20 changes: 16 additions & 4 deletions src/Pages/LandingPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function LandingPage() {
<img
width={400}
height={400}
src="/assets/Nurse.png"
src="/assets/Nurse.webp"
style={{ filter: "drop-shadow(0 0 0.25rem rgba(0, 0, 0, 0.3))" }}
alt="nurse"
className="w-[22rem] float"
Expand All @@ -76,7 +76,7 @@ function LandingPage() {
<div className="flex flex-col m-auto max-w-[75rem] lg:flex-row justify-evenly mt-14 lg:mt-28">
<div className="flex flex-col items-center">
<img
src="/assets/nurseFlaticon.png"
src="/assets/nurseFlaticon.webp"
width={130}
height={130}
className="block"
Expand All @@ -94,7 +94,7 @@ function LandingPage() {
{/* Contact Support */}
<div className="flex flex-col items-center mt-14 lg:mt-0">
<img
src="/assets/customer.png"
src="/assets/customer.webp"
width={130}
height={130}
className="block"
Expand All @@ -111,7 +111,7 @@ function LandingPage() {
{/* We Care for You */}
<div className="flex flex-col items-center mt-14 lg:mt-0">
<img
src="/assets/health-insurance.png"
src="/assets/health-insurance.webp"
width={130}
height={130}
className="block"
Expand Down Expand Up @@ -168,7 +168,11 @@ function LandingPage() {
<div className="flex flex-col gap-3 items-center smd:gap-5 smd:flex smd:flex-row max-w-[70ch] mb-4">
<div>
<img

src="/assets/health-professional.png"

src="\assets\health-professional.webp"

height={100}
width={100}
alt=""
Expand All @@ -187,7 +191,11 @@ function LandingPage() {
</div>
<div className="flex flex-col gap-3 items-center smd:gap-5 smd:flex smd:flex-row max-w-[70ch] mb-4">
<div>

<img src="/assets/debt.png" height={100} width={100} alt="" />

<img src="\assets\debt.webp" height={100} width={100} alt="" />

</div>
<div className="max-w-[70ch] mb-3">
<h2 className="text-zinc-700 font-bold text-xl contact-para">
Expand All @@ -202,7 +210,11 @@ function LandingPage() {
</div>
<div className="flex flex-col gap-3 items-center smd:gap-5 smd:flex smd:flex-row max-w-[70ch] mb-4">
<div>

<img src="/assets/india.png" height={100} width={100} alt="" />

<img src="\assets\india.webp" height={100} width={100} />

</div>
<div className="max-w-[70ch] mb-3">
<h2 className="text-zinc-700 font-bold text-xl contact-para">
Expand Down
4 changes: 2 additions & 2 deletions src/Pages/LoginPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function LoginPage() {
href="#"
class="flex items-center mb-6 text-2xl font-semibold text-gray-900"
>
<img class="w-8 h-8 mr-2" src="\assets\icon.png" alt="logo" />
<img class="w-8 h-8 mr-2" src="\assets\icon.webp" alt="logo" />
<div className="login">Nacto Care</div>
</a>
<div class="w-full bg-white rounded-lg shadow">
Expand Down Expand Up @@ -73,7 +73,7 @@ function LoginPage() {
</div>
<a
href="#"
class="text-sm font-medium text-primary-600 hover:underline dark:text-primary-500"
class="text-sm font-medium text-primary-600 hover:underline dark:text-blue-950"
>
Forgot password?
</a>
Expand Down
6 changes: 3 additions & 3 deletions src/Pages/SignupPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function SignupPage() {
href="#"
class="flex items-center mb-6 text-2xl font-semibold text-gray-900"
>
<img class="w-8 h-8 mr-2" src="/assets/icon.png" alt="logo" />
<img class="w-8 h-8 mr-2" src="/assets/icon.webp" alt="logo" />
<div className="signup">Nacto Care</div>
</a>
<div class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0">
Expand Down Expand Up @@ -100,11 +100,11 @@ function SignupPage() {
>
Create an account
</button>
<p class="text-sm font-light text-gray-500">
<p class="text-sm font-light text-gray-500 dark:text-gray-500">
Already have an account?{" "}
<Link
to="/login"
class="font-medium text-primary-600 hover:underline"
class="font-medium text-primary-600 hover:underline dark:text-primary-500"
>
Login here
</Link>
Expand Down
32 changes: 32 additions & 0 deletions src/components/FAQ/Faqdata.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
export const questions = [
{
id: 1,
question: "How does Nactocare ensure the quality and professionalism of the nurses it provides?",
answer: "Nactocare maintains a rigorous screening process for all nurses on our platform. We verify their credentials, certifications, and experience, ensuring that they meet our standards of professionalism and competence. Additionally, we collect feedback from clients to continuously evaluate and improve the quality of our services.",
},
{
id: 2,
question: "What types of services can I book a nurse for through Nactocare?",
answer: "Nactocare offers a wide range of home care services, including but not limited to post-surgery care, elder care, wound care, medication management, injections, and assistance with activities of daily living (ADLs) such as bathing, dressing, and meal preparation. Our nurses are trained to provide personalized care tailored to your specific needs.",
},
{
id: 3,
question: "How far in advance do I need to book a nurse through Nactocare?",
answer: "You can book a nurse through Nactocare as per your requirement, whether it's for immediate assistance or for a future date. We recommend booking in advance whenever possible to ensure availability, especially during peak times or for specialized care needs.",
},
{
id: 4,
question: "Can I request a specific nurse or specify preferences for the caregiver assigned to me?",
answer: "While we cannot guarantee the availability of specific nurses, we strive to accommodate your preferences whenever possible. You can provide details about your preferred caregiver or any specific requirements during the booking process, and we will do our best to match you with a nurse who meets your criteria.",
},
{
id: 5,
question: "How does billing and payment work with Nactocare?",
answer: "Nactocare offers transparent and hassle-free billing. You will receive a detailed invoice for the services rendered, including the nurse's hourly rate and any additional charges for supplies or specialized care. Payments can be made securely online through our platform using various payment methods, ensuring convenience and peace of mind.",
},
{
id: 6,
question: "What safety measures does Nactocare have in place to protect clients and nurses during the COVID-19 pandemic?",
answer: "Nactocare follows strict safety protocols in accordance with guidelines from health authorities to prevent the spread of COVID-19. Our nurses undergo regular health screenings and adhere to strict hygiene practices, including wearing personal protective equipment (PPE) and practicing proper hand hygiene.",
},
]
5 changes: 5 additions & 0 deletions src/components/Footer/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ function Footer() {
Contact Us
</a>
</li>
<li className="mb-4">
<a href="/faq" className="hover:underline">
FAQ
</a>
</li>
</ul>
</div>
<div>
Expand Down
Loading

0 comments on commit c2f1f39

Please sign in to comment.