Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Axios interceptor added #115

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open

Axios interceptor added #115

wants to merge 54 commits into from

Conversation

sp-rahul
Copy link
Contributor

@sp-rahul sp-rahul commented Dec 6, 2023

#84

sp-rahul and others added 30 commits October 5, 2023 18:48
# Conflicts:
#	frontend/app/layout.tsx
#	frontend/component/LogIn.tsx
#	frontend/component/SignUp.tsx
#	frontend/component/SignupAndSignin.tsx
#	frontend/component/StartScreen.tsx
# Conflicts:
#	frontend/common/CustomCardForSettings.tsx
#	frontend/common/CustomCardMyWallet2.tsx
#	frontend/common/CustomHorizontalCard.tsx
#	frontend/common/CustomMyWalletCart.tsx
#	frontend/common/addTransaction/CustomButtonText.tsx
#	frontend/common/addTransaction/CustomButtonWithIcon.tsx
#	frontend/common/budget/CustomCardBudget.tsx
#	frontend/component/AddNewBudget.tsx
#	frontend/component/AddTransaction.tsx
#	frontend/component/Dashboard.tsx
#	frontend/component/EatingOutPage.tsx
#	frontend/component/LogIn.tsx
#	frontend/component/MonthlyBudgetComponent.tsx
#	frontend/component/MyWalletComponent.tsx
#	frontend/component/RevolutWallet.tsx
#	frontend/component/Settings.tsx
#	frontend/component/SignUp.tsx
#	frontend/component/SignupAndSignin.tsx
#	frontend/component/StartScreen.tsx
#	frontend/component/Statistics.tsx
# in frontend cin budget and wallet page ids type has changed
# in frontend cin budget and wallet page ids type has changed
# Conflicts:
#	api-server-nestjs/src/app.module.ts
#	api-server-nestjs/src/budget/budget.service.ts
#	api-server-nestjs/src/middleware/Auth.middleware.ts
#	api-server-nestjs/src/user/user.service.ts
… model frontend backend completed for get and post,
sp-rahul and others added 24 commits October 31, 2023 12:59
# Conflicts:
#	api-server-nestjs/src/budget/dtos/create-budget.dto.ts
#	api-server-nestjs/src/budget/dtos/update-budget.dto.ts
#	api-server-nestjs/src/budget/validation-schema/create-budget.schema.ts
#	api-server-nestjs/src/expense/dtos/update-expense.dto.ts
#	api-server-nestjs/src/expense/validation-schema/create-expense.schema.ts
#	api-server-nestjs/src/income/dtos/update-income.dto.ts
#	api-server-nestjs/src/income/validation-schema/create-income.schema.ts
#	api-server-nestjs/src/wallet/validation-schema/create-wallet.validation.schema.ts
#	frontend/component/AddNewBudget.tsx
#	frontend/component/AddNewWallet.tsx
#	frontend/component/transaction/ExpenseForm.tsx
#	frontend/component/transaction/IncomeForm.tsx
#	frontend/yarn.lock
# Conflicts:
#	frontend/.yarn/install-state.gz
#	frontend/component/AddNewBudget.tsx
#	frontend/component/LogIn.tsx
#	frontend/component/transaction/ExpenseForm.tsx
#	frontend/component/transaction/IncomeForm.tsx
#	frontend/constants/defaultConstant.ts
#	frontend/package.json
#	frontend/utilities/helper.tsx
#	frontend/yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant