Skip to content

Commit

Permalink
Merge branch 'main' into feat-authentication
Browse files Browse the repository at this point in the history
  • Loading branch information
priyanshuverma-dev authored Oct 3, 2024
2 parents 782f7f3 + c48e96b commit 768afc3
Show file tree
Hide file tree
Showing 12 changed files with 184 additions and 161 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Greetings

on:
pull_request_target:
issues:

jobs:
greeting:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- name: Greet the user
uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: "👋 Thank you @${{ github.actor }} for raising an issue! We appreciate your effort in helping us improve. Our team will review it shortly. Stay tuned!"
pr-message: "🎉 Thank you @${{ github.actor }} for your contribution! Your pull request has been submitted successfully. A maintainer will review it as soon as possible. We appreciate your support in making this project better."
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ Our platform offers a comprehensive journey through Uttarakhand's culture, histo
- Together, we can create a more comprehensive resource that truly reflects the richness of Uttarakhand.

### How to use [Old website](https://ukculture.netlify.app)
<!-- ### How to use [Old website](https://ukculture.netlify.app)
[![How to use this website](hhttps://github.com/user-attachments/assets/c1dc7a9e-50c9-4844-82dc-5ef51f4bdd79
)](https://github.com/user-attachments/assets/c1dc7a9e-50c9-4844-82dc-5ef51f4bdd79
)
) -->

## Your Feedback Matters

Expand All @@ -49,34 +49,35 @@ If you find any errors or inaccuracies, please let us know through our contact f
You can also support us by contributing content or ideas. Fill out our contact form, and we'll connect with you soon. Your feedback will help us update and enhance our information.


## **How to Contribute to this Project** 👨🏻‍💻
# **How to Contribute to this Project** 👨🏻‍💻

You can be a valuable part of our mission to showcase the rich culture, history, and nature of Uttarakhand. We welcome contributions in both code and non-code forms.

Please take a moment to read the [Contributing.md](https://github.com/ajaynegi45/Uttarakhand-Culture-NewUI/blob/main/contributing.md) file before making any contributions to the project. Your understanding and adherence to these guidelines are greatly appreciated

<a href="https://ajaynegi.notion.site/Resources-f92bcb910d0544a1a8db50cc3ef79cfe" target="_blank"> Check Resources for Contribution</a>

Before making any contributions, please read the [Readme.md](https://github.com/ajaynegi45/Uttarakhand-Culture-NewUI/blob/main/README.md) file carefully to better understand the project's goals and purpose. This will give you clarity on our mission. Also, make sure to review the [Contributing.md](https://github.com/ajaynegi45/Uttarakhand-Culture-NewUI/blob/main/contributing.md) file, which contains important guidelines to make the contribution process smoother, especially for newcomers.

<br>

## Contact
# Contact
If you have any questions or would like to connect, please don't hesitate to reach out. I'd be more than happy to chat and learn from your experiences too.
<br><br>
**Contact Form:** [contact me](https://ukculture.netlify.app/contact)

<!-- LinkedIn -->
<a href="https://linkedin.com/in/ajaynegi45/" target="blank" rel="noopener noreferrer" >
<img align="center" src="https://img.icons8.com/color/48/linkedin.png" alt="ajaynegi45/" width="40" height="40" t/></a>
<a href="https://linkedin.com/in/ajaynegi45/" >
<img align="center" src="https://img.icons8.com/color/48/linkedin.png" alt="ajaynegi45/" width="40" height="40" t/>
</a>
<!-- Twitter -->
<a href="https://x.com/ajaynegi45" >
<img align="center" src="https://img.icons8.com/color/48/twitter.png" alt="ajaynegi45/" width="40" height="40" t/>
</a>

<br>

## Acknowledgements
# Acknowledgements

This project wouldn't be possible without the contributions of our amazing community. Thank you for being part of our journey! 🙌

<a href = "https://github.com/Uttarakhand-Culture/Frontend/graphs/contributors">
<img src = "https://contrib.rocks/image?repo=Uttarakhand-Culture/Frontend"/>
<img src = "https://contrib.rocks/image?repo=ajaynegi45/Uttarakhand-Culture-NewUI"/>
</a>

<br/>
Expand Down Expand Up @@ -105,5 +106,4 @@ We appreciate your interest in preserving Uttarakhandi culture. Together, we can

This project is licensed under the [MIT License](LICENSE).

Made with ❤️ by Ajay Negi
© 2024 Uttarakhand Culture
Made with ❤️ by Uttarakhand Culture Community
3 changes: 3 additions & 0 deletions code_of_conduct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Code of Conduct 🌟

We believe in creating a welcoming, inclusive environment for everyone. Please be kind, humble, and respectful to others. Let's work together with compassion and understanding to build something meaningful. ❤️
25 changes: 19 additions & 6 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

Welcome to the **Uttarakhand Culture Project**! This platform is dedicated to preserving and celebrating the rich cultural heritage of Uttarakhand. We aim to address the growing concern of the younger generation losing touch with their cultural roots by safeguarding the traditional rituals, deities, and unique practices of Uttarakhand. Together, we can ensure this cultural treasure is passed down to future generations. 🌿

Whether you're a coder or a cultural enthusiast, **we need your help**! Your contributions—big or small—are invaluable in building this platform. Let’s work together to bridge the gap and keep our heritage alive!
Whether you're a coder or a cultural enthusiast, **we need your help**! Your contributions—big or small—are invaluable in building this platform. Let’s work together to bridge the gap and keep our heritage alive! 🌱✨

If you have any questions, doubts, or suggestions about contributing (or anything else), feel free to ping me on [LinkedIn](https://www.linkedin.com/in/ajaynegi45/) or [Twitter](https://x.com/ajaynegi45) anytime. I'll do my best to reply as quickly as possible.

We're all about **quality over quantity** here, so even your smallest, meaningful contribution will make a bigger impact than something large but less thoughtful. Let's create something special together! 🙌

## How You Can Contribute 👀

Expand Down Expand Up @@ -35,7 +39,9 @@ You don’t need to be a developer to contribute! Here's how you can help:
Your creativity is welcome! Share design suggestions to improve the website’s aesthetic.

- **Gather Cultural Content**
Choose an aspect of Uttarakhand’s culture—whether it’s history, traditions, or natural beauty—and gather authentic information. Be sure to cite your sources. If the information is personal or local knowledge, please mention that too. 📝
Choose an aspect of Uttarakhand’s culture—whether it’s history, traditions, or natural beauty—and gather authentic information. Be sure to cite your sources. If the information is personal or local knowledge, please mention that too. 📝
<a href="https://ajaynegi.notion.site/Resources-f92bcb910d0544a1a8db50cc3ef79cfe" target="_blank">Explore this resource also for gathering cultural information</a>


- **Suggest a Name for the Website**
We're still on the hunt for the perfect name! We want something meaningful in the local language that reflects the website's mission. Got an idea? Share it via opening an [issue](https://github.com/ajaynegi45/Uttarakhand-Culture-NewUI/issues/new?assignees=&labels=status%3A+awaiting+triage&projects=&template=feature_request.yml&title=%5BFEATURE%5D+%3Cbrief+description%3E) or **[Email](mailto:[email protected])** with the subject line “Website Name Suggestion.” Your creativity could name this entire project!
Expand All @@ -44,17 +50,24 @@ You don’t need to be a developer to contribute! Here's how you can help:
<br/>

## Getting Started ✍🏻
# Getting Started ✍🏻

Even if you’re new to open source, contributing is easy! Follow the steps below to join us:

### Prerequisites
## Prerequisites 🌐

Before diving into the project, make sure you’ve got the following tools ready to go on your machine:

Ensure you have the following installed on your machine:
- [npm](https://www.npmjs.com/) (v6 or higher)
- [Node.js](https://nodejs.org/) (v18.17.1 or higher)

### How to Contribute:
And hey, while you’re at it, don’t forget to:

- Follow **Uttarakhand Culture** on [LinkedIn](https://www.linkedin.com/company/uttarakhandculture) to stay updated with the latest news, events, and cultural insights.
- ⭐ Star the [repository](https://github.com/ajaynegi45/Uttarakhand-Culture-NewUI) and show your support for preserving this beautiful heritage!


## How to Contribute:

#### Step 1. Fork the Repository 🍴

Expand Down
Binary file added public/SEOIMAGE.webp
Binary file not shown.
3 changes: 2 additions & 1 deletion src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ body {
background-color: rgb(255, 255, 255);
/*font-family: "SF Pro Display", system-ui, -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Helvetica", "Arial",sans-serif;*/
line-height: 1;
text-rendering: optimizeSpeed;
/*text-rendering: optimizeSpeed;*/
text-rendering: optimizeLegibility;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down
54 changes: 29 additions & 25 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,35 @@ const customFont = localFont({
});

export const metadata: Metadata = {
title: "Uttarakhand Culture",
description:
"Our aim is to ensure that this invaluable heritage is passed down to future generations.",
keywords:
"Uttarakhand, culture, heritage, festivals, traditions, digital preservation",
openGraph: {
title: "Uttarakhand Culture",
description: "Explore the rich cultural heritage of Uttarakhand.",
url: "https://uttarakhand-culture.vercel.app",
siteName: "Uttarakhand Culture",
images: [
{
url: "https://uttarakhand-culture.vercel.app/_next/image?url=%2F_next%2Fstatic%2Fmedia%2FheroMapImage.fc8fad10.webp&w=828&q=75",
width: 800,
height: 600,
alt: "Cultural Heritage of Uttarakhand",
},
],
locale: "en_US",
type: "website",
},
robots: {
index: true,
follow: true,
},
title: "Uttarakhand Culture - Explore Devbhoomi's Heritage, Traditions, and Natural Beauty",
description: "Explore the rich cultural heritage of Uttarakhand, Devbhoomi's vibrant festivals, traditions, folklore, and breathtaking landscapes. Join our mission to preserve and celebrate the heritage of Manaskhand and Kedarkhand for future generations.",
keywords: "Uttarakhand, culture, Devbhoomi, Uttarakhand culture, Pahadi culture, Uttarakhand heritage, Manaskhand, Kedarkhand, traditions, festivals, folk music, folk dances, digital preservation, Pahad, Pahadi, Pahadi traditions, Garhwali, Kumaoni, Himalayan culture, Uttarakhand tourism, cultural preservation, spiritual Uttarakhand, pilgrimage, Uttarakhand cuisine, Uttarakhand art, Uttarakhand history, Nanda Devi, Chhota Kailash, Ganga, Yamuna, Himalayan rivers, Uttarakhand flora fauna, mountain culture",
openGraph: {
title: "Uttarakhand Culture - Explore Devbhoomi's Heritage, Traditions, and Natural Beauty",
description: "Discover Uttarakhand's cultural heritage, festivals, traditions, folklore, and stunning natural beauty. Join our mission to digitally preserve and celebrate the vibrant legacy of Devbhoomi for future generations.",
url: "https://uttarakhand-culture.vercel.app",
siteName: "Uttarakhand Culture",
images: [
{
url: "/SEOIMAGE.webp",
alt: "Cultural Heritage of Uttarakhand - Traditions, Festivals, and Natural Beauty",
},
],
locale: "en_US",
type: "website",
},
twitter:{
card: "summary_large_image",
site: "https://uttarakhand-culture.vercel.app",
creator: "@UttarakhandCulture",
title: "Uttarakhand Culture - Explore Devbhoomi's Heritage, Traditions, and Natural Beauty",
description:"Discover Uttarakhand's cultural legacy, rich history, festivals, and natural beauty. Help us preserve the traditions of Devbhoomi for future generations.",
images: "/SEOIMAGE.webp"
},
robots: {
index: true,
follow: true,
},
};

export default async function RootLayout({
Expand Down
112 changes: 0 additions & 112 deletions src/app/map/page.tsx
Original file line number Diff line number Diff line change
@@ -1,115 +1,3 @@
// "use client";
//
// import { useRef } from 'react';
// import map from "/public/mapUk.svg";
// import styles from "./page.module.css";
// import Image from "next/image";
//
// const Map = () => {
// console.log("Map.tsx");
//
// const zoomLevelRef = useRef<number>(1);
// const marginLeftLevelRef = useRef<number>(0);
// const marginTopLevelRef = useRef<number>(0);
// const mapImageRef = useRef<HTMLImageElement | null>(null);
// const mapBoxHeightRef = useRef<HTMLDivElement | null>(null);
// const increaseMapBoxHeightRef = useRef<number>(6930);
//
// const handleZoomIn = () => {
// if (mapBoxHeightRef.current) {
// mapBoxHeightRef.current.style.aspectRatio = `10800/${increaseMapBoxHeightRef.current += 3000}`;
// }
// zoomLevelRef.current += 1;
// marginLeftLevelRef.current += 46.2;
// marginTopLevelRef.current += 29;
// updateMapStyle();
// };
//
// const handleZoomOut = () => {
// if (increaseMapBoxHeightRef.current > 6930 && mapBoxHeightRef.current) {
// mapBoxHeightRef.current.style.aspectRatio = `10800/${increaseMapBoxHeightRef.current -= 3000}`;
// }
// if (zoomLevelRef.current > 1) {
// zoomLevelRef.current -= 1;
// marginLeftLevelRef.current -= 46.2;
// marginTopLevelRef.current -= 29;
// updateMapStyle();
// }
// };
//
// const updateMapStyle = () => {
// if (mapImageRef.current) {
// mapImageRef.current.style.transform = `scale(${zoomLevelRef.current})`;
// mapImageRef.current.style.marginTop = `${marginTopLevelRef.current}vw`;
// mapImageRef.current.style.marginLeft = `${marginLeftLevelRef.current}vw`;
// }
// };
//
// return (
// <div>
// <div className={styles["uttarakhand-map"]}>
// <h1 className={styles["uttarakhand-map-heading"]}>Map of Uttarakhand</h1>
// <p>Detailed map of Uttarakhand</p>
// <div ref={mapBoxHeightRef} className={styles["uttarakhand-map-container"]}>
// <Image className={styles["map-image"]} ref={mapImageRef} src={map} alt="Important Map of Uttarakhand" decoding="async" />
// </div>
// <div className={styles["zoom-button-container"]}>
// <p onClick={handleZoomIn} className={styles["zoom-level-button"]}>+</p>
// <p onClick={handleZoomOut} className={styles["zoom-level-button"]}>-</p>
// </div>
// <p>Zoom to view Map</p>
// </div>
// </div>
// );
// };
//
// export default Map;
//









































/*** New Logic is here ***/



"use client";

import { useRef } from 'react';
Expand Down
3 changes: 3 additions & 0 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Nanda_Sunanda from "/public/Nanda-Sunanda.webp";
import Notify_Banner from "/public/notify-early-banner.jpg"
import PahadiWomen from "/public/bhotiaWoman.webp"
import Screen from "@/components/Screen";
import Festivals from "@/components/Festivals";

export default function Home() {

Expand Down Expand Up @@ -145,6 +146,8 @@ export default function Home() {

</section>

{/*<Festivals />*/}


</>
);
Expand Down
4 changes: 2 additions & 2 deletions src/app/working-error.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Link from 'next/link';

const Custom404 = () => {
const WorkingError = () => {
return (
<div style={{
display: 'flex',
Expand Down Expand Up @@ -66,4 +66,4 @@ const Custom404 = () => {
);
};

export default Custom404;
export default WorkingError;
34 changes: 34 additions & 0 deletions src/components/Festivals.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from 'react';
import { getUpcomingFestival } from "@/utils/festivals";
import SectionCard from "@/components/ui/SectionCard";
import Nanda_Sunanda from "/public/Nanda-Sunanda.webp";


const Festivals: React.FC = () => {
const upcomingFestival = getUpcomingFestival(); // Get the upcoming festival

// Function to format a date in DD-MM-YYYY format
const formatFestivalDate = (festivalDate: string): string => {
const [day, month] = festivalDate.split('-');
const currentYear = new Date().getFullYear();
return `${day}-${month}-${currentYear}`; // Convert to DD-MM-YYYY format
};

return (
<div>
<h1>Upcoming Festivals in Uttarakhand</h1>
{upcomingFestival ? (
<div>
<strong>{upcomingFestival.name}</strong> - {formatFestivalDate(upcomingFestival.date)}
</div>
) : (
<p>No upcoming festivals</p>
)}

<SectionCard cardTitle={"UPCOMING FESTIVAL"} title={upcomingFestival.name} subTitle={formatFestivalDate(upcomingFestival.date)} description={"Egaas Bagwal is a unique festival celebrated 11 days after Diwali in the hilly regions of Uttarakhand. According to local belief, Lord Rama returned from exile late to these areas, which is why people here celebrate Egaas with great enthusiasm. The festival involves preparing traditional delicacies, performing joyful folk dances, and lighting up homes, much like Diwali. A standout tradition is spinning a flaming rope called \"Bhailo\", where villagers twirl a fire-lit rope, creating a mesmerizing display symbolizing light’s triumph over darkness. Egaas Bagwal reflects Uttarakhand’s rich cultural heritage, offering a glimpse into the community’s deep-rooted traditions and festive spirit. For the people of Uttarakhand, it’s not just a festival, but a meaningful tribute to their ancestors and the vibrant life of the hills."}
image={Nanda_Sunanda} readMoreLink={""} />
</div>
);
};

export default Festivals;
Loading

0 comments on commit 768afc3

Please sign in to comment.