Skip to content

style updates #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 8, 2022
Merged

style updates #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
624c9ab
Update HomePage.css
miketitan58 Mar 30, 2022
7463d64
Merge branch 'KylePancamo:development' into development
miketitan58 Mar 30, 2022
1e28b5e
Update HomePage.css
miketitan58 Mar 30, 2022
6cbe15e
Merge branch 'KylePancamo:development' into development
miketitan58 Mar 30, 2022
6625af4
Merge branch 'KylePancamo:development' into development
miketitan58 Apr 1, 2022
260dd77
Merge branch 'KylePancamo:development' into development
miketitan58 Apr 4, 2022
0bc1aad
Merge branch 'KylePancamo:development' into development
miketitan58 Apr 8, 2022
10d2e69
IP change
miketitan58 Apr 8, 2022
4c83b91
Merge branch 'KylePancamo:development' into development
miketitan58 Apr 8, 2022
963553b
Merge branch 'KylePancamo:development' into development
miketitan58 Apr 8, 2022
bd8b42a
Logo Update
miketitan58 Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/logo123.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo123.jpg" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>WorldWide Frames</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file added public/logo123.ico
View file
Open in desktop
Binary file not shown.
Binary file added public/logo123.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions public/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"short_name": "React App",
"short_name": "WorldWide Frames",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"src": "logo123.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"src": "logo123.jpg",
"type": "image/jpg",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"src": "logo523.jpg",
"type": "image/jpg",
"sizes": "512x512"
}
],
Expand Down
2 changes: 1 addition & 1 deletion server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const saltRounds = 10;

app.use(express.json());
app.use(cors({
origin: ["http://localhost:3000"],
origin: ["http://3.93.4.5:3000"],
methods: ["GET", "POST"],
credentials: true,
}));
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/RegistrationPage/RegistrationPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function Registration() {
return;
}

Axios.post("http://localhost:5000/register", data).then((response) => {
Axios.post("http://3.93.4.5:5000/register", data).then((response) => {
if (response.data.error) {
alert(response.data.error);
console.log("error!");
Expand Down
5 changes: 2 additions & 3 deletions src/Pages/SignInPage/SignInPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function SignIn() {
let history = useHistory();

const login = () => {
Axios.post("http://localhost:5000/signin",
Axios.post("http://3.93.4.5:5000/signin",
{
username: username,
password: password,
Expand All @@ -28,12 +28,11 @@ function SignIn() {
window.location.reload(true);
history.push("/");
}

});
};

useEffect(() => {
Axios.get("http://localhost:5000/signin").then((response) => {
Axios.get("http://3.93.4.5:5000/signin").then((response) => {
if (response.data.user) {
history.push("/");
}
Expand Down