Merge pull request 'chore(gitignore): update .gitignore to include additional directories and files' (#4 ) from feat/storefront into staging

Reviewed-on: http://72.61.144.167:3000/admin/the-pet-loft/pulls/4
chore(gitignore): update .gitignore to include additional directories and files
2026-03-14 12:37:12 +00:00 · 2026-03-14 15:34:33 +03:00 · 2026-03-13 19:02:43 +00:00 · 2026-03-13 21:54:20 +03:00 · 2026-03-13 21:44:18 +03:00
4 changed files with 55 additions and 1 deletions
--- a/.gitea/OPEN_PR_TO_STAGING.md
+++ b/.gitea/OPEN_PR_TO_STAGING.md
@@ -0,0 +1,24 @@
+# Open Pull Request: feat/storefront → staging
+
+## 1. Push your branch (if needed)
+```bash
+git push gitea feat/storefront
+```
+
+## 2. Create the pull request in Gitea
+
+Open this URL in your browser (replace `GITEA_BASE_URL` with your Gitea UI base, e.g. `https://72.61.144.167:3000` or your actual Gitea domain):
+
+```
+GITEA_BASE_URL/admin/the-pet-loft/compare/staging...feat/storefront
+```
+
+Or in Gitea UI:
+1. Go to **admin/the-pet-loft**
+2. Click **Pull requests** → **New pull request**
+3. Set **Base** = `staging`, **Head** = `feat/storefront`
+4. Use the pre-filled description from `.gitea/PULL_REQUEST_TEMPLATE.md` if needed
+5. Create the pull request
+
+## 3. After CI passes
+Merge the PR into `staging` from the Gitea PR page.
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ b/.gitea/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+## Summary
+Merge `feat/storefront` into `staging` to bring storefront and support/legal updates onto the staging branch.
+
+## Changes (feat/storefront → staging)
+- **Returns & refunds**: Support returns page, FAQ, and General Terms updated so customer bears return postage cost (deducted from refund).
+- **Storefront**: Returns policy page content aligned with legal (14-day withdrawal, return address, exclusions).
+- **CI**: Branch pattern in workflow updated.
+
+## Checklist
+- [ ] CI (lint, typecheck, test) passes on `feat/storefront`
+- [ ] No merge conflicts with `staging`
+
+## How to merge
+After approval, merge this PR into `staging` (merge commit or squash as per your workflow).
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
  push:
    branches:
-      - feat #"**" # TODO: change to "**" after testing
+      - "**" # TODO: change to "**" after testing

 jobs:
  ci:
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,19 @@ yarn-error.log*
 apps/admin/.env.staging
 apps/storefront/.env.staging
 convex/.env.staging
+
+# Others
+seed-data-generator/
+.agent/
+.gitea/
+.cursor/
+.idea/
+.vscode/
+docs/
+.claude/
+.aiassistant/
+add-shadcn-ui-mcp.md
+gitea-cicd-troubleshooting.md
+.gitignore
+some_html_template.html
+notes.md
Author	SHA1	Message	Date
admin	cd5199b82d	Merge pull request 'chore(gitignore): update .gitignore to include additional directories and files' (#4 ) from feat/storefront into staging All checks were successful CI / Lint, Typecheck & Test (push) Successful in 1m36s Details Deploy — Staging / Detect changed apps (push) Successful in 18s Details Deploy — Staging / Lint, Typecheck & Test (push) Successful in 1m37s Details Deploy — Staging / Build & push — storefront (push) Has been skipped Details Deploy — Staging / Build & push — admin (push) Has been skipped Details Deploy — Staging / Deploy to staging VPS (push) Has been skipped Details Reviewed-on: http://72.61.144.167:3000/admin/the-pet-loft/pulls/4	2026-03-14 12:37:12 +00:00
ianshaloom	8585ddf92a	chore(gitignore): update .gitignore to include additional directories and files All checks were successful CI / Lint, Typecheck & Test (push) Successful in 2m22s Details Added various directories and files to .gitignore to prevent them from being tracked, including IDE configurations, documentation, and seed data generator.	2026-03-14 15:34:33 +03:00
admin	7521e98ff3	Merge pull request 'feat/storefront' (#3 ) from feat/storefront into staging All checks were successful CI / Lint, Typecheck & Test (push) Successful in 1m39s Details Deploy — Staging / Detect changed apps (push) Successful in 15s Details Deploy — Staging / Lint, Typecheck & Test (push) Successful in 1m41s Details Deploy — Staging / Build & push — storefront (push) Successful in 2m50s Details Deploy — Staging / Build & push — admin (push) Successful in 2m34s Details Deploy — Staging / Deploy to staging VPS (push) Successful in 21s Details Reviewed-on: http://72.61.144.167:3000/admin/the-pet-loft/pulls/3	2026-03-13 19:02:43 +00:00
ianshaloom	56d7a653eb	chore(gitea): add PR template and instructions for merging feat/storefront into staging All checks were successful CI / Lint, Typecheck & Test (push) Successful in 1m49s Details Made-with: Cursor	2026-03-13 21:54:20 +03:00
ianshaloom	0cb2c00f43	fix(ci): update branch pattern in CI workflow All checks were successful CI / Lint, Typecheck & Test (push) Successful in 2m28s Details Changed the branch pattern in the CI workflow from a specific feature branch to a wildcard pattern ("**") for broader applicability. This adjustment is part of ongoing testing and refinement of the CI process.	2026-03-13 21:44:18 +03:00