Skip to content

Commit

Permalink
Merge pull request #11 from PSMRI/feature/update-components
Browse files Browse the repository at this point in the history
Updating UI components
  • Loading branch information
drtechie authored Oct 5, 2024
2 parents ad0c9a1 + 96c3c5c commit 372575c
Show file tree
Hide file tree
Showing 15 changed files with 146 additions and 110 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"dependencies": {
"@astrojs/mdx": "^2.1.1",
"@astrojs/rss": "^4.0.4",
"@astrojs/react": "^3.0.9",
"@astrojs/rss": "^4.0.4",
"@astrojs/sitemap": "^3.0.5",
"@astrojs/tailwind": "^5.1.0",
"astro": "^4.3.2",
Expand All @@ -39,17 +39,17 @@
"@tailwindcss/typography": "^0.5.10",
"@types/marked": "^5.0.2",
"@types/react": "^18.2.54",
"postcss": "^8.4.34",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"prettier": "^3.2.5",
"prettier-plugin-astro": "^0.13.0",
"prettier-plugin-tailwindcss": "^0.5.11",
"autoprefixer": "^10.4.17",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.70.0",
"sharp": "0.33.1",
"tailwind-bootstrap-grid": "^5.1.0",
"tailwindcss": "^3.4.1",
"tailwindcss": "^3.4.12",
"typescript": "5.3.3"
}
}
Binary file modified public/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"favicon": "/images/favicon.png",
"logo": "/images/logo.png",
"logo_width": "147",
"logo_height": "31",
"logo_height": "50",
"logo_text": "Pinwheel"
},

Expand All @@ -33,12 +33,12 @@
},

"params": {
"footer_description": "Lorem ipsum dolor sit sed dmi amet, consectetur adipiscing. Cdo tellus, sed condimentum volutpat.",
"email": "[email protected]",
"location": "2118 Thornridge Cir. Syracuse, Connecticut 35624",
"phone": "+704-555-0127",
"footer_description": "Integrated with ABDM, empowering healthcare services through digital transformation.",
"email": "[email protected]",
"location": "3rd Floor, No. 6-3-1112 AWFIS Oyster Complex, Greenlands Road Somajiguda, Begumpet Hyderabad – 500016, India.",
"phone": "+91 (40) 49451999",
"contact_form_action": "#",
"copyright": "Copyright © 2023 a theme by [Themefisher](https://themefisher.com)"
"copyright": "Copyright © 2024 AMRIT"
},

"metadata": {
Expand Down
46 changes: 21 additions & 25 deletions src/config/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,51 @@
"url": "/about"
},
{
"name": "Blog",
"url": "/blog"
},
{
"name": "Features",
"url": "/features"
"name": "Documentation",
"url": "/how-it-works"
},
{
"name": "How It Works",
"url": "/how-it-works"
"name":"Programs",
"url":"/programs"
},
{
"name": "Pages",
"name": "Products",
"url": "",
"hasChildren": true,
"children": [
{
"name": "Career",
"name": "HWC (web and mobile flavours)",
"url": "/career"
},

{
"name": "Integrations",
"name": "MMU",
"url": "/integrations"
},

{
"name": "Pricing",
"name": "FLW Mobile app",
"url": "/pricing"
},
{
"name": "Sign In",
"name": "104 HIHL",
"url": "/signin"
},

{
"name": "Elements",
"name": "1097 HIHL",
"url": "/elements"
},
{
"name": "Changelog",
"name": "ECD",
"url": "/changelog"
},
{
"name": "Terms And Conditions",
"url": "/terms-and-conditions"
}
]
},
{
"name": "Partnership",
"url": "/contact"
},
{
"name": "Contact",
"url": "/contact"
Expand All @@ -70,16 +66,16 @@
"url": "/about"
},
{
"name": "Contact",
"url": "/contact"
"name": "Documentation",
"url": "/how-it-works"
},
{
"name": "Elements",
"url": "/elements"
"name": "Products",
"url": "/blog"
},
{
"name": "Changelog",
"url": "/changelog"
"name": "Contact",
"url": "/contact"
}
]
}
31 changes: 20 additions & 11 deletions src/content/homepage/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,46 @@ key_features:
title: "The Highlighting Part Of Our Solution"
description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas Werat viverra id et aliquet. vulputate egestas sollicitudin.
feature_list:
- icon: "map" #icon package react-feather-icon [https://feathericons.com/]
- id: 1
icon: "map" #icon package react-feather-icon [https://feathericons.com/]
title: Live Caption
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "lock" #icon package react-feather-icon [https://feathericons.com/]
- id: 2
icon: "lock" #icon package react-feather-icon [https://feathericons.com/]
title: Smart Reply
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "link" #icon package react-feather-icon [https://feathericons.com/]
- id: 3
icon: "link" #icon package react-feather-icon [https://feathericons.com/]
title: Sound Amplifier
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "bell" #icon package react-feather-icon [https://feathericons.com/]
- id: 4
icon: "bell" #icon package react-feather-icon [https://feathericons.com/]
title: Sound Amplifier
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "monitor" #icon package react-feather-icon [https://feathericons.com/]
- id: 5
icon: "monitor" #icon package react-feather-icon [https://feathericons.com/]
title: Smart Reply
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "map" #icon package react-feather-icon [https://feathericons.com/]
- id: 6
icon: "map" #icon package react-feather-icon [https://feathericons.com/]
title: Live Caption
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "link" #icon package react-feather-icon [https://feathericons.com/]
- id: 7
icon: "link" #icon package react-feather-icon [https://feathericons.com/]
title: Sound Amplifier
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "bell" #icon package react-feather-icon [https://feathericons.com/]
- id: 8
icon: "bell" #icon package react-feather-icon [https://feathericons.com/]
title: Sound Amplifier
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "map" #icon package react-feather-icon [https://feathericons.com/]
- id: 9
icon: "map" #icon package react-feather-icon [https://feathericons.com/]
title: Smart Reply
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- icon: "monitor" #icon package react-feather-icon [https://feathericons.com/]
- id: 10
icon: "monitor" #icon package react-feather-icon [https://feathericons.com/]
title: Live Caption
content: Lorem ipsum dolor sit amet, consectetur adipiscing elit.

#service
service:
homepage_tab:
Expand Down
16 changes: 6 additions & 10 deletions src/layouts/components/KeyFeatures.astro
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
---
import { markdownify } from "@/lib/utils/textConverter";
import { Image } from "astro:assets";
import HomapageFeature from "@/layouts/function-components/HomapageFeature";
import FeatureCard from "@/layouts/function-components/FeatureCard";
const { key_features } = Astro.props;
const { title, description, feature_list } = key_features;
---

<section class="section key-feature relative">
<Image
class="absolute left-0 top-0 -z-[1] -translate-y-1/2"
src="/images/feature-shape.png"
height={126}
width={63}
alt=""
/>

<div class="container">
<div class="row justify-between text-center lg:text-start">
<div class="lg:col-5">
Expand All @@ -23,6 +16,9 @@ const { title, description, feature_list } = key_features;
<p set:html={markdownify(description)} />
</div>
</div>
<HomapageFeature feature_list={feature_list} client:load />
<FeatureCard feature_list={feature_list} client:load
cardHeight="h-[300px]"
cardShadow="shadow-md hover:shadow-lg transition-shadow duration-300"
/>
</div>
</section>
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,21 @@ const {
<div class="row">
{
member_list.map((item: any) => (
<div class="mb-6 flex flex-col px-6 text-center sm:col-6 lg:col-4 sm:items-center">
<div class="member-avatar inline-flex justify-center">
<div class="mb-6 flex text-center sm:col-6 lg:col-4 sm:items-center">
<div class="w-full flex flex-col rounded-lg bg-white border border-gray-300 shadow-lg p-6 justify-center items-center">
<div class="member-avatar w-full flex justify-center">
<Image
height={112}
width={112}
class="rouded-full h-28 w-28"
height={200}
width={200}
class="h-full w-full object-cover"
src={item.image}
alt=""
/>
</div>
<div class="mt-6 w-full flex-1 rounded-xl bg-white px-4 py-8 shadow-lg">
<h5 class="font-primary">{item.name}</h5>
<p class="mt-1.5">{item.field}</p>
<div class="w-full flex flex-col justify-center p-4">
<h5 class="font-primary text-lg">{item.name}</h5>
<p class="mt-1.5 text-sm">{item.field}</p>
</div>
</div>
</div>
))
Expand Down
38 changes: 38 additions & 0 deletions src/layouts/function-components/FeatureCard.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import PropTypes from 'prop-types';
const FeatureCard = ({ feature_list, cardHeight, cardShadow , background }) => {
return (
<div className="key-feature-grid mt-10 grid grid-cols-2 gap-7 md:grid-cols-3 xl:grid-cols-4">
{feature_list.map((item) => {
return (
<div
key={item.id}
>
<div className={`feature-card rounded-xl ${cardHeight} ${cardShadow} ${background} p-5 pb-8 text-center`}>
<h3 className="h4 text-xl lg:text-2xl">{item.title}</h3>
<p>{item.content}</p>
</div>
</div>
);
})}
</div>
);
};
FeatureCard.propTypes = {
feature_list: PropTypes.arrayOf(
PropTypes.shape({
title: PropTypes.string,
content: PropTypes.string,
})
),
cardHeight: PropTypes.string,
cardShadow: PropTypes.string,
background: PropTypes.string,
};
FeatureCard.defaultProps = {
feature_list: [],
cardHeight: "h-[250px]",
cardShadow: "shadow-sm",
background: "bg-white",
};

export default FeatureCard;
28 changes: 0 additions & 28 deletions src/layouts/function-components/HomapageFeature.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/layouts/partials/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { footer } = menu;
const { copyright, location, email, phone, footer_description } = config.params;
---

<footer class="footer bg-[#F1F1F1]">
<footer class="footer bg-white">
<div class="container">
<div class="gx-5 row pb-10 pt-[52px]">
<div class="col-12 mt-12 md:col-6 lg:col-3">
Expand Down
8 changes: 0 additions & 8 deletions src/layouts/partials/Header.astro
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,7 @@ const { pathname } = Astro.url;
</>
))
}
<li class="nav-item mt-2 lg:hidden">
<a class="btn btn-white btn-sm border-border" href="/signin">
Sing Up Now</a
>
</li>
</ul>
<div class="order-1 ml-auto hidden items-center md:order-2 md:ml-0 lg:flex">
<a class="btn btn-white btn-sm" href="/signin"> Sing Up Now</a>
</div>
</nav>
</header>

Expand Down
Loading

0 comments on commit 372575c

Please sign in to comment.