Skip to content

Commit

Permalink
Merge branch 'main' of samar12-rad/PlayCafe into Backend-Restructuring
Browse files Browse the repository at this point in the history
  • Loading branch information
samar12-rad committed Oct 3, 2024
2 parents 9c4027e + 812389f commit 39dc5ab
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// src/App.js
import React from 'react';
import './App.css';
import Navbar from './Components/Shared/Navbar';
import Footer from "./Components/Shared/Footer"
import Navbar from '../src/components/Shared/Navbar';
import Footer from "../src/components/Shared/Footer"
import { Outlet } from 'react-router-dom';

function App() {
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/router/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* eslint-disable no-unused-vars */
import {
createBrowserRouter,
createRoutesFromElements,
Route,
} from "react-router-dom";

import React from "react";
import App from "../App";
import Home from "../components/Pages/Home";
import About from "../components/Pages/About";
Expand Down

0 comments on commit 39dc5ab

Please sign in to comment.