mirror of
https://github.com/bubblecup-12/VogelSocialMedia.git
synced 2025-07-06 15:18:48 +00:00
wip basic page
This commit is contained in:
parent
5aa2463064
commit
ab9fa907ef
3 changed files with 79 additions and 42 deletions
|
@ -1,55 +1,63 @@
|
||||||
import './App.css';
|
import "./App.css";
|
||||||
import LoginAndSignUpPage from './pages/LoginAndSignUpPage';
|
import LoginAndSignUpPage from "./pages/LoginAndSignUpPage";
|
||||||
import PostCreation from './pages/PostCreation';
|
import PostCreation from "./pages/PostCreation";
|
||||||
import "./App.css";
|
import "./App.css";
|
||||||
import "./styles/colors.css";
|
import "./styles/colors.css";
|
||||||
import "./styles/fonts.css";
|
import "./styles/fonts.css";
|
||||||
import "./styles/sizes.css";
|
import "./styles/sizes.css";
|
||||||
import Footer from "./components/footer/Footer";
|
import Footer from "./components/footer/Footer";
|
||||||
import Feed, {UserFeedRoute} from "./pages/feed/Feed";
|
import Feed, { UserFeedRoute } from "./pages/feed/Feed";
|
||||||
import Header from './components/header/Header';
|
import Header from "./components/header/Header";
|
||||||
import Profile from "./pages/Profile";
|
import Profile from "./pages/Profile";
|
||||||
import { BrowserRouter as Router, Routes, Route, Navigate } from "react-router-dom";
|
import {
|
||||||
|
BrowserRouter as Router,
|
||||||
|
Routes,
|
||||||
|
Route,
|
||||||
|
Navigate,
|
||||||
|
} from "react-router-dom";
|
||||||
import { Auth } from "./api/Auth";
|
import { Auth } from "./api/Auth";
|
||||||
import { NotFound } from "./pages/404Page/NotFoundPage";
|
import { NotFound } from "./pages/404Page/NotFoundPage";
|
||||||
|
import AboutUs from "./pages/AboutUs";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
<Auth>
|
<Auth>
|
||||||
<Router>
|
<Router>
|
||||||
<Header />
|
<Header />
|
||||||
<div className="App">
|
<div className="App">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="*" element={<NotFound />} />
|
<Route path="*" element={<NotFound />} />
|
||||||
<Route
|
<Route
|
||||||
path="/login"
|
path="/login"
|
||||||
element={<LoginAndSignUpPage signupProp={false} />}
|
element={<LoginAndSignUpPage signupProp={false} />}
|
||||||
></Route>
|
></Route>
|
||||||
<Route
|
<Route
|
||||||
path="/register"
|
path="/register"
|
||||||
element={<LoginAndSignUpPage signupProp={true} />}
|
element={<LoginAndSignUpPage signupProp={true} />}
|
||||||
></Route>
|
></Route>
|
||||||
<Route path="/profile/:username" element={<Profile />}></Route>
|
<Route path="/profile/:username" element={<Profile />}></Route>
|
||||||
<Route path="/createpost" element={<PostCreation />}></Route>
|
<Route path="/createpost" element={<PostCreation />}></Route>
|
||||||
<Route path="/profile" element={<Profile />}></Route>
|
<Route path="/profile" element={<Profile />}></Route>
|
||||||
<Route path="/feed/:user" element={<UserFeedRoute />}></Route>
|
<Route path="/feed/:user" element={<UserFeedRoute />}></Route>
|
||||||
<Route path="/" element={<Navigate to="/feed" replace />} />
|
<Route path="/" element={<Navigate to="/feed" replace />} />
|
||||||
<Route path="/feed" element={<Feed />} />
|
<Route path="/feed" element={<Feed />} />
|
||||||
<Route path="/feed/:user" element={<UserFeedRoute />} />
|
<Route path="/feed/:user" element={<UserFeedRoute />} />
|
||||||
<Route path="*" element={<NotFound />} />
|
<Route path="*" element={<NotFound />} />
|
||||||
<Route path="/login" element={<LoginAndSignUpPage signupProp={false} />} />
|
<Route
|
||||||
<Route path="/register" element={<LoginAndSignUpPage signupProp={true} />} />
|
path="/login"
|
||||||
<Route path="/profile/:username" element={<Profile />} />
|
element={<LoginAndSignUpPage signupProp={false} />}
|
||||||
</Routes>
|
/>
|
||||||
<Footer />
|
<Route
|
||||||
</div>
|
path="/register"
|
||||||
</Router>
|
element={<LoginAndSignUpPage signupProp={true} />}
|
||||||
</Auth>
|
/>
|
||||||
|
<Route path="/profile/:username" element={<Profile />} />
|
||||||
);
|
</Routes>
|
||||||
|
<Footer />
|
||||||
|
</div>
|
||||||
|
</Router>
|
||||||
|
</Auth>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
|
12
code/frontend/src/pages/AboutUs.tsx
Normal file
12
code/frontend/src/pages/AboutUs.tsx
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
|
||||||
|
|
||||||
|
function AboutUs() {
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="body mainbox">
|
||||||
|
<div className="test"> <img style={{height: "200vh"}} src='/assets/icons/feather_black.svg' alt="featherIcon" /> </div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default AboutUs;
|
17
code/frontend/src/pages/aboutUs.css
Normal file
17
code/frontend/src/pages/aboutUs.css
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
.mainbox {
|
||||||
|
height: (100vh - var(--Header-height));
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: 768px) {
|
||||||
|
.mainbox {
|
||||||
|
height: (100vh - var(--Header-height));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.test {
|
||||||
|
flex-grow: 1;
|
||||||
|
height: 100vh;
|
||||||
|
width: 100vw;
|
||||||
|
color: aqua;
|
||||||
|
background-color: aquamarine;
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue