From 23cfb187feb0ca932b8f2811a34bdb252c21b72c Mon Sep 17 00:00:00 2001
From: "cjt002@ucsd.edu" <64194102+angelatsai1214@users.noreply.github.com>
Date: Mon, 29 Jul 2024 00:18:01 -0700
Subject: [PATCH] styling fixes
---
package-lock.json | 12 ++++++------
package.json | 2 +-
src/components/Header/index.less | 5 +++++
src/components/Header/index.tsx | 4 ++--
src/components/MainFooter/index.tsx | 16 ++++++++++++++--
src/components/ProjectCard/index.less | 12 ++++++------
src/pages/AboutPage/index.less | 2 +-
src/pages/AboutPage/index.tsx | 6 +++---
src/pages/CompetitionsPage/index.tsx | 2 +-
src/pages/EventsPage/index.tsx | 4 ++++
src/pages/MainPage/index.tsx | 8 +++-----
src/pages/ProjectsPage/index.tsx | 2 +-
12 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 82f957d..125f35d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
"react-icons": "^4.10.1",
"react-remark": "^2.1.0",
"react-router-dom": "^5.1.2",
- "react-scripts": "^5.0.0"
+ "react-scripts": "^5.0.1"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
@@ -16134,9 +16134,9 @@
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"node_modules/react-scripts": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz",
- "integrity": "sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
+ "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
"dependencies": {
"@babel/core": "^7.16.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
@@ -16154,7 +16154,7 @@
"dotenv": "^10.0.0",
"dotenv-expand": "^5.1.0",
"eslint": "^8.3.0",
- "eslint-config-react-app": "^7.0.0",
+ "eslint-config-react-app": "^7.0.1",
"eslint-webpack-plugin": "^3.1.1",
"file-loader": "^6.2.0",
"fs-extra": "^10.0.0",
@@ -16171,7 +16171,7 @@
"postcss-preset-env": "^7.0.1",
"prompts": "^2.4.2",
"react-app-polyfill": "^3.0.0",
- "react-dev-utils": "^12.0.0",
+ "react-dev-utils": "^12.0.1",
"react-refresh": "^0.11.0",
"resolve": "^1.20.0",
"resolve-url-loader": "^4.0.0",
diff --git a/package.json b/package.json
index fd9931a..8238044 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"react-icons": "^4.10.1",
"react-remark": "^2.1.0",
"react-router-dom": "^5.1.2",
- "react-scripts": "^5.0.0"
+ "react-scripts": "^5.0.1"
},
"scripts": {
"start": "react-app-rewired start",
diff --git a/src/components/Header/index.less b/src/components/Header/index.less
index 6caa26c..74f9c7c 100644
--- a/src/components/Header/index.less
+++ b/src/components/Header/index.less
@@ -83,6 +83,11 @@
p {
font-weight: @semi-bold;
}
+
+ h4 {
+ font-weight: @semi-bold;;
+ color: white;
+ }
}
}
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index 4d5735a..04362a3 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -157,11 +157,11 @@ function Header() {
onClick={() => {
logoutUser();
setUser(defaultUser);
- message.success('Logged out');
+
history.push('/');
}}
>
-
Login
+ Login
)}
diff --git a/src/components/MainFooter/index.tsx b/src/components/MainFooter/index.tsx
index 508a8cd..440d60c 100644
--- a/src/components/MainFooter/index.tsx
+++ b/src/components/MainFooter/index.tsx
@@ -3,10 +3,21 @@ import React from 'react';
import './index.less';
import { AiOutlineLink } from 'react-icons/ai';
import { BiLogoInstagram, BiLogoDiscord } from 'react-icons/bi';
-const { Footer } = Layout;
+import '../../newStyles/components.less'
+const { Footer, Content } = Layout;
-const MainFooter = () => {
+interface MainFooterProps {
+ isMainPage: boolean;
+}
+
+// const MainFooter = (isMainPage: boolean) => {
+const MainFooter: React.FC = ({ isMainPage }) => {
return (
+ <>
+
+
+
+ {/*