Merge branch 'main' into '2'
# Conflicts: # src/pages/Home/Home.tsx
Showing
... | @@ -9,15 +9,18 @@ | ... | @@ -9,15 +9,18 @@ |
"lint": "next lint" | "lint": "next lint" | ||
}, | }, | ||
"dependencies": { | "dependencies": { | ||
"@reduxjs/toolkit": "^2.8.2", | |||
"next": "15.3.4", | "next": "15.3.4", | ||
"react": "^19.0.0", | "react": "^19.0.0", | ||
"react-dom": "^19.0.0" | "react-dom": "^19.0.0", | ||
"react-redux": "^9.2.0" | |||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"@eslint/eslintrc": "^3", | "@eslint/eslintrc": "^3", | ||
"@types/node": "^20", | "@types/node": "^20", | ||
"@types/react": "^19", | "@types/react": "^19", | ||
"@types/react-dom": "^19", | "@types/react-dom": "^19", | ||
"@types/react-redux": "^7.1.34", | |||
"eslint": "^9", | "eslint": "^9", | ||
"eslint-config-next": "15.3.4", | "eslint-config-next": "15.3.4", | ||
"prettier": "^3.6.2", | "prettier": "^3.6.2", | ||
... | ... |
public/Apple.png
0 → 100644
523 Bytes
public/Google logo.png
0 → 100644
713 Bytes
public/file.svg
deleted
100644 → 0
public/globe.svg
deleted
100644 → 0
public/next.svg
deleted
100644 → 0
public/tripsend.png
0 → 100644
2.92 KB
public/vercel.svg
deleted
100644 → 0
public/window.svg
deleted
100644 → 0
src/types/TUser.ts
0 → 100644