Initial Push to Production #24

Merged

abby merged 130 commits from staging into main 2026-06-03 02:19:23 +00:00

Conversation 0 Commits 130 Files changed 86 +6045 -354

abby commented 2026-06-03 02:18:47 +00:00

Owner

Copy link

Fingers crossed this deploys successfully (after all, that's why I pushed all those commits to staging, right?)

Introduces Artisanal Boulangerie de Char. So far the application has:

• Spring Boot API with a single public endpoint, a mostly complete menu module, and scaffolding for the orders module and authorization
• React Frontend with a mobile-friendly responsive layout by default, containing a single page that displays the menu and allows (public) users to filter/sort/paginate

Lots of work to be done but hopefully this is a solid base to build upon.

Fingers crossed this deploys successfully (after all, that's why I pushed all those commits to staging, right?) Introduces Artisanal Boulangerie de Char. So far the application has: - Spring Boot API with a single public endpoint, a mostly complete menu module, and scaffolding for the orders module and authorization - React Frontend with a mobile-friendly responsive layout by default, containing a single page that displays the menu and allows (public) users to filter/sort/paginate Lots of work to be done but *hopefully* this is a solid base to build upon.

abby added 130 commits 2026-06-03 02:18:47 +00:00

Finished GET /api/menu endpoint ... 29f916422f

Disabled docker compose for now to get up and running. Adding bruno API
testing documents for portability.

Create frontend and install DaisyUI with text button rendered to '/' 1c7c96b3e0

Create Desktop NavBar with dummy data a6e268a4ff

Add react-router 191eae4c16

Add footer aa258c47c5

Routing to menu and home with NavLink working with dummy Menu page data b6927733ac

Merge branch 'develop' into begin-api 5ea182f24f

Merge pull request 'Finished GET /api/menu endpoint' (#3) from begin-api into develop ... 060247a4e4

Reviewed-on: #3

Use flex to keep footer at bottom of screen d217f3109d

Create landing page/hero bd33f5d66d

Add Image and Hero overlay for landing page. ... faf6a50b47

hero overlay is finally centered vertically but now it isn't centered
horizontally. *womp womp*

add flex flex-col to hero-content div to place menu button underneath <h1> 9e5dd1fec2

Add MenuList compont with dummy data 970cece7ff

Add hamburger menu and centered title for mobile 0c628289e7

Merge branch 'develop' into feature/1-frontend-scaffolding 5b5f2ed176

Merge branch 'feature/1-frontend-scaffolding' into develop 4c7425d3bb

Merge pull request 'bugfix/7-responsive-navbar' (#9) from bugfix/7-responsive-navbar into develop ... 5b02fd066f

Reviewed-on: #9

Fixed margins on hero - it stays centered horizontally on extra large screens now as well. b0acf08dce

Create basic menu table with dummy data 5bbe633853

Fixed navbar to top and footer to bottom. Added margin and padding to top of MenuPage to compensate for NavBar being fixed (to prevent top of page disappearing beneath navbar). 1f90c19f60

Import tanstack query & axios, create MenuItem type, create api-client & begin menu-api, allow :5173 origin in MenuItemController, utilize menu-api in MenuList 141ec378b2

Create .gitignore 65ba515bef

Fix z-index of NavBar 28a2747693

Added another breakpoint to NavBar to display 'ABC' below the sm breakpoint and 'Artisanal Boulangerie de Char' above it. 70c752ba22

Merge pull request 'feature/2-menu-table' (#10) from feature/2-menu-table into develop ... 21aabe8dea

Reviewed-on: #10

Create frontend and backend Dockerfiles and frontend nginx.conf b92d2ef1d3

Add buid-push.sh script to test container images and registry prior to ... 98c219aa15

creating Woodpecker-CI workflow.

Update frontend Dockerfile & create nginx.conf.

Change backend folder name to backend ca38bf5726

fixed typo in db seeding data f2fbba8344

Add postgres dependency and config f15ea86f29

Add CorsConfig.java 7c0704a6b8

Update build-push.sh to use staging tag, frontend Dockerfile to pass VITE_API_BASE_URL, and api-client.ts to explicity take the VITE_API_BASE_URL env variable a1edb15a91

Add frontend url base to config and CrossOrigins annotation on MenuItemController d77218400e

Ensure application.yaml for all profiles contains spring.profiles.active ENVVAR d5c45a5ac1

Merge pull request 'feature/11-docker-config' (#13) from feature/11-docker-config into develop ... 6d17dc503c

Reviewed-on: #13

Removed unnecessary prop spring.profiles.active from all three application.yaml files. Corrected a typo in CorsConfig to allow frontend URL in prod, staging, and dev. Updated JDK version to 25 in pom.xml and removed docker compose dependency. a0d9671dd2

Add forgejo link to footer 44eb579206

create .woodpecker directory and start build-and-deploy.yaml efdab03537

create .woodpecker directory and start build-and-deploy.yaml fab7a995a3

create .woodpecker directory and start build-and-deploy.yaml f2040a84fc

Implemented paging per this article: https://medium.com/@er.rajatshukla/how-to-add-pagination-sorting-and-filtering-in-spring-data-jpa-898b1da45efc ... 7bb4515d5a

Commented out previous service/controller methods for testing Pageable approach.

Implemented pagination, filter by category, and sorting using JPA. Removed unnecessary methods from service, repository, mapper, and controller. 8ac32cf67f

Add Page.ts type, update menu-api to return Page<MenuResponse>, Fixed rendering of menu items in MenuList.tsx 98ca8a1215

Added a loading spinner to MenuList.tsx f8b5427da9

begin MenuControls ba76f1a8c7

add dropdowns for category filter and sort by selection ad95740516

Merge branch 'feature/4-5-menu-filter-and-sort' of git.mocalabs.dev:abby/artisanal-boulangerie-de-char into feature/4-5-menu-filter-and-sort 3f60f07933

Removed unused MenuResponse type bbb3700116

Centered error message on fail to load menu items 31e38c525b

Update fetchMenu to fetchMenuPage, Moved menu API call up to MenuPage with props for filter/sort/page being passed to MenuControls and props for data being sent to MenuList e76e08ce4a

Add pagination buttons & items per page dropdown (no controls are wired to backend yet, just placing them in the UI) 8ccf179507

Added functions (and passed them to MenuControls as props) for filter/sort via the JPA API 24e66f2db9

Fixed pagination "Off by 1" error in the frontend (UI is 1 indexed, JPA Pages are 0 indexed ...) 3ace10457e

Changed layout of sort/filter controls to column on small screens 4c51e1869a

removed unused parameters 2e80785b09

Merge pull request 'feature/4-5-menu-filter-and-sort' (#15) from feature/4-5-menu-filter-and-sort into develop ... 7cde546ab0

Reviewed-on: #15

start woodpecker workflow with building and pushing container images to registry 6d891fbd63

removed obsolete workflow config and renamed files for staging and production 4784a1a67c

Added build-and-push steps to production workflow d59bb7b114

Update dockerfile path in workflow config a59977dd16

Update dockerfile path in workflow config 8d21da03a8

Merge branch 'feature/12-woodpecker-ci' of git.mocalabs.dev:abby/artisanal-boulangerie-de-char into feature/12-woodpecker-ci 4974c0f766

explicitly stated in build script step asking if user has logged in a319c77100

add context parameter to staging and production woodpecker workflows c600f0db2c

updated context and dockerfile path acf25d18ce

updated context and dockerfile path 4f53bf046c

Merge branch 'feature/12-woodpecker-ci' of git.mocalabs.dev:abby/artisanal-boulangerie-de-char into feature/12-woodpecker-ci 734d457989

Update path to dockerfile e78b344928

Update JDK version to 25 in dockerfile 0be7a79c96

Add PaginationProps interface and explicitly set types in calls to useState in MenuPage. e9bc2ed88e

Added more explicit typing to resolve compilation errors b379c824a5

Update MenuListProps definition d88a299c5b

Update docker context directory to deploy staging branch 81e1e41783

Merge pull request 'feature/12-woodpecker-ci' (#16) from feature/12-woodpecker-ci into develop ... 5db822287c

Reviewed-on: #16

Merge pull request 'Pulling in CI/CD workflow from develop into staging' (#17) from develop into staging ... 999c05b17e

Reviewed-on: #17

Add ssh step to production workflow b0e4e2c523

Create separate dev and prod/staging CorsConfig files 92b34b1a30

Add SecurityConfig, update SecurityConfigDev, removed DEBUG logging from production application.yaml 4f1b9742a7

Add SecurityConfig, update SecurityConfigDev, removed DEBUG logging from production application.yaml 242ae33952

Updated API base in backend and on VPS to resolve letsencrypt errors. c9b65695a4

Changed Spring Security logging to DEBUG 43678e1405

added 'sha-' to front of to ensure it remains a string (and doesn't get converted to a float/scientific notation because of an 'e14' in the hash 61fe02468b

Temporarily disabled formLogin and httpBasic authentication. Will re-enable once auth module is implemented (Just need to ensure the frontend can comsume the basic API for now) 31f3d850da

Disable Spring Security auto-generation of in-memory user 47b98e6528

Found correct syntax to specify multiple profiles on SO: https://stackoverflow.com/questions/38133808/spring-multiple-profiles-active and https://docs.spring.io/spring-framework/reference/core/beans/environment.html 6842f8aa93

Changed allowed public endpoints to * dbf54aeb21

Reverted to very basic SecurityConfig.java a2e7c9d44e

Reverting Spring Security for public endpoint 2e96c218be

Updated README 9ed5b51ee9

Temporarily disabled formLogin and httpBasic authentication. Will re-enable once auth module is implemented (Just need to ensure the frontend can comsume the basic API for now) 2ba0c2213d

Add exclude in main app class 7820c1c8f2

Applied dev SecurityConfig to all for now until Auth is implemented. ca1e98f45e

Applied dev SecurityConfig to all for now until Auth is implemented. 926b31dabf

Create SecurityConfigStaging.dev. Added rule to ensure HttpStatus.OPTIONS is matched first. c6603ec6a7

Update application-staging.yml (Fixed a typo) 47be881ef8

Add more debug logging to SecurityConfigStaging. d1619fc150

Remove excludes from AbcApplication dc158300d1

Fixed some formatting in SecurityConfig 88465273da

Added auth and securityconfig from previous ABC implementation and updated woodpecker to build from this branch to test 05780202a3

Added auth and securityconfig from previous ABC implementation and updated woodpecker to build from this branch to test a607f74248

Add excludes in application-staging.yml 1771556b47

Renamed CustomUserDetailsService, added authorities granting. aa0886c494

Explicitly disabled formLogin and httpBasic in securityConfig. 774312bbbb

Added explicit call to CustomSecurityUserDetailsService in SecurityConfigStaging. 65a55e7bed

Removed explicit call to @EnableWebSecurity 0ae287d54f

Removed excludes from main application class. ff3466c09d

Changed userDetailsService to return a new instance rather than requiring a parameter. 952e6d5650

Noticed dev environment used my customUserDetailsService when adding the AuthenticationManager. Updating SecurityConfigStaging to be similar to Dev (Still trying to get public endpoint accessible without login) 8beff800af

Noticed dev environment used my customUserDetailsService when adding the AuthenticationManager. Updating SecurityConfigStaging to be similar to Dev (Still trying to get public endpoint accessible without login) 88fac18cf7

added exclude to main class 39ad23db14

added exclude to main class fa2e5dd1d2

Removed profile designation from SecurityConfig. cc8ff6f092

Removed profile designation from SecurityConfig. 74f9e92ddb

Removed profile designation from SecurityConfig. 5c5b57793e

Found the (super embarrasing) user error in all the testing on this branch (docker-config file on the server did not reflect change to image naming scheme, was not running any of my changed code since around 3 days ago) 6a121af821

Add /actuator/** to public endpoints in SecurityConfig 21d50af62e

Update /api/menu to /api/menu/** in SecurityConfig to allow filter/sort/paging params. 126f351890

Update /api/menu to /api/menu/** in SecurityConfig to allow filter/sort/paging params. 6c5cf1599d

Path prefix change was missing from MenuItemController 164a3cf36c

Update menu model to use PagedModel 60d158b88f

added /api back to menu-api.ts bb1c29737f

Removed unnecessary methods in MenuItemRepository c9080356d5

Removed test profile 7a698ae072

Added explicit call to set Spring Profile envvar in woodpeckerci workflow 90efa63ebf

Removed feature/18 branch from woodpecker-ci in preparation for PR afa0871ddd

Merge pull request 'feature/18-securityconfig' (#21) from feature/18-securityconfig into develop ... 647e104b8b

Reviewed-on: #21

Merge pull request 'SecurityConfig & Menu Display' (#22) from develop into staging ... c4a49e9207

Reviewed-on: #22

Updated build-and-deploy-production.yaml and created matching docker-compose.yaml on the server. 211d8a1527

Merge branch 'staging' into develop 0fe3e35781

Merge pull request 'Updated build-and-deploy-production.yaml and created matching docker-compose.yaml on the server.' (#23) from develop into staging ... 43d0d29969

Reviewed-on: #23

abby added this to the Menu details, filtering & sorting milestone 2026-06-03 02:19:10 +00:00

abby added this to the Artisanal Boulangerie de Char project 2026-06-03 02:19:13 +00:00

abby merged commit 0842fe31e0 into main 2026-06-03 02:19:23 +00:00

abby referenced this pull request from a commit 2026-06-03 02:19:25 +00:00

Merge pull request 'Initial Push to Production' (#24) from staging into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Menu details, filtering & sorting

Projects

Clear projects

No items

No project

Artisanal Boulangerie de Char

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

abby/artisanal-boulangerie-de-char!24

No description provided.