-
- Downloads
Merge branch 'development' into 'feature/chinmayanand/SearchBar'
# Conflicts: # src/containers/Login/index.jsx
No related branches found
No related tags found
Showing
- package-lock.json 115 additions, 0 deletionspackage-lock.json
- package.json 5 additions, 0 deletionspackage.json
- public/index.html 2 additions, 0 deletionspublic/index.html
- src/App.js 15 additions, 2 deletionssrc/App.js
- src/components/Button/Button.module.scss 4 additions, 2 deletionssrc/components/Button/Button.module.scss
- src/components/Button/index.jsx 2 additions, 2 deletionssrc/components/Button/index.jsx
- src/components/Image/Image.scss 6 additions, 0 deletionssrc/components/Image/Image.scss
- src/components/Image/index.jsx 21 additions, 0 deletionssrc/components/Image/index.jsx
- src/components/Social_buttons/Index.jsx 14 additions, 0 deletionssrc/components/Social_buttons/Index.jsx
- src/components/Social_buttons/Social_buttons.module.scss 19 additions, 0 deletionssrc/components/Social_buttons/Social_buttons.module.scss
- src/containers/Login/index.jsx 10 additions, 4 deletionssrc/containers/Login/index.jsx
- src/index.js 3 additions, 0 deletionssrc/index.js
... | @@ -6,12 +6,17 @@ | ... | @@ -6,12 +6,17 @@ |
"@testing-library/jest-dom": "^5.16.1", | "@testing-library/jest-dom": "^5.16.1", | ||
"@testing-library/react": "^12.1.2", | "@testing-library/react": "^12.1.2", | ||
"@testing-library/user-event": "^13.5.0", | "@testing-library/user-event": "^13.5.0", | ||
"bootstrap": "^4.6.0", | |||
"classnames": "^2.3.1", | "classnames": "^2.3.1", | ||
"jquery": "^3.6.0", | |||
"node-sass": "^7.0.1", | "node-sass": "^7.0.1", | ||
"react": "^17.0.2", | "react": "^17.0.2", | ||
"react-dom": "^17.0.2", | "react-dom": "^17.0.2", | ||
"react-icons": "^4.3.1", | |||
"react-router-dom": "^6.2.1", | "react-router-dom": "^6.2.1", | ||
"react-scripts": "5.0.0", | "react-scripts": "5.0.0", | ||
"react-social-login-buttons": "^3.6.0", | |||
"sass": "^1.46.0", | |||
"web-vitals": "^2.1.2" | "web-vitals": "^2.1.2" | ||
}, | }, | ||
"scripts": { | "scripts": { | ||
... | ... |
src/components/Image/Image.scss
0 → 100644
src/components/Image/index.jsx
0 → 100644
src/components/Social_buttons/Index.jsx
0 → 100644
Please register or sign in to comment