add mastodon link to footer, replacing twitter.

maproulette · Feb 12, 2024 · 8280689 · 8280689
1 parent ca1f85d
commit 8280689
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -24,4 +24,4 @@ There are many different ways to contribute to MapRoulette!
 
 * Ask a question about MapRoulette on the [OSM community forum](https://community.openstreetmap.org/tag/maproulette)
 * Join the #maproulette channel on the [OSM US Slack](https://slack.openstreetmap.us/)
-* Follow MapRoulette [on Mastodon](https://en.osm.town/@MapRoulette) or [on Twitter](https://twitter.com/maproulette)
+* Follow MapRoulette [on Mastodon](https://en.osm.town/@MapRoulette)
diff --git a/package.json b/package.json
@@ -155,4 +155,4 @@
   "resolutions": {
     "react-error-overlay": "6.0.9"
   }
-}
+}
diff --git a/public/index.html b/public/index.html
@@ -1,41 +1,37 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#23395B">
-    <meta name="title" content="MapRoulette" />
-    <meta name="description" content="Be an instant contributor to the world’s maps." />
-    <meta property="og:image" content="https://openstreetmap.us/img/pages/maproulette/sign.png" />
-    <meta property="og:type" content="website" />
-    <meta property="og:title" content="MapRoulette" />
-    <meta property="og:description" content="Be an instant contributor to the world’s maps." />
-    <meta property="twitter:title" content="MapRoulette" />
-    <meta property="twitter:description" content="Be an instant contributor to the world’s maps." />
-    <meta property="twitter:image" content="https://openstreetmap.us/img/pages/maproulette/sign.png" />
-    <!--
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="theme-color" content="#23395B">
+  <meta name="title" content="MapRoulette" />
+  <meta name="description" content="Be an instant contributor to the world’s maps." />
+  <meta property="og:image" content="https://openstreetmap.us/img/pages/maproulette/sign.png" />
+  <meta property="og:type" content="website" />
+  <meta property="og:title" content="MapRoulette" />
+  <meta property="og:description" content="Be an instant contributor to the world’s maps." />
+  <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+  <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
 
-    <!-- App Icons -->
-    <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/assets/images/favicons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/assets/images/favicons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/assets/images/favicons/favicon-16x16.png">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+  <!-- App Icons -->
+  <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/assets/images/favicons/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/assets/images/favicons/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/assets/images/favicons/favicon-16x16.png">
+  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
 
-    <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono|Roboto:300,400,500,700&display=swap" rel="stylesheet">
-    <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css"
-          integrity="sha512-07I2e+7D8p6he1SIM+1twR5TIrhUQn9+I6yjqD53JQjFiMf8EtC93ty0/5vJTZGF8aAocvHYNEDJajGdNx1IsQ=="
-          crossorigin=""/>
-    <link
-      href="https://unpkg.com/mapillary-js@4.0.0/dist/mapillary.css"
-      rel="stylesheet"
-    />
+  <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono|Roboto:300,400,500,700&display=swap"
+    rel="stylesheet">
+  <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css"
+    integrity="sha512-07I2e+7D8p6he1SIM+1twR5TIrhUQn9+I6yjqD53JQjFiMf8EtC93ty0/5vJTZGF8aAocvHYNEDJajGdNx1IsQ=="
+    crossorigin="" />
+  <link href="https://unpkg.com/mapillary-js@4.0.0/dist/mapillary.css" rel="stylesheet" />
 
-    <!--
+  <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -44,16 +40,17 @@
       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>
-  </head>
-  <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-    <div id="root"></div>
-    <div id="external-root"></div>
-    <div id="dropdown"></div>
-    <!--
+  <title>%REACT_APP_TITLE%</title>
+</head>
+
+<body>
+  <noscript>
+    You need to enable JavaScript to run this app.
+  </noscript>
+  <div id="root"></div>
+  <div id="external-root"></div>
+  <div id="dropdown"></div>
+  <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
@@ -63,5 +60,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-  </body>
-</html>
+</body>
+
+</html>
diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
@@ -8,25 +8,25 @@ class Footer extends Component {
     super(props);
 
     this.state = {
-      data : null
+      data: null
     };
   }
 
   componentDidMount() {
     this.renderMyData();
   }
 
-  renderMyData(){
+  renderMyData() {
     fetch(`${process.env.REACT_APP_MAP_ROULETTE_SERVER_URL}/api/v2/service/info`)
-        .then((response) => response.json())
-        .then((responseJson) => {
-          this.setState({ data : responseJson })
-        })
-        .catch((error) => {
-          console.error(error);
-        });
+      .then((response) => response.json())
+      .then((responseJson) => {
+        this.setState({ data: responseJson })
+      })
+      .catch((error) => {
+        console.error(error);
+      });
   }
-  
+
   render() {
     return (
       <footer
@@ -45,8 +45,8 @@ class Footer extends Component {
                   </a>
                 </span>
               </h3>
-             { this.state.data ? 
-              <h3 className="mr-text-white mr-text-md mr-mb-2">
+              {this.state.data ?
+                <h3 className="mr-text-white mr-text-md mr-mb-2">
                   <FormattedMessage {...messages.APIVersionLabel} />{' '}
                   <span className="mr-text-green-light mr-font-mono mr-text-base">
                     <a
@@ -55,8 +55,8 @@ class Footer extends Component {
                       v{this.state.data.compiletime.version}
                     </a>
                   </span>
-                </h3> : 
-                null 
+                </h3> :
+                null
               }
             </div>
 
@@ -92,7 +92,7 @@ class Footer extends Component {
                 rel="noopener noreferrer"
                 className="mr-items-center"
               >
-                <span className="mr-absolute mr-ml-8"> 
+                <span className="mr-absolute mr-ml-8">
                   <FormattedMessage {...messages.donateButton} />
                 </span>
               </a>
@@ -103,13 +103,13 @@ class Footer extends Component {
                   <FormattedMessage {...messages.followUs} />
                 </h3>
                 <a
-                  href="https://twitter.com/maproulette"
+                  href="https://en.osm.town/@MapRoulette"
                   target="_blank"
                   rel="noopener noreferrer"
                   className="mr-inline-flex mr-items-center"
                 >
                   <SvgSymbol
-                    sym="icon-twitter"
+                    sym="icon-mastodon"
                     viewBox="0 0 30 24"
                     className="mr-w-6 mr-h-auto mr-fill-twitter"
                   />

diff --git a/src/components/Sprites/Sprites.js b/src/components/Sprites/Sprites.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,4 +155,4 @@ @@
       "resolutions": {
         "react-error-overlay": "6.0.9"
       }
-    }
+    }