Merge pull request #257 from UofA-Blueprint/fix/return

Fix/return
UofA-Blueprint · Sep 30, 2023 · b0d40d5 · b0d40d5
2 parents 9e02a56 + 1d7ed36
commit b0d40d5
Show file tree

Hide file tree

Showing 15 changed files with 2,184 additions and 1,631 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/src/assets/report.png b/app/src/assets/report.png
diff --git a/app/src/index.d.ts b/app/src/index.d.ts
@@ -0,0 +1,3 @@
+declare module '*.jpg';
+declare module '*.svg';
+declare module '*.png';
diff --git a/app/src/routes/borrow.tsx b/app/src/routes/borrow.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect } from "react";
+import React from 'react';
 import { useNavigate } from "react-router-dom";
 import Scanner from "../widgets/scanner";
 import Modal from "react-bootstrap/Modal";

diff --git a/app/src/routes/index.tsx b/app/src/routes/index.tsx
@@ -3,6 +3,7 @@ import {
   Outlet,
   RouterProvider,
 } from "react-router-dom";
+import React from "react";
 import LoginRoute from "./login";
 import HomeRoute from "./home";
 import BorrowRoute from "./borrow";

diff --git a/app/src/routes/login.tsx b/app/src/routes/login.tsx
@@ -1,5 +1,6 @@
 import  { useEffect, useState } from "react";
 import { Button, Typography, Box, Avatar } from '@mui/material';
+import Cookies from 'js-cookie';
 import {BallTriangle} from 'react-loader-spinner';
 import desktopLogo from "../assets/dishzero-logo-desktop.png";
 import mobileLogo from "../assets/dishzero-logo-mobile.png";