diff --git a/.gitignore b/.gitignore index 4984cd5..bfe9dd3 100644 --- a/.gitignore +++ b/.gitignore @@ -133,4 +133,6 @@ dist /starter-frontend/public/tinymce # Account key -serviceAccountKey.json \ No newline at end of file +serviceAccountKey.json + +*build* \ No newline at end of file diff --git a/starter-frontend/package.json b/starter-frontend/package.json index 41ee7ce..b297429 100644 --- a/starter-frontend/package.json +++ b/starter-frontend/package.json @@ -1,6 +1,6 @@ { "name": "green-notes", - "homepage": "https://hcp-uw.github.io/green-notes", + "homepage": "https://hcp-uw.github.io/", "version": "0.1.0", "private": true, "dependencies": { diff --git a/starter-frontend/src/App.tsx b/starter-frontend/src/App.tsx index cca31af..d26bfbf 100644 --- a/starter-frontend/src/App.tsx +++ b/starter-frontend/src/App.tsx @@ -1,39 +1,39 @@ import './App.css'; -import { useEffect, useState } from 'react'; -import axios from 'axios'; +import { Routes, Route } from 'react-router-dom'; import Navbar from './components/navbar/Navbar'; -import { Outlet } from 'react-router-dom'; import { AuthProvider } from "./contexts/AuthContext"; -import ErrorMessage from "./components/auth/ErrorMessage" - - -const baseURL: string = 'http://localhost:3001'; +import ErrorMessage from "./components/auth/ErrorMessage"; +import ErrorPage from "./pages/error-page/error-page"; +import AboutUs from './pages/about-us/about-us'; +import Collaboration from './pages/collaboration/collaboration'; +import HomeScreen from './pages/home/Home'; +import { Note } from './pages/editor/editor'; +import { Notes } from './pages/notes/notes'; +import Profile from './pages/profile/profile'; +import Login from './pages/auth-pages/login'; +import Register from './pages/auth-pages/register'; +import NewProfile from './pages/edit-profile/EditProfile'; +import PrivateRoute from './components/auth/PrivateRoute'; function App(): JSX.Element { - const [message, setMessage] = useState(''); - - // useEffect(() => { - // axios.get(`${baseURL}/hello`) - // .then(res => { - // setMessage(res.data); - // }) - // .catch(error => { - // console.error('error fetching data: ', error); - // }); - // }, []); - - // console.log(message); return ( - <> - {/* wrapped everything in AuthProvider so - everything has access to authentication context */} - + + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + - ); } -export default App; +export default App; \ No newline at end of file diff --git a/starter-frontend/src/index.js b/starter-frontend/src/index.js index 289d218..a93044e 100644 --- a/starter-frontend/src/index.js +++ b/starter-frontend/src/index.js @@ -1,79 +1,14 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; +import { HashRouter } from 'react-router-dom'; import App from './App'; -import { - createBrowserRouter, - RouterProvider, -} from "react-router-dom"; -import ErrorPage from "./pages/error-page/error-page"; -// import "./App.css"; -import AboutUs from './pages/about-us/about-us'; -import Collaboration from './pages/collaboration/collaboration' -import HomeScreen from './pages/home/Home'; -import { Note } from './pages/editor/editor'; -import { Notes } from './pages/notes/notes'; -import Profile from './pages/profile/profile'; -import Login from './pages/auth-pages/login'; -import Register from './pages/auth-pages/register'; -import NewProfile from'./pages/edit-profile/EditProfile'; -import PrivateRoute from './components/auth/PrivateRoute'; -// Private route element redirects people to login first -// No real authentication yet, any fake email and password will do -const router = createBrowserRouter([ - { - path: "/", - element: , - errorElement: , - children: [ - { index: true, element: }, - { - path: "about-us", - element: , - }, - { - path: "collaboration", - element: , - }, - { - path: "note", - // Later change to - // path: "note/:noteId", - element: , - }, - { - //Later change to - //path: "notes/:folderId", - path: "notes", - element: , - }, - { - path: "profile", - // Later change to - // path: "profile/:profileId", - element: , - }, - { - path: "login", - element: - }, - { - path: "register", - element: - }, - { - path: "new-profile", - element: - }, - - - ] - }, -]); const root = ReactDOM.createRoot(document.getElementById('root')); root.render( - + + + -); +); \ No newline at end of file