Skip to content

Commit a325b0c

Browse files
xreedevxreedev
committed
renamed frontend directory
1 parent a79ff40 commit a325b0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+22247
-22247
lines changed

‎Research-Reimagined-final/package-lock.json‎ renamed to ‎Frontend/package-lock.json‎

Lines changed: 20201 additions & 20201 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Research-Reimagined-final/package.json‎ renamed to ‎Frontend/package.json‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
{
2-
"name": "research-reimaginedhome",
3-
"version": "0.1.0",
4-
"private": true,
5-
"dependencies": {
6-
"@testing-library/jest-dom": "^5.17.0",
7-
"@testing-library/react": "^13.4.0",
8-
"@testing-library/user-event": "^13.5.0",
9-
"axios": "^1.6.8",
10-
"bootstrap": "^5.3.3",
11-
"mdb-react-ui-kit": "^8.0.0",
12-
"react": "^18.2.0",
13-
"react-bootstrap": "^2.10.2",
14-
"react-dom": "^18.2.0",
15-
"react-router-dom": "^6.23.0",
16-
"web-vitals": "^2.1.4"
17-
},
18-
"scripts": {
19-
"start": "react-scripts start",
20-
"build": "react-scripts build",
21-
"test": "react-scripts test",
22-
"eject": "react-scripts eject"
23-
},
24-
"eslintConfig": {
25-
"extends": [
26-
"react-app",
27-
"react-app/jest"
28-
]
29-
},
30-
"browserslist": {
31-
"production": [
32-
">0.2%",
33-
"not dead",
34-
"not op_mini all"
35-
],
36-
"development": [
37-
"last 1 chrome version",
38-
"last 1 firefox version",
39-
"last 1 safari version"
40-
]
41-
},
42-
"devDependencies": {
43-
"react-scripts": "^5.0.1"
44-
}
45-
}
1+
{
2+
"name": "research-reimaginedhome",
3+
"version": "0.1.0",
4+
"private": true,
5+
"dependencies": {
6+
"@testing-library/jest-dom": "^5.17.0",
7+
"@testing-library/react": "^13.4.0",
8+
"@testing-library/user-event": "^13.5.0",
9+
"axios": "^1.6.8",
10+
"bootstrap": "^5.3.3",
11+
"mdb-react-ui-kit": "^8.0.0",
12+
"react": "^18.2.0",
13+
"react-bootstrap": "^2.10.2",
14+
"react-dom": "^18.2.0",
15+
"react-router-dom": "^6.23.0",
16+
"web-vitals": "^2.1.4"
17+
},
18+
"scripts": {
19+
"start": "react-scripts start",
20+
"build": "react-scripts build",
21+
"test": "react-scripts test",
22+
"eject": "react-scripts eject"
23+
},
24+
"eslintConfig": {
25+
"extends": [
26+
"react-app",
27+
"react-app/jest"
28+
]
29+
},
30+
"browserslist": {
31+
"production": [
32+
">0.2%",
33+
"not dead",
34+
"not op_mini all"
35+
],
36+
"development": [
37+
"last 1 chrome version",
38+
"last 1 firefox version",
39+
"last 1 safari version"
40+
]
41+
},
42+
"devDependencies": {
43+
"react-scripts": "^5.0.1"
44+
}
45+
}

‎Research-Reimagined-final/public/index.html‎ renamed to ‎Frontend/public/index.html‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
<head>
4-
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
8-
<meta
9-
name="description"
10-
content="Web site created using create-react-app"
11-
/>
12-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13-
<!--
14-
manifest.json provides metadata used when your web app is installed on a
15-
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
16-
-->
17-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18-
<!--
19-
Notice the use of %PUBLIC_URL% in the tags above.
20-
It will be replaced with the URL of the `public` folder during the build.
21-
Only files inside the `public` folder can be referenced from the HTML.
22-
23-
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
24-
work correctly both with client-side routing and a non-root public URL.
25-
Learn how to configure a non-root public URL by running `npm run build`.
26-
-->
27-
<title>React App</title>
28-
</head>
29-
<body>
30-
<noscript>You need to enable JavaScript to run this app.</noscript>
31-
<div id="root"></div>
32-
<!--
33-
This HTML file is a template.
34-
If you open it directly in the browser, you will see an empty page.
35-
36-
You can add webfonts, meta tags, or analytics to this file.
37-
The build step will place the bundled scripts into the <body> tag.
38-
39-
To begin the development, run `npm start` or `yarn start`.
40-
To create a production bundle, use `npm run build` or `yarn build`.
41-
-->
42-
</body>
43-
</html>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta
9+
name="description"
10+
content="Web site created using create-react-app"
11+
/>
12+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13+
<!--
14+
manifest.json provides metadata used when your web app is installed on a
15+
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
16+
-->
17+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18+
<!--
19+
Notice the use of %PUBLIC_URL% in the tags above.
20+
It will be replaced with the URL of the `public` folder during the build.
21+
Only files inside the `public` folder can be referenced from the HTML.
22+
23+
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
24+
work correctly both with client-side routing and a non-root public URL.
25+
Learn how to configure a non-root public URL by running `npm run build`.
26+
-->
27+
<title>React App</title>
28+
</head>
29+
<body>
30+
<noscript>You need to enable JavaScript to run this app.</noscript>
31+
<div id="root"></div>
32+
<!--
33+
This HTML file is a template.
34+
If you open it directly in the browser, you will see an empty page.
35+
36+
You can add webfonts, meta tags, or analytics to this file.
37+
The build step will place the bundled scripts into the <body> tag.
38+
39+
To begin the development, run `npm start` or `yarn start`.
40+
To create a production bundle, use `npm run build` or `yarn build`.
41+
-->
42+
</body>
43+
</html>

‎Research-Reimagined-final/public/manifest.json‎ renamed to ‎Frontend/public/manifest.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
{
2-
"short_name": "React App",
3-
"name": "Create React App Sample",
4-
"icons": [
5-
{
6-
"src": "favicon.ico",
7-
"sizes": "64x64 32x32 24x24 16x16",
8-
"type": "image/x-icon"
9-
},
10-
{
11-
"src": "logo192.png",
12-
"type": "image/png",
13-
"sizes": "192x192"
14-
},
15-
{
16-
"src": "logo512.png",
17-
"type": "image/png",
18-
"sizes": "512x512"
19-
}
20-
],
21-
"start_url": ".",
22-
"display": "standalone",
23-
"theme_color": "#000000",
24-
"background_color": "#ffffff"
25-
}
1+
{
2+
"short_name": "React App",
3+
"name": "Create React App Sample",
4+
"icons": [
5+
{
6+
"src": "favicon.ico",
7+
"sizes": "64x64 32x32 24x24 16x16",
8+
"type": "image/x-icon"
9+
},
10+
{
11+
"src": "logo192.png",
12+
"type": "image/png",
13+
"sizes": "192x192"
14+
},
15+
{
16+
"src": "logo512.png",
17+
"type": "image/png",
18+
"sizes": "512x512"
19+
}
20+
],
21+
"start_url": ".",
22+
"display": "standalone",
23+
"theme_color": "#000000",
24+
"background_color": "#ffffff"
25+
}

‎Research-Reimagined-final/public/robots.txt‎ renamed to ‎Frontend/public/robots.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# https://www.robotstxt.org/robotstxt.html
2-
User-agent: *
3-
Disallow:
1+
# https://www.robotstxt.org/robotstxt.html
2+
User-agent: *
3+
Disallow:

‎Research-Reimagined-final/src/App.css‎ renamed to ‎Frontend/src/App.css‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
.App {
2-
text-align: center;
3-
}
4-
5-
.App-logo {
6-
height: 40vmin;
7-
pointer-events: none;
8-
}
9-
10-
@media (prefers-reduced-motion: no-preference) {
11-
.App-logo {
12-
animation: App-logo-spin infinite 20s linear;
13-
}
14-
}
15-
16-
.App-header {
17-
background-color: #282c34;
18-
min-height: 100vh;
19-
display: flex;
20-
flex-direction: column;
21-
align-items: center;
22-
justify-content: center;
23-
font-size: calc(10px + 2vmin);
24-
color: white;
25-
}
26-
27-
.App-link {
28-
color: #61dafb;
29-
}
30-
31-
@keyframes App-logo-spin {
32-
from {
33-
transform: rotate(0deg);
34-
}
35-
to {
36-
transform: rotate(360deg);
37-
}
38-
}
1+
.App {
2+
text-align: center;
3+
}
4+
5+
.App-logo {
6+
height: 40vmin;
7+
pointer-events: none;
8+
}
9+
10+
@media (prefers-reduced-motion: no-preference) {
11+
.App-logo {
12+
animation: App-logo-spin infinite 20s linear;
13+
}
14+
}
15+
16+
.App-header {
17+
background-color: #282c34;
18+
min-height: 100vh;
19+
display: flex;
20+
flex-direction: column;
21+
align-items: center;
22+
justify-content: center;
23+
font-size: calc(10px + 2vmin);
24+
color: white;
25+
}
26+
27+
.App-link {
28+
color: #61dafb;
29+
}
30+
31+
@keyframes App-logo-spin {
32+
from {
33+
transform: rotate(0deg);
34+
}
35+
to {
36+
transform: rotate(360deg);
37+
}
38+
}

‎Research-Reimagined-final/src/App.js‎ renamed to ‎Frontend/src/App.js‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
import React, { useState } from 'react';
2-
import { Routes, Route, Navigate } from 'react-router-dom';
3-
import LoginForm from './Components/login/login';
4-
import Landing from './Components/Landing/Landing';
5-
import About from './Components/About/About';
6-
import CustomNavbar from './Components/navbar/Navbar'; // Import the CustomNavbar component
7-
import Signup from './Components/Signup/Signup';
8-
9-
function App() {
10-
const [isLoggedIn, setIsLoggedIn] = useState(false);
11-
12-
const handleLoginSuccess = () => {
13-
setIsLoggedIn(true);
14-
};
15-
16-
const handleLogout = () => {
17-
setIsLoggedIn(false);
18-
};
19-
20-
return (
21-
<Routes>
22-
<Route
23-
path="/"
24-
element={
25-
<>
26-
{/* Always render Navbar */}
27-
{isLoggedIn ? <Navigate to="/home" /> : <LoginForm onLoginSuccess={handleLoginSuccess} />} {/* Render LoginForm only when not logged in */}
28-
</>
29-
}
30-
/>
31-
<Route path="/home" element={isLoggedIn ? <Landing /> : <Navigate to="/" />} />
32-
<Route path="/about-us" element={<About />} />
33-
<Route path="/signup" element={<Signup />} /> {/* Route for the signup page */}//this is additional
34-
</Routes>
35-
);
36-
}
37-
38-
export default App;
1+
import React, { useState } from 'react';
2+
import { Routes, Route, Navigate } from 'react-router-dom';
3+
import LoginForm from './Components/login/login';
4+
import Landing from './Components/Landing/Landing';
5+
import About from './Components/About/About';
6+
import CustomNavbar from './Components/navbar/Navbar'; // Import the CustomNavbar component
7+
import Signup from './Components/Signup/Signup';
8+
9+
function App() {
10+
const [isLoggedIn, setIsLoggedIn] = useState(false);
11+
12+
const handleLoginSuccess = () => {
13+
setIsLoggedIn(true);
14+
};
15+
16+
const handleLogout = () => {
17+
setIsLoggedIn(false);
18+
};
19+
20+
return (
21+
<Routes>
22+
<Route
23+
path="/"
24+
element={
25+
<>
26+
{/* Always render Navbar */}
27+
{isLoggedIn ? <Navigate to="/home" /> : <LoginForm onLoginSuccess={handleLoginSuccess} />} {/* Render LoginForm only when not logged in */}
28+
</>
29+
}
30+
/>
31+
<Route path="/home" element={isLoggedIn ? <Landing /> : <Navigate to="/" />} />
32+
<Route path="/about-us" element={<About />} />
33+
<Route path="/signup" element={<Signup />} /> {/* Route for the signup page */}//this is additional
34+
</Routes>
35+
);
36+
}
37+
38+
export default App;

0 commit comments

Comments
 (0)