Added equipment handling with image uploading #9

Open

22351795 wants to merge 0 commits from test into dev

pull from: test

merge into: 2025:dev

2025:main

2025:dev

2025:frontend

2025:backend

2025:main-old

Conversation 0 Commits - Files changed -

22351795 commented 2025-11-23 09:27:40 +00:00

Member

Copy link

Merge from test to dev

Merge from test to dev

22351795 added 3 commits 2025-11-23 09:27:40 +00:00

Added - Admin Equipment manage page b5c19d5cf4

Amended Equipment logic cb837130c4

Added the equipment creation,editing and deletion logic and handle image uploading 2edf92f9b6

22351795 added 1 commit 2025-11-23 09:53:17 +00:00

Updated to Equipment controller rather than Admin 47c004082d

Some checks failed

Hide all checks

CI Pipeline / Frontend Tests (pull_request) Successful in 37s

Details

CI Pipeline / Frontend Build (pull_request) Failing after 29s

Details

CI Pipeline / Backend Tests (pull_request) Failing after 5m8s

Details

CI Pipeline / Backend Build (pull_request) Has been skipped

Details

CI Pipeline / Docker Build Test (pull_request) Has been skipped

Details

This pull request has changes conflicting with the target branch.

• backend/src/main/java/com/example/booking/controller/AdminController.java
• frontend/src/App.jsx

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin test:test

git switch test

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 dev

git merge --no-ff test

git switch test

git rebase dev

git switch dev

git merge --ff-only test

git switch test

git rebase dev

git switch dev

git merge --no-ff test

git switch dev

git merge --squash test

git switch dev

git merge --ff-only test

git switch dev

git merge test

git push origin dev

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

  

Compat/Breaking

Breaking change that won't be backward compatible

  

Kind/Bug

Something is not working

  

Kind/Documentation

Documentation changes

  

Kind/Enhancement

Improve existing functionality

  

Kind/Feature

New functionality

  

Kind/Security

This is security issue

  

Kind/Testing

Issue or pull request related to testing

  

Priority

Critical

The priority is critical

  

Priority

High

The priority is high

  

Priority

Low

The priority is low

  

Priority

Medium

The priority is medium

  

Reviewed

Confirmed

Issue has been confirmed

  

Reviewed

Duplicate

This issue or pull request already exists

  

Reviewed

Invalid

Invalid issue

  

Reviewed

Won't Fix

This issue won't be fixed

  

Status

Abandoned

Somebody has started to work on this but abandoned work

  

Status

Blocked

Something is blocking this issue or pull request

  

Status

Need More Info

Feedback is required to reproduce issue or to continue work

No labels

Compat/Breaking

Kind/Bug

Kind/Documentation

Kind/Enhancement

Kind/Feature

Kind/Security

Kind/Testing

Priority

Critical

Priority

High

Priority

Low

Priority

Medium

Reviewed

Confirmed

Reviewed

Duplicate

Reviewed

Invalid

Reviewed

Won't Fix

Status

Abandoned

Status

Blocked

Status

Need More Info

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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

2025/CSIS-equipment-booking-system-group-11!9

No description provided.