Update URL for deployment on ooa.world

Author: cynddl

README.md

@@ -1,6 +1,6 @@
 # The Observatory of Anonymity
 
-Source code for the Observatory of anonymity, available online at [https://cpg.doc.ic.ac.uk/observatory/](https://cpg.doc.ic.ac.uk/observatory/).
+Source code for the Observatory of anonymity, available online at [https://ooa.world/](https://ooa.world/).
 The Observatory of Anonymity allows users to test their degree of anonymity in 89 different countries.
 
 This is a client-side only application developed in TypeScript. All the computation to run the models are done directly in the browser.

package.json

@@ -2,15 +2,15 @@
 	"name": "privacy-demo",
 	"version": "2.0.0",
 	"description": "Analyze anonymized datasets using Gaussian Copula model",
-	"homepage": "/observatory/",
+	"homepage": "/",
 	"scripts": {
 		"build": "webpack --mode=production --config webpack.config.js",
 		"start": "http-server dist/",
 		"start:dev": "PUBLIC_URL=/ webpack-dev-server --mode=development --host 0.0.0.0"
 	},
 	"engines": {
-		"node": "14.x",
-		"npm": "6.x"
+		"node": "18.x",
+		"npm": "8.x"
 	},
 	"keywords": [
 		"react",

src/App.tsx

@@ -19,38 +19,38 @@ class App extends React.Component<RouteComponentProps, unknown> {
     pages = [
         {
             title: 'Home',
-            url: '/observatory',
+            url: '/',
             page: MainPage,
             has_pill: true,
         },
         {
             title: 'Try for yourself',
-            url: '/observatory/take-the-quiz/:iso3?',
-			baseUrl: '/observatory/take-the-quiz',
+            url: '/take-the-quiz/:iso3?',
+			baseUrl: '/take-the-quiz',
             page: IndividualRiskPage,
             has_pill: false,
         },
         {
             title: 'Explore anonymity',
-            url: '/observatory/explore',
+            url: '/explore',
             page: CountryReportsPage,
             has_pill: true,
         },
         {
             title: 'Analyze your data',
-            url: '/observatory/analyze-your-data',
+            url: '/analyze-your-data',
             page: ToolsPage,
             has_pill: true,
         },
         {
             title: 'Why it matters',
-            url: '/observatory/why-it-matters',
+            url: '/why-it-matters',
             page: AboutPage,
             has_pill: true,
         },
         {
             title: 'About Us',
-            url: '/observatory/why-it-matters#about-us',
+            url: '/why-it-matters#about-us',
             page: AboutPage,
             has_pill: true,
         },
@@ -117,12 +117,12 @@ class App extends React.Component<RouteComponentProps, unknown> {
                     <Row className="row-v-spacing" justify="center">
                         <Col xs={24} sm={24} md={16} lg={12}>
                             <h3>The Observatory of Anonymity</h3>
-                            <p>The Computational Privacy Group (CPG) is committed to protecting the privacy of visitors to our website. The Observatory of Anonymity does not collect nor share any personal data. All statistical computations run entirely in the browser, and no personal data is transmitted to Imperial College's servers. We only collect anonymous analytics (page URL and user agent).</p>
+                            <p>We are committed to protecting the privacy of visitors to our website. The Observatory of Anonymity does not collect nor share any personal data. All statistical computations run entirely in the browser, and no personal data is transmitted to our servers. We only collect anonymous analytics (page URL and user agent).</p>
                             <p>The source code of the Observatory is available at <a href="https://github.com/computationalprivacy/observatory">https://github.com/computationalprivacy/observatory</a> and distributed under a free license.</p>
                             <h3>Contacting us</h3>
-                            <p>Have questions, comments, or concerns? Please contact <a href="https://rocher.lc/">Luc Rocher</a> by email at: lrocher (at) imperial (dot) ac (dot) uk.</p>
+                            <p>Have questions, comments, or concerns? Please contact <a href="https://rocher.lc/">Luc Rocher</a> by email at: x@y where x=luc.rocher and y=oii.ox.ac.uk.</p>
                             <br />
-                            <a href="https://cpg.doc.ic.ac.uk/"><img src="/observatory/assets/logo-cpg-icl.png" style={{ objectFit: 'contain', maxWidth: '50%' }} /></a>
+                            <a href="https://cpg.doc.ic.ac.uk/"><img src="/assets/logo-cpg-icl.png" style={{ objectFit: 'contain', maxWidth: '50%' }} /></a>
                         </Col>
                     </Row>
                 </Footer>

src/index.html

@@ -5,12 +5,12 @@
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
 
-		<meta property="og:url" content="https://cpg.doc.ic.ac.uk/observatory/" />
+		<meta property="og:url" content="https://ooa.world/" />
 		<meta property="og:type" content="article" />
 		<meta property="og:title" content="The Observatory of Anonymity" />
 		<meta property="og:description" content="Explore the research of the Computational Privacy Group on anonymity online. Take a short quiz to find out what makes you more vulnerable to re-identification, explore anonymity in 89 countries around the world, or train our method with your own datasets." />
-		<meta property="og:image" content="https://cpg.doc.ic.ac.uk/observatory/image-1.png" />
-		<meta property="og:image" content="https://cpg.doc.ic.ac.uk/observatory/image-2.png" />
+		<meta property="og:image" content="https://ooa.world/image-1.png" />
+		<meta property="og:image" content="https://ooa.world/image-2.png" />
 
 		<title>The Observatory of Anonymity</title>
 		<link rel="manifest" href="./manifest.json">

src/index.ts

@@ -0,0 +1,30 @@
+/**
+ * Welcome to Cloudflare Workers! This is your first worker.
+ *
+ * - Run `wrangler dev src/index.ts` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your worker in action
+ * - Run `wrangler publish src/index.ts --name my-worker` to publish your worker
+ *
+ * Learn more at https://developers.cloudflare.com/workers/
+ */
+
+export interface Env {
+	// Example binding to KV. Learn more at https://developers.cloudflare.com/workers/runtime-apis/kv/
+	// MY_KV_NAMESPACE: KVNamespace;
+	//
+	// Example binding to Durable Object. Learn more at https://developers.cloudflare.com/workers/runtime-apis/durable-objects/
+	// MY_DURABLE_OBJECT: DurableObjectNamespace;
+	//
+	// Example binding to R2. Learn more at https://developers.cloudflare.com/workers/runtime-apis/r2/
+	// MY_BUCKET: R2Bucket;
+}
+
+export default {
+	async fetch(
+		request: Request,
+		env: Env,
+		ctx: ExecutionContext
+	): Promise<Response> {
+		return new Response("Hello World!");
+	},
+};

src/pages/AboutPage.tsx

@@ -67,7 +67,7 @@ export default class AboutPage extends React.Component<RouteComponentProps, any>
                         <div style={{ display: 'flex', flexWrap: 'wrap' }}>
                             <img
                                 className="dynamicScaleImg"
-                                src="/observatory/assets/fig_anon_record.png"
+                                src="/assets/fig_anon_record.png"
                                 width="10%"
                                 style={{ objectFit: 'contain' }}
                             />
@@ -135,7 +135,7 @@ export default class AboutPage extends React.Component<RouteComponentProps, any>
                         <Title level={3} style={{ textAlign: 'center' }}>
                             Does sampling actually help?
                         </Title>
-                        <img src="/observatory/assets/fig_sampling.png" width="100%" />
+                        <img src="/assets/fig_sampling.png" width="100%" />
                         <Paragraph>
                             <b>Sampling in theory</b>: Every dot is one
                             individual. Some share your basic demographics (in
@@ -282,7 +282,7 @@ export default class AboutPage extends React.Component<RouteComponentProps, any>
                                     }
                                     bordered={false}
                                     cover={
-                                        <img src="/observatory/assets/luc-rocher.png" />
+                                        <img src="/assets/luc-rocher.png" />
                                     }>
                                     <Title level={4}>Luc Rocher</Title>
                                     Research Associate,
@@ -301,7 +301,7 @@ export default class AboutPage extends React.Component<RouteComponentProps, any>
                                     }
                                     bordered={false}
                                     cover={
-                                        <img src="/observatory/assets/julien-hendrickx.jpg" />
+                                        <img src="/assets/julien-hendrickx.jpg" />
                                     }>
                                     <Title level={4}>Julien Hendrickx</Title>
                                     Professor,
@@ -320,7 +320,7 @@ export default class AboutPage extends React.Component<RouteComponentProps, any>
                                     }
                                     bordered={false}
                                     cover={
-                                        <img src="/observatory/assets/y-a-demontjoye.png" />
+                                        <img src="/assets/y-a-demontjoye.png" />
                                     }>
                                     <Title level={4}>
                                         Yves-Alexandre de Montjoye
@@ -341,7 +341,7 @@ export default class AboutPage extends React.Component<RouteComponentProps, any>
                                     }
                                     bordered={false}
                                     cover={
-                                        <img src="/observatory/assets/meenatchi-sundaram-msa.jpg" />
+                                        <img src="/assets/meenatchi-sundaram-msa.jpg" />
                                     }>
                                     <Title level={4}>
                                         Meenatchi Sundaram MSA

src/pages/CountryReportsPage.tsx

@@ -69,7 +69,7 @@ export default class CountryReportsPage extends React.Component<
 
     // read available countries & corresponding continent data from file
     componentDidMount(): void {
-        json('/observatory/risk.json').then((data) => {
+        json('/risk.json').then((data) => {
             const countryData = data as Country[];
             const continents: Record<string, Country[]> = {};
 
@@ -124,7 +124,7 @@ export default class CountryReportsPage extends React.Component<
             attrs = [];
         }
 
-        json(`/observatory/country_models/${iso3}.json`).then((data) => {
+        json(`/country_models/${iso3}.json`).then((data) => {
             const model = data as Model;
 
             // necessary variables for UniquenessData component

src/pages/IndividualRiskPage.tsx

@@ -70,7 +70,7 @@ export default class IndividualRiskPage extends React.Component<
     loadCountryModel(): void {
         const country_index = this.state.attrs[0];
         const country = this.state.countryData[country_index];
-        json(`/observatory/country_models/${country.iso3}.json`).then((data) => {
+        json(`/country_models/${country.iso3}.json`).then((data) => {
             const model = data as Model;
             const selectedHeaders = model.avail_var;
             selectedHeaders.push('COUNTRY');
@@ -144,9 +144,9 @@ export default class IndividualRiskPage extends React.Component<
             countrySelected = params.iso3;
         }
 
-        json('/observatory/risk.json').then((data) => {
+        json('/risk.json').then((data) => {
             const countryData = data as Country[];
-            json('/observatory/qns.json').then((data) => {
+            json('/qns.json').then((data) => {
                 const qnData = data as Question[];
 
                 // add choosing country to list of questions and sort by name
@@ -411,7 +411,7 @@ export default class IndividualRiskPage extends React.Component<
             return (
                 <Redirect
                     to={{
-                        pathname: '/observatory/explore',
+                        pathname: '/explore',
                         state: {
                             attrs: state.attrs.map((val) =>
                                 val == -1 ? Number.NaN : val

src/pages/MainPage.tsx

@@ -277,7 +277,7 @@ export default class MainPage extends React.Component<unknown, IState> {
 
                             Welcome to the Observatory of Anonymity, an interactive website to explore the research of the Computational Privacy Group at Imperial College London. Take a short quiz to find out what makes you more vulnerable to re-identification, explore anonymity in 89 countries around the world, or train our method with your own datasets.
                         </Paragraph>
-                        <Link to="/observatory/take-the-quiz">
+                        <Link to="/take-the-quiz">
                             <Button type="primary">Try for yourself</Button>
                         </Link>
                     </div>

src/pages/components/ChooseDataset.tsx

@@ -61,7 +61,7 @@ export default class ChooseDataset extends React.Component<IProps, unknown> {
                         <Text>
                             <Text keyboard>Datasets</Text> are expected to follow
                             the CSV protocol with the first row being the header. To simply try this tool with a sample toy dataset, we provide a copy of the ADULT dataset {' '}
-							<a href="/observatory/adult.csv">here</a>. Click on <Text keyboard>Select Dataset</Text> and upload the downloaded dataset to get started!
+							<a href="/adult.csv">here</a>. Click on <Text keyboard>Select Dataset</Text> and upload the downloaded dataset to get started!
                             <br />
                             <br />
                             The <Text keyboard>sample size</Text> represents the

src/service-worker.ts

@@ -50,7 +50,7 @@ registerRoute(
     // Return true to signal that we want to use the handler.
     return true;
   },
-  createHandlerBoundToURL('/observatory/index.html')
+  createHandlerBoundToURL('/index.html')
 );
 
 // An example runtime caching route for requests that aren't handled by the

src/serviceWorkerRegistration.ts

@@ -35,7 +35,7 @@ export function register(config?: Config): void {
     // }
 
     window.addEventListener('load', () => {
-      const swUrl = `/observatory/service-worker.js`;
+      const swUrl = `/service-worker.js`;
 
       if (isLocalhost) {
         // This is running on localhost. Let's check if a service worker still exists or not.

wrangler.toml

@@ -0,0 +1,3 @@
+name = "observatory"
+main = "src/index.ts"
+compatibility_date = "2022-11-30"