Version 1.0 #102

2026-01-03T14:47:30Z

FernandoJVideira commented

2026-01-03 14:47:30 +00:00

Finally :D

FernandoJVideira added 163 commits 2026-01-03 14:47:30 +00:00

Merge pull request 'Rebase Develop' (#58 ) from master into develop a335e713ee

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/58
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: KZix <[email protected]>
Reviewed-by: Edd <[email protected]>

Added necessary stuff for authentication d7a6862dcb

Merge pull request 'feature/database-and-auth-api' (#59 ) from feature/database-and-auth-api into develop 8472263f91

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/59
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

feat: websocket init 69705ce61c

Merge branch 'develop' into feature/websocket-init 117f007b83

Added the register endpoint daa72ce4c6

feature implement login part 1 511e645d7e

feat:initial commit 1d5100fbdf

Merge pull request 'feat: websocket init' (#60 ) from feature/websocket-init into develop 7c6d8ed446

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/60
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: KZix <[email protected]>

Merge branch 'develop' into feature/register-api-endpoint 20f53197ec

Merge pull request 'Added the register endpoint' (#61 ) from feature/register-api-endpoint into develop af41990807

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/61
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

Merge branch 'feature/login-page' into feature/profile-page a0ad35bb08

Added initial game logic 7686aff546

Added endpoits to create, join and update the game state, playability should work now cf8f93d984

removed crap i did, sorry frontends 5473a4cc69

Merge pull request 'feature/game-endpoints' (#62 ) from feature/game-endpoints into develop 5270e3c093

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/62
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Edd <[email protected]>

Merge branch 'develop' into feature/login-page ae6a0b4706

Merge branch 'develop' into feature/profile-page 94fdbd568c

Added routes, endpoints to get all matches, get a specific match, create a match, join a match, and update the match b485e19c9d

Merge pull request 'Added routes, endpoints to get all matches, get a specific match, create a match, join a match, and update the match' (#68 ) from feature/matches-api-endpoints into develop 8a6e0d0255

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/68
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

SyntaxSquad/DADProject#9 feat: User info dysplayed in /users/ d1dd2c00f6

feat: gameboard ui 2b161e2099

feature implement login part2 a566387998

feature implement login final changes 2734e25cce

removed vscode preferences c03d49e7e4

Merge branch 'develop' into feature/login-page 8e179200a5

home page feature part 1 e8ccea4e42

Merge pull request 'Implement login page with email/password authentication' (#69 ) from feature/login-page into develop 289e8df604

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/69
Reviewed-by: FernandoJVideira <[email protected]>

Merge branch 'develop' into feature/home-page b59640c858

Merge branch 'develop' into feature/frontend-gameboard-singleplayer 5c1fc11975

Added game start for single player, 3 and 9 card game types and protected the pages for only logged in players e833e403f7

fix: api.php cleanup c78c5d2784

fix: GameControler create game fixed 10508cc0b1

Merge branch 'develop' into fix/api-endpoints d0f9a03b93

Merge pull request 'Fixed Endpoint file and GameController' (#70 ) from fix/api-endpoints into develop 7d1b769bdb

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/70
Reviewed-by: KZix <[email protected]>
Reviewed-by: Edd <[email protected]>

Merge branch 'develop' into feature/frontend-gameboard-singleplayer e54ec58f0c

SyntaxSquad/DADProject#9 Actuall User View d903f96d57

Merge remote-tracking branch 'origin/develop' into feature/profile-page 29fc78c9f5

SyntaxSquad/DADProject#9 feat: Added profile change and name/password changes. b82b4d5b59

SyntaxSquad/DADProject#9 fix: Used Tailwind Classes and Exported inline CSS into "UserPage.css" 18cef8da4b

SyntaxSquad/DADProject#9 fixforthefix: Remove anoying gray bg c34d74db46

SyntaxSquad/DADProject#14 added protection to logout inside a game and going to another page 8505d207e6

fix auth 0320230279

remove comment e47a453588

Merge branch 'develop' into na/fix-auth 28466ecbbd

Merge pull request 'Fix auth' (#72 ) from na/fix-auth into develop 44c0ac599e

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/72
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: KZix <[email protected]>

Merge remote-tracking branch 'origin/develop' into feature/home-page ea15f5e28a

SyntaxSquad/DADProject#14 added start logic for bot c0b77aebb1

Merge branch 'develop' into feature/frontend-gameboard-singleplayer 1939822e9b

SyntaxSquad/DADProject#10 feat: Account deletion (soft delete) 30705fd194

Merge branch 'develop' into feature/profile-page f4aaf9a787

Merge pull request 'feature/profile-page' (#71 ) from feature/profile-page into develop 723d5270e4

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/71
Reviewed-by: KZix <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Edd <[email protected]>

Merge branch 'develop' into feature/account-deletion 381f30a0f5

SyntaxSquad/DADProject#14 Bot works and play works, still has some bugs d8e20dfc67

Merge branch 'develop' into feature/frontend-gameboard-singleplayer f3f6c6e564

SyntaxSquad/DADProject#14 fixed routes 7a6fbb4ba3

Merge pull request 'feature/account-deletion' (#73 ) from feature/account-deletion into develop 7cfe9d2746

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/73
Reviewed-by: KZix <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

feat: api admin users endpoints 026e7af6a5

SyntaxSquad/DADProject#14 Added final touches to the gameplay 00666a16b2

Merge branch 'develop' into feature/frontend-gameboard-singleplayer 83adbcf2f1

Merge pull request 'feat: api admin users endpoints' (#74 ) from feature/api-admin-user-endpoint into develop 79310fa63e

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/74
Reviewed-by: KZix <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

SyntaxSquad/DADProject#14 added surrender button 0bf96fc948

SyntaxSquad/DADProject#14 missed one file 8912029686

Merge branch 'develop' into feature/frontend-gameboard-singleplayer 943a5dd898

Merge pull request 'SyntaxSquad/DADProject#14 feature/frontend-gameboard-singleplayer' (#75 ) from feature/frontend-gameboard-singleplayer into develop a0bbd8a69d

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/75
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Edd <[email protected]>

Merge branch 'develop' into feature/home-page 160489b080

home page feature final d8cdbbf2ad

remove package-lock 5295d0620f

Merge pull request 'Build game lobby for single-player and multiplayer modes' (#76 ) from feature/home-page into develop ef0bdab0d3

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/76
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: KZix <[email protected]>

feat: api admin policies d4361121d8

SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 Added initial setup for websockets 09c4732e19

Added dummy user to create a game 0d0f7569a6

SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added sockets for game joining and card play 14dd4b3a4e

SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added packagelock.json to gitignore b5c3c552da

chore: stop tracking package-lock.json b35cac3b2c

Merge pull request 'feature/initial_gameplay_websockets' (#77 ) from feature/initial_gameplay_websockets into develop 329bbcc1d3

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/77
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

tmp: pc change b7daa4610b

home page feature part 1 c68cda350e

feat: gameboard ui cfda949ea6

Added game start for single player, 3 and 9 card game types and protected the pages for only logged in players e68f1357cc

SyntaxSquad/DADProject#14 added protection to logout inside a game and going to another page 3ec6f8971c

SyntaxSquad/DADProject#14 added start logic for bot 5924d08f73

SyntaxSquad/DADProject#14 Bot works and play works, still has some bugs ceb3d735ad

SyntaxSquad/DADProject#14 fixed routes ab231ee94f

SyntaxSquad/DADProject#14 Added final touches to the gameplay 08c20acdf4

SyntaxSquad/DADProject#14 added surrender button eafb4a4d1c

SyntaxSquad/DADProject#14 missed one file 79be3544cb

home page feature final 87e0dc2518

remove package-lock a34027889f

SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 Added initial setup for websockets 8f7102b335

Added dummy user to create a game d29e44c61c

SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added sockets for game joining and card play c4078d9b82

SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added packagelock.json to gitignore 52887fc2eb

chore: stop tracking package-lock.json f60b25f29b

feat: api admin user and game policies 25c819c6e4

fix: removed .env 0ecdc30bd4

fix: added missing route 4b311c74eb

Merge branch 'develop' into feature/api-admin-policies 51f745a3dd

added StatisticsController.php and changed the User.php model and ProfileController.php that were missing some imports edecef3af8

Adde routes for statistics 39f55a12c0

Added protection to Nickname and added user get coins endpoint 59df3e2d37

Merge pull request 'feature/api-admin-policies' (#78 ) from feature/api-admin-policies into develop 83f92e670d

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/78
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: Edd <[email protected]>
Reviewed-by: KZix <[email protected]>

Merge branch 'develop' into feature/api-stats 754a227608

Merge pull request 'feature/api-stats' (#82 ) from feature/api-stats into develop c456c9482f

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/82
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

histories are a little messed, will change the logic in the future (techdebt) 4f391e3638

Merge pull request 'register, coin balance, game history and transactions mockup' (#83 ) from na/history-and-register into develop 3d23627433

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/83
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: KZix <[email protected]>

feat: api users change password endpoint 54b4fc7cb1

Added routes, admin statistics to the controller and added models for coin transaction and coin transaction type 5f845b2ba7

Added transaction details for the logged user f38f08923f

Merge pull request 'feat: api users change password endpoint' (#84 ) from feature/api-update-password into develop 2a438dce26

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/84
Reviewed-by: KZix <[email protected]>
Reviewed-by: Edd <[email protected]>

Added endpoint to get authenticated user's transactions 9bfa06b1ce

Merge branch 'develop' into feature/api-adminstats-transactions 58e6615876

removed comments on code cf3ca26382

Merge pull request 'feature/api-adminstats-transactions' (#85 ) from feature/api-adminstats-transactions into develop 881a60a388

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/85
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

matches and transactions history fully operational 1b03558f93

Merge pull request 'matches and transactions history fully operational' (#86 ) from na/fix-histories into develop f3e8ffc400

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/86
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: KZix <[email protected]>

Added endpoint to create tranasactions 5975208877

Merge pull request 'Added endpoint to create tranasactions' (#87 ) from feature/api-coinpurchase into develop 50ae1b7f1f

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/87
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

Added api logic with transactions when match is finished, started and joined cf238d5451

Merge pull request 'Bugfix: Added api logic with transactions when match is finished, started and joined' (#88 ) from bugfix/matches-transactions into develop ff16a57a97

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/88
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

Implemented coin purchase-flow c0af76abd3

Merge pull request 'Implemented coin purchase-flow' (#89 ) from feature/coin-purchase into develop 45d8aa0035

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/89
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

Created statistics personal and general 16f8d3bdfc

Merge pull request 'Created statistics personal and general' (#90 ) from feature/statistics into develop bcdf542606

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/90
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

SyntaxSquad/DADProject#15 feat: Initial Idea e84dd993af

Issues Websockets #48 #49 #51 e #54 e23ca3d1ff

Merge pull request 'Issues Websockets #48 #49 #51 e #54 ' (#91 ) from feature/websockets-game-continue into develop ef277a3cfd

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/91
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

Merge remote-tracking branch 'origin/develop' into feature/multiplayer-game-interface 5880960c42

fix:websocket errors & polict change 3a7b1b9794

Merge pull request 'fix:websocket errors & polict change' (#92 ) from fix/websocket-errors into develop b9df0a4d4a

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/92
Reviewed-by: Edd <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

Admin platform, with users, transactions, games and admin creation e89b60c844

Merge pull request 'Admin platform, with users, transactions, games and admin creation' (#93 ) from feature/admin-platform into develop ee28333da8

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/93
Reviewed-by: KZix <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

SyntaxSquad/DADProject#15 feat: Added Multiplayer View and Stuff 5e90de812b

SyntaxSquad/DADProject#15 fix: Merge Conflicts Fixed. 7c8fdd6ea2

Merge pull request 'feature/multiplayer-game-interface' (#94 ) from feature/multiplayer-game-interface into develop 1dc2d25a41

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/94
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Edd <[email protected]>
Reviewed-by: KZix <[email protected]>

SyntaxSquad/DADProject#16 fix: Timer issues and Forfeight button 23d0ea1343

Matches almost done still refining c3f8c3fff0

Merge branch 'develop' into feature/websockets-matches 25d21f7cf8

Final touches a804f41956

Merge pull request 'feature/websockets-matches' (#95 ) from feature/websockets-matches into develop 030b00059e

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/95
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: Edd <[email protected]>

Added list for games and matches in the user profile 1a7916a836

Added matches scrollable to home page 432d3c0b88

Added corrections to user profile and admin match and game history 894a38bb27

little date adjustements 2d2d0149d8

Merge pull request 'feature/frontend-add-match-profile-tabs' (#97 ) from feature/frontend-add-match-profile-tabs into develop a09639abcf

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/97
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: Edd <[email protected]>

Merge branch 'develop' into na/matches-home-page 59fea64df5

Merge pull request 'Added matches scrollable to home page' (#96 ) from na/matches-home-page into develop 52cb893bd0

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/96
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: KZix <[email protected]>

SyntaxSquad/DADProject#16 fix: Surrender if leave 1088749386

SyntaxSquad/DADProject#16 merge: fix merge conflics 7e6766c726

fix:admin match table sort 46e3f0eef6

SyntaxSquad/DADProject#16 fix: Cancle and Return is working and some other fixes involving game duration 3dcd8df4c7

fix:user profile match table sort bcfa5c06f7

Merge pull request 'fix:admin & user match table sort' (#98 ) from fix/frontend-admin-match-sort into develop cd25915d92

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/98
Reviewed-by: Edd <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

SyntaxSquad/DADProject#16 feat: Can now start matches, just missing the actuall gameplay e0ca8e51a6

SyntaxSquad/DADProject#16 feat: MATCHES AND STUFF 0fb64ff30c

SyntaxSquad/DADProject#16 fix: i forgot this ceba5178f3

SyntaxSquad/DADProject#16 fix: merge conflics fixed 00cb5ba966

Merge pull request 'feature/bestof-series-interface' (#99 ) from feature/bestof-series-interface into develop 4cfab79611

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/99
Reviewed-by: KZix <[email protected]>
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

hotfix: Finnal fix 83832aaaa9

hotfix: Singler player now plays fine a3da9af90d

Merge pull request 'fix/single-player' (#100 ) from fix/single-player into develop b046a85806

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/100
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

removed comments f7328d59eb

Merge pull request 'removed comments' (#101 ) from na/comment-removal into develop 55399ab06a

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/101
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

AfonsoCMSousa approved these changes 2026-01-03 14:48:00 +00:00

KZix approved these changes 2026-01-03 14:48:37 +00:00

Edd approved these changes 2026-01-03 14:48:51 +00:00

FernandoJVideira merged commit 3ba3487f81 into master

2026-01-03 14:49:00 +00:00

FernandoJVideira referenced this issue from a commit

2026-01-03 14:49:02 +00:00

Merge pull request 'Version 1.0' (#102) from develop into master

Sign in to join this conversation.

No Reviewers

AfonsoCMSousa

KZix

Edd

4 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: SyntaxSquad/DADProject#102