Merge branch 'Alex' into 'main'

webstillas/.gitignore

webstillas/.idea/webstillas.iml

webstillas/src/App.css

webstillas/src/App.js

webstillas/src/components/Login.js

webstillas/src/components/ProtectedRoute.js

webstillas/src/components/Signup.js

webstillas/src/components/Spinner.js

webstillas/src/components/constants.js

webstillas/src/components/logistics/logistic.css

webstillas/src/components/logistics/logistic.js

webstillas/src/components/logistics/project/map.js

...illas/src/components/logistics/scaffold/addScaffolding.js

webstillas/src/components/logistics/user/addUser.css

webstillas/src/components/logistics/user/addUser.js

webstillas/src/components/mapPage/mapPage.css

webstillas/src/components/mapPage/mapPage.js

webstillas/src/components/mapPage/marker.png

webstillas/src/components/projects/elements/Modal.js

webstillas/src/components/projects/elements/card.css