Skip to content

Commit 7f54399

Browse files
committed
fix bugs
1 parent 277dd95 commit 7f54399

File tree

4 files changed

+173
-506
lines changed

4 files changed

+173
-506
lines changed

front_end/postcss.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const plugins = {
2+
tailwindcss: {},
3+
autoprefixer: {},
4+
};

front_end/src/App.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Fin from './fin';
1111
import Med from './med';
1212
import Lab from './lab';
1313
import Doctors from './doc';
14-
<<<<<<< HEAD
14+
1515
import NeumorphicLogin from './Counter';
1616

1717
function PrivateRoute({ children, adminOnly, doctorOnly, patientOnly }) {
@@ -23,8 +23,6 @@ function PrivateRoute({ children, adminOnly, doctorOnly, patientOnly }) {
2323
if (patientOnly && user.role !== 'patient') return <Navigate to="/" />;
2424
return children;
2525
}
26-
=======
27-
>>>>>>> 27fb6a828c4777fbda6ae654467109bbc2de8752
2826

2927
function App() {
3028
const user = JSON.parse(localStorage.getItem('user') || '{}');

front_end/src/MovieBrowser.jsx

Lines changed: 0 additions & 328 deletions
This file was deleted.

0 commit comments

Comments
 (0)