From f89cf5f7744212d340e083950d4192d4226986e9 Mon Sep 17 00:00:00 2001 From: Dylan Schwindt Date: Sun, 17 Oct 2021 20:26:05 -0600 Subject: [PATCH 1/3] added instructions for wsl2 installation --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 93bc95f3..8ce85528 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,17 @@ If you wish to run tests locally, you will need to ensure that `redis-server` is Once Redis is installed, run our entire test suite with `yarn test`. +### Windows 10 Installation on Windows Subsystem for Linux 2 + +1. First [Install WSL2](https://docs.microsoft.com/en-us/windows/wsl/install) choosing Ubuntu or distribution of choice. +2. [Install NVM](https://simplernerd.com/install-node-npm-wsl2/) to allow for different versions of Node. This will also install NPM. +3. Install version 14.3.0 by running `nvm install 14.3.0`. +4. If you install multiple versions run `nvm use 14.3.0` to switch to the version used by Upswyng. +5. Install yarn globally using npm with `sudo npm install -g yarn`. +6. [Install Docker Desktop](https://docs.docker.com/desktop/windows/install/) for Windows with WSL2 support. Note that it's important to do this after installing WSL2. +7. Fork or clone the repository into a folder native to Linux and not the Windows system. This avoids problems with line ending differences between Windows and Linux. It is also much faster to access the Linux filesystem directly rather than the Windows filesystem through Linux. +8. Run `yarn start:local` as noted above. + ### Troubleshooting #### The engine "node" is incompatible with this module. From 330aa17de5e487d9a199e1acf2faa05c58051e89 Mon Sep 17 00:00:00 2001 From: Dylan Schwindt Date: Tue, 2 Nov 2021 11:45:44 -0600 Subject: [PATCH 2/3] updated wsl2 instructions to incorporate comments --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f95e448a..abe620ee 100644 --- a/README.md +++ b/README.md @@ -75,12 +75,10 @@ Once Redis is installed, run our entire test suite with `yarn test`. 1. First [Install WSL2](https://docs.microsoft.com/en-us/windows/wsl/install) choosing Ubuntu or distribution of choice. 2. [Install NVM](https://simplernerd.com/install-node-npm-wsl2/) to allow for different versions of Node. This will also install NPM. -3. Install version 14.3.0 by running `nvm install 14.3.0`. -4. If you install multiple versions run `nvm use 14.3.0` to switch to the version used by Upswyng. -5. Install yarn globally using npm with `sudo npm install -g yarn`. -6. [Install Docker Desktop](https://docs.docker.com/desktop/windows/install/) for Windows with WSL2 support. Note that it's important to do this after installing WSL2. -7. Fork or clone the repository into a folder native to Linux and not the Windows system. This avoids problems with line ending differences between Windows and Linux. It is also much faster to access the Linux filesystem directly rather than the Windows filesystem through Linux. -8. Run `yarn start:local` as noted above. +3. [Install yarn globally](https://classic.yarnpkg.com/en/docs/install) +4. [Install Docker Desktop](https://docs.docker.com/desktop/windows/install/) for Windows with WSL2 support. Note that it's important to do this after installing WSL2. +5. Fork or clone the repository into a folder native to Linux and not the Windows system. This avoids problems with line ending differences between Windows and Linux. It is also much faster to access the Linux filesystem directly rather than the Windows filesystem through Linux. +6. Run `yarn start:local` as noted above. ### Troubleshooting From 2bf51fe113e29ef0ded2d2e8f296a14f4064053a Mon Sep 17 00:00:00 2001 From: dschwindt Date: Mon, 22 Nov 2021 09:18:08 -0700 Subject: [PATCH 3/3] add dynamic page titles including translations --- packages/common/src/i18n/en.ts | 9 +++++++ packages/common/src/i18n/es.ts | 9 +++++++ packages/web/package.json | 2 ++ packages/web/public/index.html | 5 ---- packages/web/src/components/About.tsx | 4 +++ .../web/src/components/CategoryResults.tsx | 4 +++ .../web/src/components/FavoriteResources.tsx | 4 +++ packages/web/src/components/Home.tsx | 7 ++++- packages/web/src/components/PrivacyPolicy.tsx | 4 +++ packages/web/src/components/Resource.tsx | 4 +++ packages/web/src/components/TermsOfUse.tsx | 4 +++ yarn.lock | 27 +++++++++++++++++++ 12 files changed, 77 insertions(+), 6 deletions(-) diff --git a/packages/common/src/i18n/en.ts b/packages/common/src/i18n/en.ts index 1b471150..6a3b153e 100644 --- a/packages/common/src/i18n/en.ts +++ b/packages/common/src/i18n/en.ts @@ -5,6 +5,7 @@ import { TermsOfUseContent } from "@upswyng/common"; export default { about: { content: AboutContent.en, + title: "About - Upswyng", }, alerts: { closeAlerts: "Close Alerts", @@ -38,6 +39,7 @@ export default { localOnly: "Favorites are only saved on this device. They will not be saved if you are using a public computer or when you have a private session enabled in your browser (incognito mode).", noFavorites: "You haven't added any favorites yet!", + title: "Favorites - Upswyng", }, footer: { deploysByNetlify: "deploys by Netlify", @@ -140,6 +142,11 @@ export default { "If you, your children or someone else you know is seeking support for abuse, violence or other forms of oppression and discrimination, SPAN is here to help. From abusive relationships, domestic violence, interpersonal violence and elder abuse to oppression and discrimination based on sexual orientation, gender identity, ethnicity, race, religion, age, ability or income level, SPAN offers the support and resources needed to overcome these challenging circumstances.", }, }, + home: { + title: "Upswyng", + description: + "UpSwyng is a mobile-ready, digital directory of resources to assist the unhoused and at-risk communities.", + }, map: { directions: "Directions", directionsByBus: "Directions by bus", @@ -158,6 +165,7 @@ export default { }, privacyPolicy: { content: PrivacyPolicyContent.en, + title: "Privacy Policy - Upswyng", }, reportIssue: { title: "Report an Issue", @@ -237,6 +245,7 @@ export default { }, termsOfUse: { content: TermsOfUseContent.en, + title: "Terms of Use - Upswyng", }, mainMenu: { resourcesWithinReach: "Resources within reach", diff --git a/packages/common/src/i18n/es.ts b/packages/common/src/i18n/es.ts index 949fd9b5..b33cc83e 100644 --- a/packages/common/src/i18n/es.ts +++ b/packages/common/src/i18n/es.ts @@ -5,6 +5,7 @@ import { TermsOfUseContent } from "@upswyng/common"; export default { about: { content: AboutContent.es, + title: "Acerca - UpSwyng", }, alerts: { closeAlerts: "Cerrar Alertas", @@ -38,6 +39,7 @@ export default { localOnly: "Los favoritos solo se guardan en este dispositivo. No se guardarán si está utilizando una computadora pública o cuando tiene una sesión privada habilitada en su navegador (modo incógnito).", noFavorites: "¡No has añadido ningún favorito todavía!", + title: "Favoritos - UpSwyng", }, footer: { deploysByNetlify: "despliegues por Netlify", @@ -141,6 +143,11 @@ export default { "Si usted, sus hijos o alguien más que conozca está buscando apoyo para el abuso, la violencia u otras formas de opresión y discriminación, SPAN está aquí para ayudarlo. Desde las relaciones abusivas, la violencia doméstica, la violencia interpersonal y el abuso de ancianos hasta la opresión y la discriminación basadas en la orientación sexual, la identidad de género, el origen étnico, la raza, la religión, la edad, la capacidad o el nivel de ingresos, SPAN ofrece el apoyo y los recursos necesarios para superar estas circunstancias difíciles.", }, }, + home: { + title: "Upswyng", + description: + "UpSwyng es un directorio digital para dispositivos móviles, que continue recursos para ayudar a personas que están a punto de perder su hogar o que ya se encuentran sin hogar.", + }, map: { directions: "Direcciones", directionsByBus: "Direcciones via bus", @@ -160,6 +167,7 @@ export default { }, privacyPolicy: { content: PrivacyPolicyContent.es, + title: "Política de Privacidad - UpSwyng", }, reportIssue: { title: "Reportar un Problema", @@ -240,6 +248,7 @@ export default { }, termsOfUse: { content: TermsOfUseContent.es, + title: "Condiciones De Uso - UpSwyng", }, mainMenu: { resourcesWithinReach: "Recursos al Alcance", diff --git a/packages/web/package.json b/packages/web/package.json index 92fc60ea..42122bca 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -17,6 +17,7 @@ "@types/react": "^16.8.10", "@types/react-dom": "^16.8.3", "@types/react-gtm-module": "^2.0.0", + "@types/react-helmet": "^6.1.4", "@types/react-router-dom": "^5.1.0", "@upswyng/common": "0.1.0", "algoliasearch": "^3.33.0", @@ -31,6 +32,7 @@ "react": "16.9.0", "react-dom": "16.8.6", "react-gtm-module": "^2.0.8", + "react-helmet": "^6.1.0", "react-i18next": "^11.7.3", "react-markdown": "^4.3.1", "react-query": "^1.5.1", diff --git a/packages/web/public/index.html b/packages/web/public/index.html index c62c512f..23dbe497 100755 --- a/packages/web/public/index.html +++ b/packages/web/public/index.html @@ -26,11 +26,6 @@ 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`. --> - UpSwyng -