Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
"name": "project",
"version": "0.0.0",
"private": true,
"workspaces": [
"packages/*"
],
"engines": {
"node": "^14",
"npm": "please-use-yarn",
"yarn": "3.0.2"
},
"volta": {
Expand Down
1 change: 1 addition & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
import { ThemeProvider } from '@mui/material/styles';
import { ReactElement } from 'react';
import { QueryClient, QueryClientProvider } from 'react-query';
Expand Down
7 changes: 4 additions & 3 deletions src/URLs.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const key: string | boolean | undefined = import.meta.env.VITE_FIREBASE_APP_KEY;

export const SIGN_IN_URL = `https://pacific-refuge-80597.herokuapp.com/api/login`;
export const SIGN_OUT_URL = `https://pacific-refuge-80597.herokuapp.com/api/logout`;
export const SIGN_IN_URL = `https://peaceful-tundra-28430.herokuapp.com/api/login`;
export const SIGN_OUT_URL = `https://peaceful-tundra-28430.herokuapp.com/api/logout`;

export const SIGN_UP_URL = `https://pacific-refuge-80597.herokuapp.com/api/users`;
export const SIGN_UP_URL = `https://peaceful-tundra-28430.herokuapp.com/api/users`;
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
export const RESET_PASSWORD = `https://identitytoolkit.googleapis.com/v1/accounts:sendOobCode?key=${key}`;
1 change: 0 additions & 1 deletion src/api/auth/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from './resetPassword';
export * from './signInSignUp';
7 changes: 7 additions & 0 deletions src/api/auth/resetPassword.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/ban-ts-comment */
// @ts-nocheck

import makeRequest from '../makeRequest';

export const resetPassword = async (
Expand Down
4 changes: 0 additions & 4 deletions src/api/auth/signIn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,5 @@ export async function signIn(
document.cookie = `auth=${token}`;
if (data.status === 'invalid') return manageRequestMessage(data.message);
return loginFunction();
})
.catch((error) => {
// ERROR IS NEVER RETURNED, DO WE HAVE TO REWRITE BACKEND
return manageRequestMessage(data.message);
});
}
29 changes: 0 additions & 29 deletions src/api/auth/signInSignUp.ts

This file was deleted.

6 changes: 1 addition & 5 deletions src/api/auth/signUp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ export async function signUp(
})
.then((response) => response.json())
.then((data) => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
if (data.status === 'invalid') return manageRequestMessage(data.message);
return loginFunction();
})
.catch((error) => {
// ERROR IS NEVER RETURNED, DO WE HAVE TO REWRITE BACKEND
return manageRequestMessage(data.message);
});
}
18 changes: 0 additions & 18 deletions src/api/objectToArray.js

This file was deleted.

12 changes: 0 additions & 12 deletions src/api/read.js

This file was deleted.

8 changes: 6 additions & 2 deletions src/components/HeaderSection/AccountMenu/AccountMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck

import Logout from '@mui/icons-material/Logout';
import Box from '@mui/material/Box';
import Divider from '@mui/material/Divider';
Expand All @@ -12,12 +15,12 @@ import { Link } from 'react-router-dom';
import WelcomeHeader from 'src/components/WelcomeHeader/WelcomeHeader';
import LoginContext from 'src/contexts/LoginContext';

// eslint-disable-next-line import/extensions
import { signOut } from '@/api/auth/signOut';

import logout from '../../../utils/auth/logout';
import UserAvatar, { AvatarSize } from '../../UserAvatar/UserAvatar';

export default function AccountMenu(changeLoginFn) {
export default function AccountMenu() {
const login = useContext(LoginContext);
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const open = !!anchorEl;
Expand Down Expand Up @@ -97,6 +100,7 @@ export default function AccountMenu(changeLoginFn) {
<Divider />
<MenuItem
onClick={() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
signOut(login.logout());
}}
>
Expand Down
5 changes: 3 additions & 2 deletions src/components/HeaderSection/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck

import Box from '@mui/material/Box';
import { useContext, useEffect, useState } from 'react';
import Logo from 'src/assets/images/NavLogo.png';
import AccountMenu from 'src/components/HeaderSection/AccountMenu/AccountMenu';
import ThemeSwitcher from 'src/components/HeaderSection/Switcher';
import LoginContext from 'src/contexts/LoginContext';

import { signOut } from '@/api/auth/signOut';

import RegisterLoginModal from '../../SignInSignUpModal/RegisterLoginModal/RegisterLoginModal';
import styles from './Header.module.scss';

Expand Down
12 changes: 11 additions & 1 deletion src/components/HomePage/House/House.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable no-unused-vars */
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable @typescript-eslint/no-redeclare */

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck
import 'react-slideshow-image/dist/styles.css';

import FavoriteIcon from '@mui/icons-material/Favorite';
Expand Down Expand Up @@ -34,7 +44,7 @@ const House = ({ house }: { house: BasicHouseData }) => {
transitionDuration: 700,
};

const favoriteObject = data?.favorites && data.favorites.filter((fav) => fav._id == house._id)?.[0];
const favoriteObject = data?.favorites && data.favorites.filter((fav) => fav._id === house._id)?.[0];
const isFavorite = !!favoriteObject?._id;

const handleFavoriteAction = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/HomePage/ListOfHouses/ListOfHouses.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import 'react-slideshow-image/dist/styles.css';

import DoneIcon from '@mui/icons-material/Done';
import House from '../House/House';
import { Autocomplete, Box, TextField } from '@mui/material';
import Chip from '@mui/material/Chip';
import { useEffect, useState } from 'react';

import House from '../House/House';
import styles from './ListOfHouses.module.scss';

const options = ['Payment (Low to High)', 'Payment (High to Low)', 'A-Z', 'Z-A'] as const;
Expand Down Expand Up @@ -52,7 +52,7 @@ function ListOfHouses({ houses }: { houses: BasicHouseData[] }) {
className={styles.options}
disableClearable
value={sortType ?? ''}
onChange={(event, newValue) => {
onChange={(_event, newValue) => {
setSortType(newValue);
}}
options={options}
Expand Down
7 changes: 7 additions & 0 deletions src/components/HomePage/MapSide/MapSide.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable import/extensions */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck

import LocationOnIcon from '@mui/icons-material/LocationOn';
import { Box, Button, styled, TextField, Typography } from '@mui/material';

Expand All @@ -21,6 +26,8 @@ const ButtonSearch = styled(Button)(({ theme }) => ({
},
}));

// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line react/prop-types
function MapHouses({ houses }): any {
return (
<Box component="div" className={styles.mapContainer}>
Expand Down
10 changes: 9 additions & 1 deletion src/components/MoreInfoModal/MoreInfoModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
/* eslint-disable react/prop-types */
/* eslint-disable react/destructuring-assignment */
/* eslint-disable react-hooks/exhaustive-deps */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable react/no-array-index-key */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck
import 'react-slideshow-image/dist/styles.css';

import CloseIcon from '@mui/icons-material/Close';
Expand All @@ -8,7 +17,6 @@ import { Paper } from '@mui/material';
import Button from '@mui/material/Button';
import Modal from '@mui/material/Modal';
import Typography from '@mui/material/Typography';
import * as React from 'react';
import { useEffect, useState } from 'react';
import { Slide } from 'react-slideshow-image';
import { useApiGet } from 'src/hooks/useApi';
Expand Down
6 changes: 5 additions & 1 deletion src/components/SignInSignUpModal/LoginForm/LoginForm.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* eslint-disable import/extensions */
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/no-unsafe-call */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck
import { yupResolver } from '@hookform/resolvers/yup';
import Visibility from '@mui/icons-material/Visibility';
import VisibilityOff from '@mui/icons-material/VisibilityOff';
Expand Down Expand Up @@ -54,7 +59,6 @@ function LoginForm({ manageRequestMessage }: RegisterLoginFormsProps) {

const onSubmit: SubmitHandler<LoginFormFields> = ({ email, password }: OnSubmitProps) => {
signIn({ email, password }, manageRequestMessage, login.login);
// signInSignUp(email, password, SIGN_IN_URL, manageRequestMessage, login.loggedIn, login.login, login.logout);
};

const onReset = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck

import { yupResolver } from '@hookform/resolvers/yup';
import Visibility from '@mui/icons-material/Visibility';
import VisibilityOff from '@mui/icons-material/VisibilityOff';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck

import CloseIcon from '@mui/icons-material/Close';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
Expand All @@ -13,7 +19,7 @@ import RegisterForm from '../RegisterForm/RegisterForm';
import RegisterLoginHeader from '../RegisterLoginHeader/RegisterLoginHeader';
import styles from './RegisterLoginModal.module.css';

const SignInButton = styled(Button)((theme) => ({
const SignInButton = styled(Button)(() => ({
// color: theme.palette.primary.muted,
lineHeight: '16px',
// border: `2px solid ${theme.palette.primary.muted}`,
Expand Down
1 change: 0 additions & 1 deletion src/firebase/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './create';
export * from './firebaseConfig';
export * from './read';
12 changes: 0 additions & 12 deletions src/firebase/read.ts

This file was deleted.

48 changes: 0 additions & 48 deletions src/firebase/utils/addHouseToDB.ts

This file was deleted.

18 changes: 0 additions & 18 deletions src/firebase/utils/objectToArray.ts

This file was deleted.

Loading