ForgeMaster/Music-APP
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

feature/homescreen-merge #1

Open
Ardy wants to merge 4 commits from feature/homescreen-merge into main
pull from: feature/homescreen-merge
merge into: ForgeMaster:main
Conversation 0 Commits 4 Files changed 23 +2081 -356
Ardy commented 2026-04-06 11:08:31 +00:00
First-time contributor
Copy link
No description provided. 
# Conflicts:
#	src/pages/main/Home.jsx
- Activity lines use clear verbs (going to, interested in, checked in at, went to)
  with event title and venue; photo and artist/venue announcements aligned
- Batch consecutive same-venue milestones; filter list by Friends / Venues / Artists
- Richer /milestones mock data for dev feed
- Optional localhost/*.local auth bypass (VITE_DISABLE_LOCAL_BYPASS) and skip JWT
  validation in useTokenValidator; Vite allowedHosts for *.wearegroupies.com.local

Made-with: Cursor
- Add ChatScreen and MessagesThread; wire /friend/:id/chat in App and BottomNav Messages tab.
- Refactor Alerts into Messages inbox (invites, chats, people search) with New action.
- Extend mock API: DM threads in searchOnly dev mode, friend requests seeds, group-style demo friends (Kraak & Smaak, Pinkpop), milestone reaction counts.
- Feed: heart-only interaction for interest (store or milestone-local); optional interest_count from API.
- Dev harness: chat route, demo paths, FriendDetail chat handoff cleanup; minor login/profile labels.

Made-with: Cursor
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/homescreen-merge:feature/homescreen-merge
git switch feature/homescreen-merge

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feature/homescreen-merge
git switch feature/homescreen-merge
git rebase main
git switch main
git merge --ff-only feature/homescreen-merge
git switch feature/homescreen-merge
git rebase main
git switch main
git merge --no-ff feature/homescreen-merge
git switch main
git merge --squash feature/homescreen-merge
git switch main
git merge --ff-only feature/homescreen-merge
git switch main
git merge feature/homescreen-merge
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ForgeMaster/Music-APP!1
No description provided.