Skip to content
This repository has been archived by the owner on Jul 8, 2024. It is now read-only.

app/delivery: add base features #110

Merged
merged 8 commits into from
Jun 29, 2024
Merged

app/delivery: add base features #110

merged 8 commits into from
Jun 29, 2024

Conversation

floriaaan
Copy link
Owner

No description provided.

* autoupdate location (warning by default 1min, call to mapbox for every order)
* can validate orders
* have markers to order on map
* have paths to restaurant then user
* have settings page
Copy link

sonarcloud bot commented Jun 2, 2024

Please retry analysis of this Pull-Request directly on SonarCloud

Copy link

sonarcloud bot commented Jun 2, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
2 Security Hotspots
0.0% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Copy link

sonarcloud bot commented Jun 2, 2024

Please retry analysis of this Pull-Request directly on SonarCloud

Copy link

sonarcloud bot commented Jun 2, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
1 Security Hotspot
0.0% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

1 similar comment
Copy link

sonarcloud bot commented Jun 2, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
1 Security Hotspot
0.0% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Copy link

sonarcloud bot commented Jun 2, 2024

Please retry analysis of this Pull-Request directly on SonarCloud

Copy link

sonarcloud bot commented Jun 2, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
1 Security Hotspot
0.0% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Copy link

sonarcloud bot commented Jun 2, 2024

Please retry analysis of this Pull-Request directly on SonarCloud

@floriaaan floriaaan merged commit c26f482 into dev Jun 29, 2024
35 of 36 checks passed
floriaaan added a commit that referenced this pull request Jun 29, 2024
* fix(ui): fix accordion overflow hidden, fix select defaultValue, fix sheet in dropdown

* fix(lint): fix lint issues

* feat(home): add banner and cta

* feat(toast): add toast

* feat(admin): add product create/edit form

* feat(admin): add map and menu links

* fix(lint): fix lint issues

* feat(footer): add links

* feat(nginx): add nginx (docker and config)

* feat(form): add select+quantity input

* feat(form): finish product create/edit form

* fix(form): add null checks

* feat(account): add account pages

* ref(cta): change cta sentence

* feat(checkout): add checkout page

* feat(checkout): add safeguard for page

* ref(catalog): add no product

* ref(cta): add captions

* feat(order): add order page

* ref(structure): change folder name

* upgrade-deps: update nextjs

* ref(next.config): updated images.domains to images.remotePattern

* feat(indicator): add order+basket indicator

* feat(order/creation): add protection to prevent creating two orders

* ref(basket): add delete button

* fix(react): add suppressHydrationWarning

* feat(query): add tanstack/query to fetch datas using custom fetcher

* feat(admin): create admin sidebar

* feat(admin): Style the sidebar

* [FEATURE]: Add admin pages and layout

* [REFACTO]: Fix ref forward exception

* [REFACTO]: Add key to the components rendered in a map

* [FEATURE]: Fix size

* [REFACTO]: Test users requests in bruno and create new requests

* feat(link): add link to api for restaurant & product

* [FEATURE]: Add bruno requests

* [REFACTO] Replace number by uuid and handle error

* ref(link): change basket structure #36

* [REFACTO]: Fix user id type usages

* [REFACTO]: Optimize imports

* ref(#35): change restaurant structure

* ref(#35): change restaurant controller and update bruno requests

* ref(client): remove clients

* ref(schema): change address structure

* ref(handlers): update handlers

* chore(deps): update prisma

* ref(gateway): update handlers

* feat(delivery): add update location for delivery person handler

* ref(docker): change docker compose

* ref: update dependencies and add mapbox token

* ref(schema): add restaurant address and update foreign key constraint

* ref(types): update delivery and delivery person types

* feat: add distance calculation and eta functionality

* ref(handlers): update delivery and person handlers to include restaurant address

* ref(gateway): update controllers with new routes and functions

* feat(bruno): update requests

* feat(#29): add health check

* test: tried to add tests

* feat(#42): add restaurant users endpoint

* ref(bruno): update requests

* Refactor stock controller routes

* Add .nyc_output/ and coverage/ to .gitignore

* ref(#24): update docker publish tags

* add code workspace

* chore(deps): update prisma

* ref(model): update proto and model

* ref(handlers): update handler to new model structure

* fix(amqp): change subscriber callback fnc

* feat(gatewau): change ednpoint handlers

* ref(controller): handle message types

* feat(requests): update notifications bruno requests

* Add daily report

* Add get order by restaurant

* feat(gateway): add user's notification in response

* Add LangVersion missing and change other service url

* Update to feet with the new restaurant proto

* Disable test

* fix(lint): prettier format

* fix(#35): change restaurant address structure

* fix(basket): change products to productsList

* ref(link): link basket to api

* feat(link): change main address of user

* feat(eta): add eta calculation

* fix(build): fix build issues

* Update apps/web/hooks/useBasket.tsx

* fix(basket): change products to productsList

* [BUGFIX]: checkout payment and stripe integration

* [FEATURE]: Move the webhook

* [FEATURE]: updateQuantityFromBasket

* Remove test project

* [FEATURE]: Add recipe in product service

* [FEATURE]: add new token in the validate response

* [BUGFIX]: Push to the right login page

* [BUGFIX]: Fix webhook and more

* [REFACTO]: Remove from stock the right amount of ingredient

* Update services/delivery/.env.docker

Co-authored-by: Florian Leroux <[email protected]>

* Update services/payment/.env.docker

Co-authored-by: Florian Leroux <[email protected]>

* Update services/delivery/src/handlers/delivery/create.ts

Co-authored-by: Florian Leroux <[email protected]>

* Update services/order/src/handlers/order/create.ts

Co-authored-by: Florian Leroux <[email protected]>

* Update services/gateway/src/middleware/auth.ts

Co-authored-by: Florian Leroux <[email protected]>

* Update services/gateway/src/middleware/auth.ts

Co-authored-by: Florian Leroux <[email protected]>

* Update services/gateway/.env.example

Co-authored-by: Florian Leroux <[email protected]>

* Update apps/web/app/(normal)/checkout/callback/[id]/page.tsx

Co-authored-by: Florian Leroux <[email protected]>

* Update apps/web/app/(normal)/checkout/callback/[id]/page.tsx

Co-authored-by: Florian Leroux <[email protected]>

* feat(#49): extend product response

* fix: product stock calculation and canMake logic

* Update Docker images and versions

* feat(#49): add out-of-stock indicator, and sort by !isOutOfStock first

* fix(reporting): fix docker issues

* fix(basket): change products to productsList

* feat(data): add user, restaurant, and promotion tables

* chore: update nextjs

* ref(api): add bruno requests

* ref(home): add selectedRestaurant and selectedRestaurantId to Catalog component

* ref(link): add api datas to admin provider

* ref(back-office): change ProductFormSheetContent component

* ref(location): add location coordinates to LocationSheetContent and update LocationFullTrigger

* ref(auth): partial handling token revalidation

* feat(health-check): add health-check page

* ref(hooks): update queries (missing order by restaurant query)

* feat(table): link restaurants user to data table

* ref(promotion): change method response to be enum value instead of enum index

* fix(table): change accessorKey from "value" to "reduction" in promotions_columns

* feat(account): add change password form

* ref(link): link orders to api

* feat(auth/login): add layout and fix redirection on login

* feat(register): add register process

* fix: fix build issues

* fix(basket): reset basket whenn updating selected restaurant

* feat(account): add promos page

* feat(promo): add sheet content and link to gateway

* Ajoute le front pour l'ajout d'un restaurant et corrige celui de produit

* feat(managers): add sheet and link to gateway

* feat(promotion): add update & delete, linked with gateway

* fix(sidebar): change select value

* feat(map): add flyTo

* fix(restaurant): add onCascade

* ref: add new admin restaurant page and update login and register pages

* fix(catalog): add col-span-2 to large loader

* ref(layout): change layout to match stock page

* ref(provider): move ingredient restaurant query to provider

* feat(stock) [wip]: add stock page

* feat(stock): add create buttons

* feat(supplies): add supplies in provider

* fix: many minor fixes

* feat(supply): add card and dialog for supply order

* fix: call cancelled issues (updated node in dockerfile)

* fix(stock): change typo and update stock on supply order create

* ref(hook): improve performance and readability, add isLoading props

* feat(stock): add forms, dialog, sheets for stock related objects

* Finalise l'onglet restaurants pour l'admin des données

* [FIX] Securise the phone number to prevent crash

* [FEAT] Relie l'admin de produit à la gateway, ajoute le refresh sur promotion et update restaurant

* feat(order): add getOrdersByRestaurant handler

* feat(stock): add ingredient restaurant data table

* [FEAT] Ajout les info complémentaires pour les produits

* ref(stock): update stock page and supplier card layout

* Add daily report

* Add get order by restaurant

* [BUGFIX]: checkout payment and stripe integration

* [FEATURE]: Add recipe in product service

* [BUGFIX]: Fix webhook and more

* ref(hooks): update queries (missing order by restaurant query)

* Ajoute le front pour l'ajout d'un restaurant et corrige celui de produit

* feat(managers): add sheet and link to gateway

* fix(basket): change products to productsList

* fix(basket): change products to productsList

* [BUGFIX]: checkout payment and stripe integration

* [BUGFIX]: Fix webhook and more

* [FEATURE]: Update imports

* [FEATURE]: Add fees cosntant

* [FEATURE]: add payment in order response from gateway

* [REFACTO]: Rename some order props

* [REFACTO]: Add component in checkout callback page and Rename some order props

* [FEATURE]: Remove duplicata

* [FEATURE]: Update webhook

* [FEATURE]: Add delivery in the order controller

* [BUGFIX]: Fix orders call

* [FEATURE]: Add Pending order banner

* [FEATURE]: Fix checkout callback

* fix(checkout): fix recap componenet

* fix(promotion): fix typo in promotion form

* ref(disable): disable extra & promotion in basket

* fix(form): change phone regex

* fix(register): fix typo in toast error message

* ref(sidebar): add super admin

* [FEAT] Ajoute la gestion des ingredients dans le produit

* [REFACTO]: Fix receipt.tsx

* [FEATURE]: Fix imports and mocked data

* [FEATURE]: remove logs

* [FEAT] Ajoute la quantité dans le produit

* feat(role): add page, dialog, form related to role change

* ref(gateway): refactor createDeliveryPerson function to handle address object

* Refactor dropdown menu and sort users by ID

* [FEATURE]: Add method to claim an order

* [FEATURE]: Quick fix replace city

* feat(role): user can change his own role to delivery person

* feat(errors): add new UI components for error pages

* ref(page): change notfound page

* fix(eslint): fix tanstack query lint issues

* feat(errors): add NotLogged component to handle unauthenticated users

* ref(page): add LargeComponentLoader to StockPage when restaurant isnt ready yet

* fix(lint): fix eslint issues and add NotLoggedComponent

* fix(lint): fix prettier issues

* fix(lint): fix lint issues

* fix(build): fix build issues

* fix(ci): sync pnpm-lock with package.json

* [FEATURE]: Fix orders lists pages

* [FEATURE]: add import

* Update apps/web/app/(normal)/account/orders/columns.tsx

Co-authored-by: Florian Leroux <[email protected]>

* [FIX] Fetch product a l'arriver sur la page stock

* [FIX] Corrige la gestion des recipes du produits (Front et service)

* fix(lint): fix eslint issues

* Add useLocation hook and RestaurantCell component

* Update restaurantId column header in orders_columns

* feat(api): link to api

* app/delivery: add base features (#110)

* feat(map): add index screen

* fix: fix minor issues

* feat: add scaffolding

* feat(auth): add login protection + toasts

* i've never committed all this (mybad)

* autoupdate location (warning by default 1min, call to mapbox for every order)
* can validate orders
* have markers to order on map
* have paths to restaurant then user
* have settings page

* feat(profile): add profile page

* fix(ci): use a non-root user for docker

* Update services/gateway/src/controller/order/order.controller.ts

* chore: Update deployment workflow to deploy to production only on the main branch

* feat(mobile): add remaining pages (#117)

* [REFACTO]: Update de restaurant selection

* [REFACTO]: Use reals data and fix handle empty arrays in the mobile app

* [REFACTO]: Remove test variables

* [FEATURE]: Add new pages

* [FEATURE]: Add logout btn

* [FEATURE]: Refresh location

* [FEATURE]: Add checkout page

* [FEATURE]: Add module declaration

* [FEATURE] Reorder imports and remove duplicates imports

* [FEATURE]: Add progress bar package

* [FEATURE] Add stripe intent rpc methods

* [FEATURE]: Add payment methods for mobile

* [FEATURE] Fix payment service

* [FEATURE]: Fix mobile payment

* [FEATURE] Add payment on mobile

* [REFACTO] Remove useless custom stripe components

* [FEATURE] Add delivery index page

* fix: fix order creation

* chore: Update order.proto and order.ts to use camelCase for createdAt and updatedAt fields

* feat(list): add product list page

* feat(header): change header to have selected restaurant instead of user address

* feat(address): add a way to change user main address

* feat(order): refactor order page

* feat(step-indicator): what are you doing step indicator (👉👈)

* feat(checkout): change button for better ux

* fix(lint): fix lint issues

* feat(restaurant): add restaurant id page

* feat(basket): improve empty basket message and display restaurant opening hours

* feat: Improve empty basket message and display restaurant opening hours

* feat: Update checkout screen button for better UX

---------

Co-authored-by: Anatole-Godard <[email protected]>
Co-authored-by: anatole-g <[email protected]>

* fix(lockfile): generating a new lockfile

* chore: Update npm_and_yarn dependencies across multiple directories

* chore: Update Dockerfile to remove non-root user

* chore: Update Dockerfile to build proto files during Docker image build

---------

Co-authored-by: unknown <[email protected]>
Co-authored-by: Pierre Lebigre <[email protected]>
Co-authored-by: Anatole-Godard <[email protected]>
Co-authored-by: Pierre Lebigre <[email protected]>
Co-authored-by: anatole-g <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant