From 9ba839d1113cd598528d93f788d6a518dec4f45a Mon Sep 17 00:00:00 2001 From: Daniel Bachler Date: Wed, 8 May 2024 13:43:53 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20remove=20the=20remaining=20wordp?= =?UTF-8?q?ress=20pieces=20(#3520)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes all leftovers of wordpress in our grapher codebase --------- Co-authored-by: Matthieu Bergel --- .env.example-full | 14 +- .eslintignore | 6 - .prettierignore | 5 - .rsync-ignore | 1 - .vscode/launch.json | 17 - .vscode/tasks.json | 36 +- Makefile | 39 +- README.md | 14 +- adminSiteClient/AdminLayout.tsx | 9 - adminSiteClient/PostsIndexPage.tsx | 15 +- adminSiteServer/apiRouter.ts | 4 - adminSiteServer/app.tsx | 24 - adminSiteServer/mockSiteRouter.tsx | 26 +- baker/SiteBaker.tsx | 7 - baker/algolia/indexToAlgolia.tsx | 3 - baker/postUpdatedHook.ts | 222 - baker/siteRenderers.tsx | 22 +- baker/startDeployQueueServer.ts | 1 + baker/syncRedirectsToGrapher.ts | 79 - db/DEPRECATEDwpdb.ts | 261 - db/model/Post.ts | 15 +- db/syncPostsToGrapher.ts | 447 - db/wpdb.ts | 278 - devTools/docker/banner.sh | 1 - .../docker/create-and-fill-wordpress-db.sh | 44 - .../docker/create-wordpress-admin-user.sh | 30 - devTools/docker/download-wordpress-mysql.sh | 15 - devTools/docker/download-wordpress-uploads.sh | 11 - devTools/docker/full-mysql-init.sh | 10 - devTools/docker/php.ini | 9 - devTools/docker/refresh-wordpress-data.sh | 32 - devTools/docker/vhosts.conf | 89 - .../docker/wordpress-php-docker/Dockerfile | 16 - devTools/droplet/readme.md | 23 - devTools/droplet/refresh-staging-db.sh | 132 - devTools/droplet/setup-staging-environment.sh | 111 - .../tsconfig.json | 8 - .../upload-wordpress-images-to-obj-storage.ts | 156 - docker-compose.dbtests.yml | 8 +- docker-compose.devcontainer.yml | 6 +- docker-compose.full.yml | 120 - docker-compose.grapher.yml | 2 - docs/full-wordpress-setup.md | 23 - docs/setup-options-overview.md | 8 - jest.config.js | 3 - jest.db.config.js | 1 - ops/buildkite/build-code | 6 - ops/buildkite/deploy-content | 12 - package.json | 3 - settings/clientSettings.ts | 1 - settings/serverSettings.ts | 20 +- site/LongFormPage.tsx | 36 - site/formatting.tsx | 23 +- site/owid.entry.ts | 8 +- tsconfig.json | 3 - wordpress/.dependabot/config.yml | 10 - wordpress/.env.example | 32 - wordpress/.gitignore | 24 - wordpress/.rsync-filter | 34 - wordpress/LICENSE.md | 20 - wordpress/README.md | 64 - wordpress/composer.json | 107 - wordpress/composer.lock | 1998 --- wordpress/config/application.php | 153 - wordpress/config/environments/development.php | 20 - wordpress/config/environments/staging.php | 17 - wordpress/phpcs.xml | 23 - wordpress/scripts/deploy.sh | 78 - wordpress/web/.user.ini | 2 - .../web/app/mu-plugins/bedrock-autoloader.php | 16 - .../mu-plugins/register-theme-directory.php | 14 - wordpress/web/app/plugins/owid/.gitignore | 5 - .../owid/.yarn/releases/yarn-3.3.0.cjs | 807 - wordpress/web/app/plugins/owid/.yarnrc.yml | 3 - wordpress/web/app/plugins/owid/LICENSE | 21 - wordpress/web/app/plugins/owid/README.md | 3 - wordpress/web/app/plugins/owid/owid.php | 502 - wordpress/web/app/plugins/owid/package.json | 18 - .../AdditionalInformation.js | 198 - .../additional-information.php | 18 - .../plugins/owid/src/AllCharts/AllCharts.js | 38 - .../plugins/owid/src/AllCharts/all-charts.php | 12 - .../app/plugins/owid/src/AllCharts/block.json | 8 - .../web/app/plugins/owid/src/Byline/Byline.js | 27 - .../app/plugins/owid/src/Byline/byline.php | 14 - .../web/app/plugins/owid/src/Card/Card.js | 106 - .../web/app/plugins/owid/src/Card/card.php | 67 - .../owid/src/CodeSnippet/CodeSnippet.js | 28 - .../plugins/owid/src/CodeSnippet/block.json | 8 - .../owid/src/CodeSnippet/code-snippet.php | 12 - .../ExpandableParagraph.js | 29 - .../owid/src/ExpandableParagraph/block.json | 8 - .../expandable-paragraph.php | 12 - .../owid/src/FrontMatter/FrontMatter.js | 41 - .../plugins/owid/src/FrontMatter/block.json | 8 - .../owid/src/FrontMatter/front-matter.php | 8 - .../web/app/plugins/owid/src/Grid/Grid.js | 23 - .../web/app/plugins/owid/src/Grid/grid.php | 15 - .../web/app/plugins/owid/src/Help/Help.js | 46 - .../web/app/plugins/owid/src/Help/help.php | 14 - .../plugins/owid/src/KeyInsight/KeyInsight.js | 79 - .../plugins/owid/src/KeyInsight/block.json | 20 - .../owid/src/KeyInsight/key-insight.php | 20 - .../KeyInsightsSlider/KeyInsightsSlider.js | 79 - .../owid/src/KeyInsightsSlider/block.json | 16 - .../KeyInsightsSlider/key-insights-slider.php | 19 - .../KeyPerformanceIndicators.js | 66 - .../owid/src/LastUpdated/LastUpdated.js | 45 - .../owid/src/LastUpdated/last-updated.php | 14 - .../owid/src/MediaContainer/MediaContainer.js | 69 - .../owid/src/ProminentLink/ProminentLink.js | 215 - .../owid/src/ProminentLink/prominent-link.php | 35 - .../PublicationContext/PublicationContext.js | 50 - .../ResearchAndWriting/ResearchAndWriting.js | 122 - .../owid/src/ResearchAndWriting/block.json | 8 - .../research-and-writing.php | 8 - .../plugins/owid/src/StickyNav/StickyNav.js | 47 - .../app/plugins/owid/src/StickyNav/block.json | 8 - .../plugins/owid/src/StickyNav/sticky-nav.php | 12 - .../app/plugins/owid/src/Summary/Summary.js | 26 - .../app/plugins/owid/src/Summary/summary.php | 15 - .../SyncingAnchorSettings.js | 69 - .../owid/src/TechnicalText/TechnicalText.js | 28 - .../plugins/owid/src/TechnicalText/block.json | 8 - .../owid/src/TechnicalText/technical-text.php | 14 - .../app/plugins/owid/src/authentication.php | 209 - wordpress/web/app/plugins/owid/src/blocks.js | 80 - .../plugins/owid/src/db_search_replace.php | 65 - wordpress/web/app/plugins/owid/src/logout.php | 13 - wordpress/web/app/plugins/owid/src/plugins.js | 50 - wordpress/web/app/plugins/owid/src/style.css | 49 - wordpress/web/app/plugins/owid/yarn.lock | 13085 ---------------- .../app/themes/owid-theme/editor-style.css | 8 - wordpress/web/app/themes/owid-theme/index.php | 2 - .../web/app/themes/owid-theme/singular.php | 12 - wordpress/web/app/themes/owid-theme/style.css | 1 - .../web/app/themes/owid-theme/theme.json | 33 - wordpress/web/app/uploads/.gitkeep | 0 wordpress/web/index.php | 6 - wordpress/web/robots.txt | 2 - wordpress/web/wp-config.php | 9 - wordpress/wp-cli.yml | 3 - 142 files changed, 67 insertions(+), 21878 deletions(-) delete mode 100644 baker/postUpdatedHook.ts delete mode 100644 baker/syncRedirectsToGrapher.ts delete mode 100644 db/DEPRECATEDwpdb.ts delete mode 100644 db/syncPostsToGrapher.ts delete mode 100644 db/wpdb.ts delete mode 100755 devTools/docker/create-and-fill-wordpress-db.sh delete mode 100755 devTools/docker/create-wordpress-admin-user.sh delete mode 100755 devTools/docker/download-wordpress-mysql.sh delete mode 100755 devTools/docker/download-wordpress-uploads.sh delete mode 100755 devTools/docker/full-mysql-init.sh delete mode 100644 devTools/docker/php.ini delete mode 100755 devTools/docker/refresh-wordpress-data.sh delete mode 100644 devTools/docker/vhosts.conf delete mode 100644 devTools/docker/wordpress-php-docker/Dockerfile delete mode 100644 devTools/droplet/readme.md delete mode 100755 devTools/droplet/refresh-staging-db.sh delete mode 100644 devTools/droplet/setup-staging-environment.sh delete mode 100644 devTools/uploadWordpressImagesToObjStorage/tsconfig.json delete mode 100644 devTools/uploadWordpressImagesToObjStorage/upload-wordpress-images-to-obj-storage.ts delete mode 100644 docker-compose.full.yml delete mode 100644 docs/full-wordpress-setup.md delete mode 100644 wordpress/.dependabot/config.yml delete mode 100644 wordpress/.env.example delete mode 100644 wordpress/.gitignore delete mode 100644 wordpress/.rsync-filter delete mode 100644 wordpress/LICENSE.md delete mode 100644 wordpress/README.md delete mode 100644 wordpress/composer.json delete mode 100644 wordpress/composer.lock delete mode 100644 wordpress/config/application.php delete mode 100644 wordpress/config/environments/development.php delete mode 100644 wordpress/config/environments/staging.php delete mode 100644 wordpress/phpcs.xml delete mode 100755 wordpress/scripts/deploy.sh delete mode 100644 wordpress/web/.user.ini delete mode 100644 wordpress/web/app/mu-plugins/bedrock-autoloader.php delete mode 100644 wordpress/web/app/mu-plugins/register-theme-directory.php delete mode 100644 wordpress/web/app/plugins/owid/.gitignore delete mode 100755 wordpress/web/app/plugins/owid/.yarn/releases/yarn-3.3.0.cjs delete mode 100644 wordpress/web/app/plugins/owid/.yarnrc.yml delete mode 100644 wordpress/web/app/plugins/owid/LICENSE delete mode 100644 wordpress/web/app/plugins/owid/README.md delete mode 100644 wordpress/web/app/plugins/owid/owid.php delete mode 100644 wordpress/web/app/plugins/owid/package.json delete mode 100644 wordpress/web/app/plugins/owid/src/AdditionalInformation/AdditionalInformation.js delete mode 100644 wordpress/web/app/plugins/owid/src/AdditionalInformation/additional-information.php delete mode 100644 wordpress/web/app/plugins/owid/src/AllCharts/AllCharts.js delete mode 100644 wordpress/web/app/plugins/owid/src/AllCharts/all-charts.php delete mode 100644 wordpress/web/app/plugins/owid/src/AllCharts/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/Byline/Byline.js delete mode 100644 wordpress/web/app/plugins/owid/src/Byline/byline.php delete mode 100644 wordpress/web/app/plugins/owid/src/Card/Card.js delete mode 100644 wordpress/web/app/plugins/owid/src/Card/card.php delete mode 100644 wordpress/web/app/plugins/owid/src/CodeSnippet/CodeSnippet.js delete mode 100644 wordpress/web/app/plugins/owid/src/CodeSnippet/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/CodeSnippet/code-snippet.php delete mode 100644 wordpress/web/app/plugins/owid/src/ExpandableParagraph/ExpandableParagraph.js delete mode 100644 wordpress/web/app/plugins/owid/src/ExpandableParagraph/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/ExpandableParagraph/expandable-paragraph.php delete mode 100644 wordpress/web/app/plugins/owid/src/FrontMatter/FrontMatter.js delete mode 100644 wordpress/web/app/plugins/owid/src/FrontMatter/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/FrontMatter/front-matter.php delete mode 100644 wordpress/web/app/plugins/owid/src/Grid/Grid.js delete mode 100644 wordpress/web/app/plugins/owid/src/Grid/grid.php delete mode 100644 wordpress/web/app/plugins/owid/src/Help/Help.js delete mode 100644 wordpress/web/app/plugins/owid/src/Help/help.php delete mode 100644 wordpress/web/app/plugins/owid/src/KeyInsight/KeyInsight.js delete mode 100644 wordpress/web/app/plugins/owid/src/KeyInsight/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/KeyInsight/key-insight.php delete mode 100644 wordpress/web/app/plugins/owid/src/KeyInsightsSlider/KeyInsightsSlider.js delete mode 100644 wordpress/web/app/plugins/owid/src/KeyInsightsSlider/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/KeyInsightsSlider/key-insights-slider.php delete mode 100644 wordpress/web/app/plugins/owid/src/KeyPerformanceIndicators/KeyPerformanceIndicators.js delete mode 100644 wordpress/web/app/plugins/owid/src/LastUpdated/LastUpdated.js delete mode 100644 wordpress/web/app/plugins/owid/src/LastUpdated/last-updated.php delete mode 100644 wordpress/web/app/plugins/owid/src/MediaContainer/MediaContainer.js delete mode 100644 wordpress/web/app/plugins/owid/src/ProminentLink/ProminentLink.js delete mode 100644 wordpress/web/app/plugins/owid/src/ProminentLink/prominent-link.php delete mode 100644 wordpress/web/app/plugins/owid/src/PublicationContext/PublicationContext.js delete mode 100644 wordpress/web/app/plugins/owid/src/ResearchAndWriting/ResearchAndWriting.js delete mode 100644 wordpress/web/app/plugins/owid/src/ResearchAndWriting/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/ResearchAndWriting/research-and-writing.php delete mode 100644 wordpress/web/app/plugins/owid/src/StickyNav/StickyNav.js delete mode 100644 wordpress/web/app/plugins/owid/src/StickyNav/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/StickyNav/sticky-nav.php delete mode 100644 wordpress/web/app/plugins/owid/src/Summary/Summary.js delete mode 100644 wordpress/web/app/plugins/owid/src/Summary/summary.php delete mode 100644 wordpress/web/app/plugins/owid/src/SyncingAnchorSettings/SyncingAnchorSettings.js delete mode 100644 wordpress/web/app/plugins/owid/src/TechnicalText/TechnicalText.js delete mode 100644 wordpress/web/app/plugins/owid/src/TechnicalText/block.json delete mode 100644 wordpress/web/app/plugins/owid/src/TechnicalText/technical-text.php delete mode 100644 wordpress/web/app/plugins/owid/src/authentication.php delete mode 100644 wordpress/web/app/plugins/owid/src/blocks.js delete mode 100644 wordpress/web/app/plugins/owid/src/db_search_replace.php delete mode 100644 wordpress/web/app/plugins/owid/src/logout.php delete mode 100644 wordpress/web/app/plugins/owid/src/plugins.js delete mode 100644 wordpress/web/app/plugins/owid/src/style.css delete mode 100644 wordpress/web/app/plugins/owid/yarn.lock delete mode 100644 wordpress/web/app/themes/owid-theme/editor-style.css delete mode 100644 wordpress/web/app/themes/owid-theme/index.php delete mode 100644 wordpress/web/app/themes/owid-theme/singular.php delete mode 100644 wordpress/web/app/themes/owid-theme/style.css delete mode 100644 wordpress/web/app/themes/owid-theme/theme.json delete mode 100644 wordpress/web/app/uploads/.gitkeep delete mode 100644 wordpress/web/index.php delete mode 100644 wordpress/web/robots.txt delete mode 100644 wordpress/web/wp-config.php delete mode 100644 wordpress/wp-cli.yml diff --git a/.env.example-full b/.env.example-full index 6ab3e0a6ae..5b10b5e286 100644 --- a/.env.example-full +++ b/.env.example-full @@ -15,18 +15,6 @@ GRAPHER_TEST_DB_PASS=graphertest GRAPHER_TEST_DB_HOST=127.0.0.1 GRAPHER_TEST_DB_PORT=3308 -WORDPRESS_DB_NAME=wordpress -WORDPRESS_DB_USER=wordpress -WORDPRESS_DB_PASS=wordpress -WORDPRESS_DB_HOST=127.0.0.1 -# Should be the same as GRAPHER_DB_PORT in almost all cases -WORDPRESS_DB_PORT=3307 - -# Enable linkage between grapher and wordpress -WORDPRESS_URL=http://localhost:8080 -WORDPRESS_API_USER=admin@example.com -WORDPRESS_API_PASS=admin - GDOCS_PRIVATE_KEY='' GDOCS_CLIENT_EMAIL='' GDOCS_CLIENT_ID='' @@ -53,4 +41,4 @@ ALGOLIA_INDEX_PREFIX='' # optional ALGOLIA_SECRET_KEY='' # optional ALGOLIA_INDEXING=false # optional -DATA_API_URL='' # optional \ No newline at end of file +DATA_API_URL='' # optional diff --git a/.eslintignore b/.eslintignore index 4667d8bf13..de55771e24 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,12 +7,6 @@ jest.config.js knexfile.ts ormconfig.js postcss.config.js -wordpress/web/wp/wp-includes/** -wordpress/web/wp/wp-admin/** -wordpress/web/app/plugins/** -wordpress/web/wp/wp-content/** -!wordpress/web/app/plugins/owid/**/*.js -wordpress/vendor/** packages/@ourworldindata/*/dist/ dist/ .vscode/ diff --git a/.prettierignore b/.prettierignore index e37f3f047b..ba0bf298fc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,11 +6,6 @@ itsJustJavascript package.json /.storybook/build coverage -/wordpress/vendor -/wordpress/web/wp -/wordpress/web/app/plugins/* -!/wordpress/web/app/plugins/owid -/wordpress/web/app/uploads packages/@ourworldindata/*/dist/ dist/ grapherData/ diff --git a/.rsync-ignore b/.rsync-ignore index b337496395..939cf515d8 100644 --- a/.rsync-ignore +++ b/.rsync-ignore @@ -12,7 +12,6 @@ tmp *.test.tsx .queue .pending -/wordpress .env clientSettings.json serverSettings.json diff --git a/.vscode/launch.json b/.vscode/launch.json index 0d98f6f557..183e3b26d8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -111,22 +111,5 @@ "request": "attach", "restart": true }, - { - "name": "Listen for XDebug", - "type": "php", - "request": "launch", - "port": 9003, - "pathMappings": { - "/app/": "${workspaceFolder}/wordpress" - } - }, - { - "name": "Launch currently open script", - "type": "php", - "request": "launch", - "program": "${file}", - "cwd": "${fileDirname}", - "port": 9000 - } ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index fd9ce82507..06b9aa1aaa 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -22,7 +22,9 @@ "label": "startTscServer", "type": "shell", "command": "yarn startTscServer", - "problemMatcher": ["$tsc-watch"], + "problemMatcher": [ + "$tsc-watch" + ], "isBackground": true, "presentation": { "group": "watch" @@ -39,7 +41,11 @@ }, { "label": "start (remote)", - "dependsOn": ["buildLerna", "startTscServer", "startSiteFront"], + "dependsOn": [ + "buildLerna", + "startTscServer", + "startSiteFront" + ], "dependsOrder": "sequence", "problemMatcher": [] }, @@ -54,32 +60,6 @@ "dependsOrder": "sequence", "problemMatcher": [] }, - { - "label": "download wordpress database", - "type": "shell", - "command": "./devTools/docker/download-wordpress-mysql.sh" - }, - { - "label": "download wordpress uploads", - "type": "shell", - "command": "./devTools/docker/download-wordpress-uploads.sh" - }, - { - // This tasks refreshes the wordpress DB as well as wordpress uploads. - // Common scenarios: - // option 1 (default): download new db dump and refresh local db. Download uploads. - // option 2: partial fast refresh (update DB only) - // - comment out "download wordpress uploads" below - "label": "refresh wordpress", - "type": "shell", - "command": "docker compose -f docker-compose.full.yml run --rm db-load-data /app/refresh-wordpress-data.sh", - "dependsOrder": "parallel", - "dependsOn": [ - // "download wordpress database" - // "download wordpress uploads" - ], - "problemMatcher": [] - }, { "label": "download grapher metadata", "type": "shell", diff --git a/Makefile b/Makefile index 4816db61c9..521b9fbae5 100644 --- a/Makefile +++ b/Makefile @@ -28,16 +28,15 @@ help: @echo ' make down stop any services still running' @echo ' make refresh (while up) download a new grapher snapshot and update MySQL' @echo ' make refresh.pageviews (while up) download and load pageviews from the private datasette instance' + @echo ' make refresh.full (while up) run refresh and refresh.pageviews and sync images from R2' @echo ' make migrate (while up) run any outstanding db migrations' @echo ' make test run full suite (except db tests) of CI checks including unit tests' @echo ' make dbtest run db test suite that needs a running mysql db' @echo ' make svgtest compare current rendering against reference SVGs' @echo - @echo ' GRAPHER + WORDPRESS (staff-only)' + @echo ' GRAPHER + CLOUDFLARE (staff-only)' @echo ' make up.full start dev environment via docker-compose and tmux' @echo ' make down.full stop any services still running' - @echo ' make refresh.wp download a new wordpress snapshot and update MySQL' - @echo ' make refresh.full do a full MySQL update of both wordpress and grapher' @echo ' make sync-images sync all images from the remote master' @echo ' make update.chart-entities update the charts_x_entities join table' @echo ' make reindex reindex (or initialise) search in Algolia' @@ -103,7 +102,7 @@ up.devcontainer: create-if-missing.env.devcontainer tmp-downloads/owid_metadata. up.full: export DEBUG = 'knex:query' -up.full: require create-if-missing.env.full ../owid-content wordpress/.env tmp-downloads/owid_metadata.sql.gz tmp-downloads/live_wordpress.sql.gz wordpress/web/app/uploads/2022 +up.full: require create-if-missing.env.full ../owid-content tmp-downloads/owid_metadata.sql.gz @make validate.env.full @make check-port-3306 @@ -111,11 +110,10 @@ up.full: require create-if-missing.env.full ../owid-content wordpress/.env tmp-d yarn install yarn lerna run build yarn run tsc -b - yarn buildWordpressPlugin @echo '==> Starting dev environment' tmux new-session -s grapher \ - -n docker 'docker compose -f docker-compose.full.yml up' \; \ + -n docker 'docker compose -f docker-compose.grapher.yml up' \; \ set remain-on-exit on \; \ set-option -g default-shell $(SCRIPT_SHELL) \; \ new-window -n admin \ @@ -138,8 +136,6 @@ migrate: @echo '==> Running DB migrations' rm -rf itsJustJavascript && yarn && yarn buildLerna && yarn buildTsc && yarn runDbMigrations -refresh.full: refresh refresh.wp sync-images - refresh: @echo '==> Downloading chart data' ./devTools/docker/download-grapher-metadata-mysql.sh @@ -154,22 +150,13 @@ refresh.pageviews: @echo '==> Refreshing pageviews' yarn && yarn buildLerna && yarn buildTsc && yarn refreshPageviews -refresh.wp: - @echo '==> Downloading wordpress data' - ./devTools/docker/download-wordpress-mysql.sh - - @echo '==> Updating wordpress data' - @. ./.env && DATA_FOLDER=tmp-downloads ./devTools/docker/refresh-wordpress-data.sh - - @echo '!!! WARNING !!!' - @echo 'If you run this for staging WP, you have to set !Account password! for' - @echo 'tech@ourworldindata.org user to the value from `.env:WORDPRESS_API_PASS`' - @echo 'at https://staging.owid.cloud/wp/wp-admin/user-edit.php?user_id=35' - sync-images: sync-images.preflight-check @echo '==> Syncing images to R2' @. ./.env && ./devTools/docker/sync-s3-images.sh +refresh.full: refresh refresh.pageviews sync-images + @echo '==> Full refresh completed' + sync-images.preflight-check: @echo '==> Checking for rclone' @which rclone >/dev/null 2>&1 || (echo "ERROR: please install rclone -- e.g. brew install rclone"; exit 1) @@ -239,18 +226,6 @@ tmp-downloads/owid_metadata.sql.gz: @echo '==> Downloading metadata' ./devTools/docker/download-grapher-metadata-mysql.sh -tmp-downloads/live_wordpress.sql.gz: - @echo '==> Downloading wordpress data' - ./devTools/docker/download-wordpress-mysql.sh - -wordpress/.env: - @echo 'Copying wordpress/.env.example --> wordpress/.env' - @cp -f wordpress/.env.example wordpress/.env - -wordpress/web/app/uploads/2022: - @echo '==> Downloading wordpress uploads' - ./devTools/docker/download-wordpress-uploads.sh - deploy: @echo '==> Starting from a clean slate...' rm -rf itsJustJavascript diff --git a/README.md b/README.md index c60f108b0a..21fa8b604c 100644 --- a/README.md +++ b/README.md @@ -46,29 +46,19 @@ Each explorer can be configured via a [panel](explorerAdminServer/) in the admin - A [server-side](adminSiteServer/) project that manages the MySQL database used by graphers. -### [WordPress](wordpress/) - -The CMS we use to manage articles published on Our World in Data. It's a relatively stock setup, with a custom plugin to provide additional blocks for the Gutenberg editor. - -Our Wordpress content and configuration is stored in a MySQL database, which currently isn't shared publicly. - -We are currently in the process of migrating off of WordPress to a publishing flow based on [ArchieML](https://archieml.org) with Google Docs. See the [Site README](site/README.md) for more information. - ### [Baker](baker/) -A [PM2](https://github.com/Unitech/pm2) project that builds a static copy of the Our World in Data website by merging the content authored in Wordpress with the grapher charts created in Grapher Admin. +A [PM2](https://github.com/Unitech/pm2) project that builds a static copy of the Our World in Data website by merging the content authored in Gdocs with the grapher charts created in Grapher Admin. ### [Site](site/) The React code for rendering our content in pages, used by the Grapher Admin and Baker. -As of March 2023, code exists for rendering both WordPress posts and Google Docs as we work on the transition away from WordPress. - ## Tooling Much of our code is based around [reactive programming](https://en.wikipedia.org/wiki/Reactive_programming) using [React](https://reactjs.org/) and [Mobx](http://github.com/mobxjs/mobx). -All non-WordPress code is written in [TypeScript](https://www.typescriptlang.org/). +All code is written in [TypeScript](https://www.typescriptlang.org/). If you want to enable pre-commit hooks, run `yarn husky`. diff --git a/adminSiteClient/AdminLayout.tsx b/adminSiteClient/AdminLayout.tsx index bc083bd906..0d8515742d 100644 --- a/adminSiteClient/AdminLayout.tsx +++ b/adminSiteClient/AdminLayout.tsx @@ -107,15 +107,6 @@ export class AdminLayout extends React.Component<{ FAQ -
  • - - Wordpress - -