Skip to content

Commit 8b15fae

Browse files
authored
Merge pull request #37 from recursivezero/develop
Develop
2 parents bcfde9a + fa8e1a1 commit 8b15fae

File tree

237 files changed

+9434
-378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+9434
-378
lines changed

.githooks/pre-commit

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ echo "Running pre-commit checks for branch: $BRANCH_NAME"
2121
echo "$BRANCH_NAME" | grep -Eq '^(feature|bugfix|hotfix|task)/[A-Za-z]+-[0-9]+'
2222
if [ $? -ne 0 ]; then
2323
echo "Error: Branch name '$BRANCH_NAME' is invalid."
24+
<<<<<<< HEAD
25+
echo "Use a valid branch naming convention, e.g., feature|bugfix|hotfix|task/XYZ-123-description."
26+
exit 1
27+
fi
28+
=======
2429
echo "Use a valid branch naming convention, e.g., feature|bugfix|hotfix|task/XYZ-123."
2530
exit 1
2631
fi
32+
>>>>>>> main

.github/workflows/deploy.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
name: Deploy to GitHub Pages
2-
3-
on:
4-
# Trigger the workflow every time you push to the `main` branch
5-
# Using a different branch name? Replace `main` with your branch’s name
6-
push:
7-
branches: [ main ]
8-
# Allows you to run this workflow manually from the Actions tab on GitHub.
9-
workflow_dispatch:
10-
11-
# Allow this job to clone the repo and create a page deployment
12-
permissions:
13-
contents: read
14-
pages: write
15-
id-token: write
16-
17-
jobs:
18-
build:
19-
runs-on: ubuntu-latest
20-
steps:
21-
- name: Checkout your repository using git
22-
uses: actions/checkout@v4
23-
- name: Install, build, and upload your site
24-
uses: withastro/action@v3
25-
with:
26-
path: . # The root location of your Astro project inside the repository. (optional)
27-
node-version: 20 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
28-
package-manager: npm # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
29-
30-
deploy:
31-
needs: build
32-
runs-on: ubuntu-latest
33-
environment:
34-
name: github-pages
35-
url: ${{ steps.deployment.outputs.page_url }}
36-
steps:
37-
- name: Deploy to GitHub Pages
38-
id: deployment
39-
uses: actions/deploy-pages@v4
1+
name: Deploy to GitHub Pages
2+
3+
on:
4+
# Trigger the workflow every time you push to the `main` branch
5+
# Using a different branch name? Replace `main` with your branch’s name
6+
push:
7+
branches: [main]
8+
# Allows you to run this workflow manually from the Actions tab on GitHub.
9+
workflow_dispatch:
10+
11+
# Allow this job to clone the repo and create a page deployment
12+
permissions:
13+
contents: read
14+
pages: write
15+
id-token: write
16+
17+
jobs:
18+
build:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout your repository using git
22+
uses: actions/checkout@v4
23+
- name: Install, build, and upload your site
24+
uses: withastro/action@v3
25+
with:
26+
path: . # The root location of your Astro project inside the repository. (optional)
27+
node-version: 20 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
28+
package-manager: npm # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
29+
30+
deploy:
31+
needs: build
32+
runs-on: ubuntu-latest
33+
environment:
34+
name: github-pages
35+
url: ${{ steps.deployment.outputs.page_url }}
36+
steps:
37+
- name: Deploy to GitHub Pages
38+
id: deployment
39+
uses: actions/deploy-pages@v4

.github/workflows/issue-template-number.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [opened]
66
permissions:
77
issues: write
8-
8+
99
jobs:
1010
update_issue_title:
1111
runs-on: ubuntu-latest

.vscode/cspell.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,22 @@
77
{
88
"name": "teamMember",
99
"path": "./dictionaries/team-member.txt"
10+
},
11+
{
12+
"name": "geo",
13+
"path": "./dictionaries/india.txt"
1014
}
1115
],
12-
"dictionaries": ["projectTerms", "teamMember"],
16+
"dictionaries": ["projectTerms", "teamMember", "india"],
17+
"ignorePaths": ["**/*.svg", "src/assets/json/*.json"],
1318
"languageSettings": [
1419
{
1520
"languageId": "*",
1621
"dictionaries": ["projectTerms"]
1722
},
1823
{
1924
"languageId": "json, md",
20-
"dictionaries": ["teamMember"]
25+
"dictionaries": ["teamMember", "geo"]
2126
}
2227
],
2328
"enableFiletypes": ["astro", "jsx", "tsx"]

.vscode/dictionaries/india.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Andhra
2+
Kuchipudi
3+
Pradesh
4+
Sankranti

.vscode/settings.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
"[CODEOWNERS]": {
4242
"editor.formatOnSave": false
4343
},
44-
"cSpell.words": [
45-
"DUMMYUSER"
46-
],
44+
"cSpell.words": ["behaviour", "DUMMYUSER"],
4745
"workbench.colorCustomizations": {
4846
"activityBar.activeBackground": "#e98cf9",
4947
"activityBar.background": "#e98cf9",
@@ -53,13 +51,11 @@
5351
"activityBarBadge.foreground": "#15202b",
5452
"commandCenter.border": "#15202b99",
5553
"sash.hoverBorder": "#e98cf9",
56-
"sideBar.border": "#e98cf9",
5754
"statusBar.background": "#e05bf7",
5855
"statusBar.foreground": "#15202b",
5956
"statusBarItem.hoverBackground": "#d72af5",
6057
"statusBarItem.remoteBackground": "#e05bf7",
6158
"statusBarItem.remoteForeground": "#15202b",
62-
"tab.activeBorder": "#e98cf9",
6359
"titleBar.activeBackground": "#e05bf7",
6460
"titleBar.activeForeground": "#15202b",
6561
"titleBar.inactiveBackground": "#e05bf799",

.vscode/tailwind.json

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
{
2-
"version": 1.1,
3-
"atDirectives": [
4-
{
5-
"name": "@tailwind",
6-
"description": "Use the `@tailwind` directive to insert Tailwind's `base`, `components`, `utilities` and `screens` styles into your CSS.",
7-
"references": [
8-
{
9-
"name": "Tailwind Documentation",
10-
"url": "https://tailwindcss.com/docs/functions-and-directives#tailwind"
11-
}
12-
]
13-
},
14-
{
15-
"name": "@apply",
16-
"description": "Use the `@apply` directive to inline any existing utility classes into your own custom CSS. This is useful when you find a common utility pattern in your HTML that you’d like to extract to a new component.",
17-
"references": [
18-
{
19-
"name": "Tailwind Documentation",
20-
"url": "https://tailwindcss.com/docs/functions-and-directives#apply"
21-
}
22-
]
23-
},
24-
{
25-
"name": "@responsive",
26-
"description": "You can generate responsive variants of your own classes by wrapping their definitions in the `@responsive` directive:\n```css\n@responsive {\n .alert {\n background-color: #E53E3E;\n }\n}\n```\n",
27-
"references": [
28-
{
29-
"name": "Tailwind Documentation",
30-
"url": "https://tailwindcss.com/docs/functions-and-directives#responsive"
31-
}
32-
]
33-
},
34-
{
35-
"name": "@screen",
36-
"description": "The `@screen` directive allows you to create media queries that reference your breakpoints by **name** instead of duplicating their values in your own CSS:\n```css\n@screen sm {\n /* ... */\n}\n```\n…gets transformed into this:\n```css\n@media (min-width: 640px) {\n /* ... */\n}\n```\n",
37-
"references": [
38-
{
39-
"name": "Tailwind Documentation",
40-
"url": "https://tailwindcss.com/docs/functions-and-directives#screen"
41-
}
42-
]
43-
},
44-
{
45-
"name": "@variants",
46-
"description": "Generate `hover`, `focus`, `active` and other **variants** of your own utilities by wrapping their definitions in the `@variants` directive:\n```css\n@variants hover, focus {\n .btn-brand {\n background-color: #3182CE;\n }\n}\n```\n",
47-
"references": [
48-
{
49-
"name": "Tailwind Documentation",
50-
"url": "https://tailwindcss.com/docs/functions-and-directives#variants"
51-
}
52-
]
53-
}
54-
]
55-
}
1+
{
2+
"version": 1.1,
3+
"atDirectives": [
4+
{
5+
"name": "@tailwind",
6+
"description": "Use the `@tailwind` directive to insert Tailwind's `base`, `components`, `utilities` and `screens` styles into your CSS.",
7+
"references": [
8+
{
9+
"name": "Tailwind Documentation",
10+
"url": "https://tailwindcss.com/docs/functions-and-directives#tailwind"
11+
}
12+
]
13+
},
14+
{
15+
"name": "@apply",
16+
"description": "Use the `@apply` directive to inline any existing utility classes into your own custom CSS. This is useful when you find a common utility pattern in your HTML that you’d like to extract to a new component.",
17+
"references": [
18+
{
19+
"name": "Tailwind Documentation",
20+
"url": "https://tailwindcss.com/docs/functions-and-directives#apply"
21+
}
22+
]
23+
},
24+
{
25+
"name": "@responsive",
26+
"description": "You can generate responsive variants of your own classes by wrapping their definitions in the `@responsive` directive:\n```css\n@responsive {\n .alert {\n background-color: #E53E3E;\n }\n}\n```\n",
27+
"references": [
28+
{
29+
"name": "Tailwind Documentation",
30+
"url": "https://tailwindcss.com/docs/functions-and-directives#responsive"
31+
}
32+
]
33+
},
34+
{
35+
"name": "@screen",
36+
"description": "The `@screen` directive allows you to create media queries that reference your breakpoints by **name** instead of duplicating their values in your own CSS:\n```css\n@screen sm {\n /* ... */\n}\n```\n…gets transformed into this:\n```css\n@media (min-width: 640px) {\n /* ... */\n}\n```\n",
37+
"references": [
38+
{
39+
"name": "Tailwind Documentation",
40+
"url": "https://tailwindcss.com/docs/functions-and-directives#screen"
41+
}
42+
]
43+
},
44+
{
45+
"name": "@variants",
46+
"description": "Generate `hover`, `focus`, `active` and other **variants** of your own utilities by wrapping their definitions in the `@variants` directive:\n```css\n@variants hover, focus {\n .btn-brand {\n background-color: #3182CE;\n }\n}\n```\n",
47+
"references": [
48+
{
49+
"name": "Tailwind Documentation",
50+
"url": "https://tailwindcss.com/docs/functions-and-directives#variants"
51+
}
52+
]
53+
}
54+
]
55+
}

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ The format is based on Keep a Changelog and this project adheres to Semantic Ver
88

99
Created Repo from template
1010

11-
1211
### [Unreleased]
1312

1413
Here we write upgrading notes for brands. It's a team effort to make them as straightforward as possible.

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Inside of your Astro project, you'll see the following folders and files:
3232
├── components.json
3333
├── docs
3434
│   ├── README.md
35-
│   └── state-management.md
35+
│   └── pages.md # Documentation for all pages and their functionality
3636
├── jsconfig.json
3737
├── LICENSE
3838
├── package.json
@@ -91,7 +91,13 @@ To start the development server, run:
9191
npm run dev
9292
```
9393

94-
The server will start on `http://localhost:4321`.
94+
### test and lint
95+
96+
run
97+
98+
```sh
99+
npm run lint
100+
```
95101

96102
### Deployment
97103

abcd.code-workspace

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"editor.inlayHints.enabled": "offUnlessPressed",
6161
"editor.insertSpaces": true,
6262
"editor.linkedEditing": true,
63-
"editor.minimap.enabled": false,
63+
"editor.minimap.enabled": true,
6464
"editor.minimap.renderCharacters": false,
6565
"editor.minimap.size": "fill",
6666
"editor.multiCursorModifier": "alt",
@@ -73,25 +73,9 @@
7373
"javascript": "javascriptreact"
7474
},
7575
"eslint.options": {
76-
"extensions": [
77-
".js",
78-
".jsx",
79-
".md",
80-
".mdx",
81-
".ts",
82-
".tsx",
83-
".astro"
84-
]
85-
},
86-
"eslint.validate": [
87-
"mdx",
88-
"markdown",
89-
"javascript",
90-
"javascriptreact",
91-
"typescript",
92-
"typescriptreact",
93-
"astro"
94-
],
76+
"extensions": [".js", ".jsx", ".md", ".mdx", ".ts", ".tsx", ".astro"]
77+
},
78+
"eslint.validate": ["mdx", "markdown", "javascript", "javascriptreact", "typescript", "typescriptreact", "astro"],
9579
"explorer.compactFolders": false,
9680
"explorer.confirmDelete": false,
9781
"explorer.confirmDragAndDrop": false,
@@ -119,10 +103,7 @@
119103
},
120104
"git.autofetch": true,
121105
"git.branchPrefix": "feature/",
122-
"git.branchProtection": [
123-
"develop",
124-
"main"
125-
],
106+
"git.branchProtection": ["develop", "main"],
126107
"git.branchRandomName.enable": true,
127108
"git.confirmSync": false,
128109
"git.enableCommitSigning": false,
@@ -133,9 +114,7 @@
133114
"js/ts.implicitProjectConfig.checkJs": true,
134115
"peacock.affectSideBarBorder": true,
135116
"peacock.color": "#abcd00",
136-
"prettier.documentSelectors": [
137-
"**/*.astro"
138-
],
117+
"prettier.documentSelectors": ["**/*.astro"],
139118
"prettier.printWidth": 120,
140119
"prettier.quoteProps": "consistent",
141120
"prettier.singleQuote": false,
@@ -155,6 +134,7 @@
155134
"window.autoDetectColorScheme": true,
156135
"window.title": "${rootNameShort}${separator}${activeEditorShort}${separator}${activeFolderMedium}",
157136
"window.zoomLevel": 0.5,
137+
"workbench.colorTheme": "Tokyo Night Storm",
158138
"workbench.colorCustomizations": {
159139
"activityBar.activeBackground": "#d5ff01",
160140
"activityBar.background": "#d5ff01",
@@ -176,7 +156,9 @@
176156
"titleBar.inactiveForeground": "#15202b99",
177157
"tab.activeBorder": "#d5ff01"
178158
},
179-
"workbench.colorTheme": "Tokyo Night Storm",
159+
"files.exclude": {
160+
"**/.git": false
161+
},
180162
"workbench.editor.pinnedTabSizing": "compact",
181163
"workbench.editor.pinnedTabsOnSeparateRow": true,
182164
"workbench.editorAssociations": {
@@ -189,4 +171,4 @@
189171
".githooks/**": true
190172
}
191173
}
192-
}
174+
}

0 commit comments

Comments
 (0)