Skip to content

Commit 1130246

Browse files
committed
Merge branch 'develop' of https://github.com/recursivezero/abcd into develop
2 parents 9e184d7 + c9fd065 commit 1130246

36 files changed

+921
-611
lines changed

.env.example

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
NODE_ENV=development
2+
LOG_LEVEL=debug
3+
PORT=4321
4+
5+
6+
GITHUB_CLIENT_ID=
7+
GITHUB_CLIENT_SECRET=
8+
9+
GOOGLE_CLIENT_ID=
10+
GOOGLE_CLIENT_SECRET=
11+
12+
FACEBOOK_CLIENT_ID=
13+
FACEBOOK_CLIENT_SECRET=
14+
15+
AUTH_TRUST_HOST=true
16+
AUTH_SECRET=
17+
18+
ENCRYPTION_KEY=

.githooks/pre-commit

Lines changed: 7 additions & 1 deletion
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
2425
echo "Use a valid branch naming convention, e.g., feature|bugfix|hotfix|task/XYZ-123-description."
2526
exit 1
26-
fi
27+
fi
28+
=======
29+
echo "Use a valid branch naming convention, e.g., feature|bugfix|hotfix|task/XYZ-123."
30+
exit 1
31+
fi
32+
>>>>>>> main

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/deploy.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +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
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: "Auto Replace X in Issue Title"
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
permissions:
7+
issues: write
8+
9+
jobs:
10+
update_issue_title:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Replace 'X' with issue number
14+
env:
15+
GH_TOKEN: ${{ secrets.ISSUE_TOKEN }}
16+
run: |
17+
ISSUE_NUMBER=${{ github.event.issue.number }}
18+
OLD_TITLE="${{ github.event.issue.title }}"
19+
20+
# Replace 'X' with the actual issue number in the title
21+
NEW_TITLE=$(echo "$OLD_TITLE" | sed "s/X/$ISSUE_NUMBER/g")
22+
23+
# Update issue title using GitHub API
24+
gh issue edit "$ISSUE_NUMBER" --title "$NEW_TITLE" --repo "${{ github.repository }}"
25+
shell: bash

CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
parixan.xyz

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
# Template to Start Astro + React
1+
# ABCD KBD
22

3-
This is a codebase for to Start Project in Astro + React .
3+
A Interactive game for kids ; building in Astro
44

5-
## The template contain
5+
main codebase for [abcdkbd.com](https://www.abcdkbd.com)
66

7+
## The tech Stacks
8+
9+
- Astro js
710
- Shadcn for component
811
- tailwind for styling
912
- Zustand for state management

abcd.code-workspace

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,6 @@
156156
"window.title": "${rootNameShort}${separator}${activeEditorShort}${separator}${activeFolderMedium}",
157157
"window.zoomLevel": 0.5,
158158
"workbench.colorTheme": "Tokyo Night Storm",
159-
"workbench.editor.pinnedTabSizing": "compact",
160-
"workbench.editor.pinnedTabsOnSeparateRow": true,
161-
"workbench.editorAssociations": {
162-
"*.log": "default"
163-
},
164-
"zenMode.centerLayout": false,
165-
"cSpell.words": [],
166-
"workbench.editor.limit.excludeDirty": true,
167-
"files.readonlyInclude": {
168-
".githooks/**": true
169-
},
170159
"workbench.colorCustomizations": {
171160
"activityBar.activeBackground": "#d5ff01",
172161
"activityBar.background": "#d5ff01",
@@ -190,6 +179,17 @@
190179
},
191180
"files.exclude": {
192181
"**/.git": false
182+
},
183+
"workbench.editor.pinnedTabSizing": "compact",
184+
"workbench.editor.pinnedTabsOnSeparateRow": true,
185+
"workbench.editorAssociations": {
186+
"*.log": "default"
187+
},
188+
"zenMode.centerLayout": false,
189+
"cSpell.words": [],
190+
"workbench.editor.limit.excludeDirty": true,
191+
"files.readonlyInclude": {
192+
".githooks/**": true
193193
}
194194
}
195195
}

astro.config.mjs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import mdx from "@astrojs/mdx";
2-
import node from "@astrojs/node";
32
import react from "@astrojs/react";
43
import tailwind from "@astrojs/tailwind";
54
import { defineConfig } from "astro/config";
@@ -8,8 +7,12 @@ import { defineConfig } from "astro/config";
87
// https://astro.build/config
98
export default defineConfig({
109
site: "https://parixan.xyz",
11-
prefetch: true,
12-
output: "server",
10+
build: {
11+
format: "directory"
12+
},
13+
prefetch: {
14+
prefetchAll: true
15+
},
1316
devToolbar: {
1417
enabled: false
1518
},
@@ -27,7 +30,6 @@ export default defineConfig({
2730
nesting: true
2831
})
2932
],
30-
adapter: node({ mode: "standalone" }),
3133
style: {
3234
global: true // Ensure global styles are applied
3335
},

0 commit comments

Comments
 (0)