favicon added, appbar logo added (#34)

CSDL-UMD · Jan 2, 2024 · fbc8f0b · fbc8f0b
1 parent 3a31cb8
commit fbc8f0b
Show file tree

Hide file tree

Showing 9 changed files with 223 additions and 82 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -7,7 +7,7 @@
     "@emotion/styled": "^11.11.0",
     "@fontsource/roboto": "^5.0.8",
     "@mui/material": "^5.14.8",
-    "@mui/styled-engine-sc": "^5.14.8",
+    "@mui/styled-engine-sc": "^6.0.0-alpha.10",
     "@mui/x-data-grid": "^6.14.0",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",

diff --git a/app/public/index.html b/app/public/index.html
@@ -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%/wikimedia_logo_black.png" />
     <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%/wikimedia_logo_black.png" />
     <!--
       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/
@@ -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>Wikimedia Disinformation Map</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/app/public/wikimedia_logo_black.png b/app/public/wikimedia_logo_black.png
diff --git a/app/src/components/AppBar.js b/app/src/components/AppBar.js
@@ -1,18 +1,35 @@
 import Typography from '@mui/material/Typography';
 
 import { AppBar, Button, Toolbar } from '@mui/material';
+import logo from "./../wikimedia_foundation_logo_white.svg";
 
 export default function ButtonAppBar({ resetData }) {
   return (
     <AppBar position="sticky">
       <Toolbar>
+        <a href="https://wikimediafoundation.org/" target="blank" rel="noopener">
+          <img src={logo} alt="" style={{ width: "175px", height: "auto" , marginRight: "0px"}}></img>
+        </a>
         <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
-          Wikimedia Disinformation Map
+
         </Typography>
-        <Button color="inherit" onClick={resetData}>
+        <Button color="inherit" onClick={resetData} variant="outlined">
           Reset Filters
         </Button>
       </Toolbar>
     </AppBar>
   );
 }
+
+/*
+<AppBar position="sticky">
+  <Toolbar>
+    <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
+      Wikimedia Disinformation Map
+    </Typography>
+    <Button color="inherit" onClick={resetData}>
+      Reset Filters
+    </Button>
+  </Toolbar>
+</AppBar>
+*/
diff --git a/app/src/components/PieChart.js b/app/src/components/PieChart.js
@@ -166,7 +166,7 @@ export default class PieChart extends Component {
   render() {
     return (
       <Paper style={{ padding: 20 }}>
-        <Typography variant="h5" gutterBottom align="center">
+        <Typography variant="h5" gutterBottom align="center" style={{fontFamily: "Segoe UI, Tahoma, Geneva, Verdana, sans-serif"}}>
           {this.props.column}
         </Typography>
         <ResponsiveContainer width="100%" height={250}>

diff --git a/app/src/components/ProjectDescription.js b/app/src/components/ProjectDescription.js
@@ -5,21 +5,25 @@ import Typography from '@mui/material/Typography';
 const ProjectDescription = () => {
   return (
     <Paper style={{ padding: 10 }}>
-      <Typography variant="h4" component="h2">
+      <Typography variant="h4" component="h2" style={{ fontFamily: "Segoe UI, Tahoma, Geneva, Verdana, sans-serif", fontWeight: "bold"}}>
         Background
       </Typography>
-      <p>
+      <p style={{fontFamily: "Segoe UI, Tahoma, Geneva, Verdana, sans-serif"}}>
         Wikipedia is a trusted source of knowledge for millions of people worldwide. 
         Edited by thousands of volunteers across more than 300 language editions, 
         the encyclopedia is part of a global movement whose goal is to build a reliable 
-        and open knowledge infrastructure for the Internet. Due to its prominence and 
+        and open knowledge infrastructure for the Internet. <br></br><br></br>
+
+        Due to its prominence and 
         importance within cyberspace, however, Wikipedia and its sister projects are 
         constantly under threat from external actors whose role is to compromise its 
         independence and undermine its integrity as an open source of knowledge. Examples 
         include authoritarian regimes persecuting local Wikipedia editors for their role 
         in documenting conflicts like the war in Ukraine, or shady marketing firms 
         creating fake grassroots campaigns to promote companies and influence state 
-        and local decision-making processes. The Wikipedia community, however, is 
+        and local decision-making processes. <br></br><br></br>
+
+        The Wikipedia community, however, is 
         fighting back. Over the years, a number of community projects have been started 
         to counter these threats. The goal of this project is to compile the first 
         exhaustive map of these community efforts aimed at preserving the integrity of 

diff --git a/app/src/wikimedia_foundation_logo_black.svg b/app/src/wikimedia_foundation_logo_black.svg
diff --git a/app/src/wikimedia_foundation_logo_white.svg b/app/src/wikimedia_foundation_logo_white.svg