Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into vercel
Browse files Browse the repository at this point in the history
  • Loading branch information
ajaynegi45 committed Sep 1, 2024
2 parents 5ece643 + 13ab436 commit 2a0f585
Show file tree
Hide file tree
Showing 24 changed files with 881 additions and 80 deletions.
75 changes: 75 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Report a Bug 🐞
description: Help us improve by reporting any issues you encounter.
title: "[BUG] Brief description"
labels: ["status: awaiting triage"]
#assignees: ' '
body:
- type: checkboxes
id: duplicates
attributes:
label: Is this a new issue?
description: Please confirm you've checked that this issue hasn't been reported before.
options:
- label: I have searched "open" and "closed" issues, and this is not a duplicate.
required: true

- type: textarea
id: description
attributes:
label: Bug Description
description: Please provide a clear description of the issue. You can explain it in your own way if preferred.
placeholder: |
Please describe the bug in detail. For example:
- What happened?
- Where did it happen?
validations:
required: true

- type: textarea
id: steps-to-reproduce
attributes:
label: Steps to Reproduce
description: Outline the steps to reproduce the issue. If unsure, just provide any relevant details.
placeholder: |
If you know the steps, you can follow this format:
1. Go to [page or feature]
2. [Describe action taken]
3. [Describe what went wrong]
If unsure, you can explain what you were doing or what you expected to happen.
validations:
required: false

- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Attach any screenshots that might help clarify the issue (if applicable).
placeholder: Upload or drag and drop images here.
validations:
required: false

- type: dropdown
id: assignee
attributes:
label: Would you like to work on this issue?
options:
- "Yes"
- "No"
validations:
required: true

- type: textarea
id: implementation-plan
attributes:
label: Implementation Plan
description: If you selected "Yes" above, please describe how you would approach fixing this issue (Optional).
placeholder: Provide a brief plan or any initial thoughts on fixing the bug.
validations:
required: false

- type: markdown
attributes:
value: |
Thank you for reporting this bug! Please ensure you've filled out all the required sections to help us address the issue as efficiently as possible.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: true
65 changes: 65 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Feature Request 💡
description: Have a new idea or feature? Let us know...
title: "[FEATURE] <brief description>"
labels: ["status: awaiting triage"]

body:
- type: checkboxes
id: duplicates
attributes:
label: Is this feature already requested?
description: Ensure this feature hasn't been suggested before.
options:
- label: I have checked "open" and "closed" issues, and this is not a duplicate.
required: true

- type: textarea
id: problem
attributes:
label: Problem or Missing Functionality
description: Briefly describe the problem or the missing functionality that this feature would address.
placeholder: "For ex: I often encounter [specific problem] when using [current feature or lack thereof]. Implementing this feature would improve [specific aspect or workflow] by [explain how it will help]."
validations:
required: false

- type: textarea
id: solution
attributes:
label: Feature Description
description: Describe the feature you're suggesting and how it would solve the problem. Include any relevant details or references.
placeholder: "For ex: I suggest adding [describe the feature] that will [explain its impact]. This feature could be similar to [mention any known implementations or inspirations], which helps by [describe how it benefits the users]."
validations:
required: true

- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Attach any screenshots that might help illustrate the feature or its need (Optional).
placeholder: "If applicable, drag and drop images here or click to upload. Screenshots can help clarify your suggestion by showing the current issue or how the feature might look."
validations:
required: false

- type: dropdown
id: work_on_issue
attributes:
label: Would you like to work on this feature?
options:
- "Yes"
- "No"
validations:
required: true

- type: textarea
id: implementation_plan
attributes:
label: Implementation Plan
description: If you selected "Yes" above, briefly describe how you plan to implement this feature (Optional).
placeholder: "For example: I plan to start by [outline your steps], using [mention any tools, libraries, or frameworks]. This will help ensure the feature is developed efficiently and meets the intended purpose."
validations:
required: false

- type: markdown
attributes:
value: |
Thank you for suggesting a new feature! Please ensure you've filled out all the required sections to help us evaluate your suggestion effectively.
1 change: 1 addition & 0 deletions .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
titleOnly: true
28 changes: 28 additions & 0 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Code Quality and Formatting

on: [push, pull_request]

jobs:
lint:
name: Lint Code
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'

- name: Install dependencies
run: npm ci

- name: Run ESLint
run: npm run lint

# - name: Check for formatting issues
# run: |
# npm install prettier --save-dev
# npx prettier --check '**/*.{ts,tsx,js,jsx,css,scss,md,html,json}'
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Uttarakhand Culture New UI
This is the new UI for this website <a href="https://ukculture.netlify.app/" target="_blank">Live link</a>


### Introduction

Welcome to the Uttarakhand Culture Preservation Project! We're dedicated to saving and promoting the rich cultural heritage of Uttarakhand. Our platform digitally documents and celebrates the region's culture, history, and natural beauty, making it accessible to the younger generation and preserving it for future generations.

<a href="https://www.uttarakhandculture.co/" target="_blank">Live link 01</a>
<a href="https://uttarakhand-culture.vercel.app/" target="_blank">New UI link</a>
<a href="https://ukculture.netlify.app/" target="_blank">Old UI link</a>
<br/>
<a href="https://www.figma.com/design/o82aPjIzHairrkqhem3S1Q/New-UI?node-id=252-38&t=pnd9LeK6OUwhckbh-1" target="_blank">Figma Design</a>


### Problem
A concerning trend is emerging in Uttarakhand, where the younger generation is gradually forgetting their cultural heritage and traditional rituals. This decline in cultural knowledge is evident across generations, with each successive generation possessing less knowledge than the previous one. For instance, the amount of cultural knowledge possessed by grandparents is significantly more than that of their children, and the cultural knowledge of today's youth is likely to be even less than that of their parents. If this trend continues, there is a risk that the cultural heritage of Uttarakhand may eventually disappear from the society. This loss would not only erase the region's rich cultural identity but also deprive future generations of their cultural roots and traditions.
Expand Down Expand Up @@ -82,9 +86,9 @@ This project wouldn't be possible without the contributions of our amazing commu
<br/>
<!-- <a href="https://star-history.com/#ajaynegi45/Uttarakhand-Culture-Preservation-Project&Date"> -->
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Uttarakhand-Culture/New-UI&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Uttarakhand-Culture/New-UI&type=Date" />
<img align="center" alt="Star History Chart" src="https://api.star-history.com/svg?repos=Uttarakhand-Culture/New-UI&type=Date" />
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=ajaynegi45/Uttarakhand-Culture-NewUI&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=ajaynegi45/Uttarakhand-Culture-NewUI&type=Date" />
<img align="center" alt="Star History Chart" src="https://api.star-history.com/svg?repos=ajaynegi45/Uttarakhand-Culture-NewUI&type=Date" />
</picture>
<!-- </a> -->
</p>
Expand Down
Binary file added public/Ghee_Sankranti.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Srinagar.webp
Binary file not shown.
Binary file added public/bagwal.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/goriGanga.webp
Binary file not shown.
Binary file added public/notify-early-banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions src/app/explore/page.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.text-container{
display: flex;
flex-direction: column;
align-items: center;


margin-top: 10vw;
margin-bottom: 5rem;

}

.text-container > p{
color: var(--black);
text-align: center;
margin: 5px;
}

.links-container{
display: flex;
flex-direction: column;
align-items: center;

gap: 5rem;

}

.div{
width: max-content;
border: 1px solid red;
padding: 0.8rem 1rem;
border-radius: 5px;
float: right;
transition-duration: 1s;
}
.div:hover{
background-color: dodgerblue;
text-decoration-line: underline;
cursor: pointer;
}
29 changes: 29 additions & 0 deletions src/app/explore/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import styles from "./page.module.css"
import Link from "next/link";
import Card from "@/components/ui/Card";
import Trekking from "@/app/trekking/page";

export default function Explore() {
return (
<>
<section>

<div className={styles["text-container"]}>
<p>We’re currently building this page…</p>

<p>In the meantime, check out the pages we’ve already completed
below:</p>
</div>

<div className={styles["links-container"]}>
<div className={styles["div"]}>
<Link href={"/trekking"}>Trekking </Link>
</div>
<div className={styles["div"]}>
<Link href={"/language"}> Language</Link>
</div>
</div>
</section>
</>
);
}
20 changes: 10 additions & 10 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@

--black: #3B3D41;
--grey: #A0A5AC;
--light-grey: #E1E4E8;
--light-black: #667085;
--cloud-grey: #E1E4E8;
--slate-black: #667085;
--mist-grey: #F2F2F2
}


Expand Down Expand Up @@ -51,15 +52,9 @@ button, [role="button"] {
}

/* reset anchor style*/
a {
cursor: pointer;
color: inherit;
text-decoration: none;
-webkit-tap-highlight-color: transparent;
}

p{
font-family: "system-ui", "-apple-system", "BlinkMacSystemFont",sans-serif;
font-family: --myCustomFont,"system-ui", "-apple-system", "BlinkMacSystemFont",sans-serif;
font-size: 14px;
font-style: normal;
font-weight: 300;
Expand Down Expand Up @@ -91,4 +86,9 @@ h1{
text-transform: none;
}


a {
cursor: pointer;
color: inherit;
text-decoration: none;
-webkit-tap-highlight-color: transparent;
}
4 changes: 2 additions & 2 deletions src/app/language/page.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

.language-importance-container{
margin-top: 10rem;
border-top: 1px solid var(--light-grey);
border-top: 1px solid var(--cloud-grey);
width: 100%;
}
.language-importance-title-container > p{
Expand All @@ -60,7 +60,7 @@

.uttarakhand-language-title-container{
width: 100%;
border-top: 1px solid var(--light-grey);
border-top: 1px solid var(--cloud-grey);
margin-top: 5rem;
margin-bottom: -6rem;
}
Expand Down
Loading

0 comments on commit 2a0f585

Please sign in to comment.