From 906a8f81788acc43cbc63dfee9f16781a9947b89 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:39:03 -0300 Subject: [PATCH 01/81] =?UTF-8?q?Adiciona=20a=20depend=C3=AAncia=20do=20@a?= =?UTF-8?q?ngular/localize=20para=20habilitar=20a=20tradu=C3=A7=C3=A3o=20d?= =?UTF-8?q?o=20site?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the dependency of @angular/localize in order to allow translating the website --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0f135553..28e14829 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@angular/core": "~11.2.11", "@angular/flex-layout": "12.0.0-beta.34", "@angular/forms": "~11.2.11", + "@angular/localize": "11.2.11", "@angular/material": "^11.2.11", "@angular/material-moment-adapter": "^12.0.2", "@angular/platform-browser": "~11.2.11", From 4aa7512e05419ac1edc566f8be741fafe4e24f69 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:39:23 -0300 Subject: [PATCH 02/81] =?UTF-8?q?Adiciona=20a=20depend=C3=AAncia=20do=20@a?= =?UTF-8?q?ngular/localize=20para=20habilitar=20a=20tradu=C3=A7=C3=A3o=20d?= =?UTF-8?q?o=20site?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the dependency of @angular/localize in order to allow translating the website --- yarn.lock | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e35d4ef8..bbfdaeea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -258,6 +258,15 @@ dependencies: tslib "^2.0.0" +"@angular/localize@11.2.11": + version "11.2.11" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.2.11.tgz#9f279a6efd89084b3d9d5669aaac8c80512d16bf" + integrity sha512-IH9K2gZeUi+ZdYLRcZGIUh2LITEaCuw87pU1gDZyfQDv13dx2CwfVG9GSqoXSkO1XaxObh1jzbwxST0mkSLxMA== + dependencies: + "@babel/core" "7.8.3" + glob "7.1.2" + yargs "^16.2.0" + "@angular/material-moment-adapter@^12.0.2": version "12.2.13" resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-12.2.13.tgz#8dac315715cf4bf48fc02fda79ac535645553c3e" @@ -300,6 +309,14 @@ dependencies: "@babel/highlight" "^7.18.6" +"@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.8.3": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3" + integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA== + dependencies: + "@babel/highlight" "^7.22.10" + chalk "^2.4.2" + "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" @@ -326,6 +343,27 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/core@7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941" + integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.8.3" + "@babel/helpers" "^7.8.3" + "@babel/parser" "^7.8.3" + "@babel/template" "^7.8.3" + "@babel/traverse" "^7.8.3" + "@babel/types" "^7.8.3" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.0" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/generator@7.12.11", "@babel/generator@^7.12.10": version "7.12.11" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz" @@ -345,6 +383,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.22.10", "@babel/generator@^7.8.3": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.10.tgz#c92254361f398e160645ac58831069707382b722" + integrity sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A== + dependencies: + "@babel/types" "^7.22.10" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -398,6 +446,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== +"@babel/helper-environment-visitor@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" + integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== + "@babel/helper-explode-assignable-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" @@ -413,6 +466,14 @@ "@babel/template" "^7.20.7" "@babel/types" "^7.21.0" +"@babel/helper-function-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" + integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== + dependencies: + "@babel/template" "^7.22.5" + "@babel/types" "^7.22.5" + "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" @@ -420,6 +481,13 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" @@ -503,16 +571,33 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-string-parser@^7.19.4": version "7.19.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" + integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== + "@babel/helper-validator-option@^7.12.11", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" @@ -537,6 +622,15 @@ "@babel/traverse" "^7.21.0" "@babel/types" "^7.21.0" +"@babel/helpers@^7.8.3": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.10.tgz#ae6005c539dfbcb5cd71fb51bfc8a52ba63bc37a" + integrity sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw== + dependencies: + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.10" + "@babel/types" "^7.22.10" + "@babel/highlight@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" @@ -546,11 +640,25 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.22.10": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7" + integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ== + dependencies: + "@babel/helper-validator-identifier" "^7.22.5" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== +"@babel/parser@^7.22.10", "@babel/parser@^7.22.5", "@babel/parser@^7.8.3": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55" + integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ== + "@babel/plugin-proposal-async-generator-functions@^7.12.1": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" @@ -1118,6 +1226,15 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" +"@babel/template@^7.22.5", "@babel/template@^7.8.3": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" + integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/types" "^7.22.5" + "@babel/traverse@^7.12.10", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" @@ -1134,6 +1251,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.22.10", "@babel/traverse@^7.8.3": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.10.tgz#20252acb240e746d27c2e82b4484f199cf8141aa" + integrity sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig== + dependencies: + "@babel/code-frame" "^7.22.10" + "@babel/generator" "^7.22.10" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.22.10" + "@babel/types" "^7.22.10" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.4.4", "@babel/types@^7.8.6": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" @@ -1143,6 +1276,15 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.22.10", "@babel/types@^7.22.5", "@babel/types@^7.8.3": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03" + integrity sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" + to-fast-properties "^2.0.0" + "@datorama/akita@^7.1.1": version "7.1.1" resolved "https://registry.npmjs.org/@datorama/akita/-/akita-7.1.1.tgz" @@ -2502,7 +2644,7 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0: +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -4181,6 +4323,18 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" +glob@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@7.1.6: version "7.1.6" resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" @@ -5151,7 +5305,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.0, json5@^2.1.2: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -5398,7 +5552,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19: +lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.19: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== From f9800c52a622606776632ffa28b7273cea25d54e Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:43:15 -0300 Subject: [PATCH 03/81] =?UTF-8?q?Cria=20um=20comando=20para=20extrair=20os?= =?UTF-8?q?=20textos=20marcado=20para=20tradu=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a command to extract the string to be translated --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 28e14829..7f15b7d5 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "heroku-postbuild": "ng build --prod", "test": "ng test", "lint": "ng lint", - "e2e": "ng e2e" + "e2e": "ng e2e", + "i18n:extract": "ng extract-i18n --output-path src/locales" }, "private": true, "engines": { From dfb7af1f81c55d802c2afb1d5a124a9569f98ecf Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:44:26 -0300 Subject: [PATCH 04/81] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20autom=C3=A1tica?= =?UTF-8?q?=20do=20arquivo=20Polyfills?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automatic update of Polyfills file --- src/polyfills.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/polyfills.ts b/src/polyfills.ts index d5f67bd9..5366a935 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -1,3 +1,7 @@ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; /** * This file includes polyfills needed by Angular and is loaded before the app. * You can add your own extra polyfills to this file. From f16a7be9f4d934028ad8a7d26dda742d50476838 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:50:04 -0300 Subject: [PATCH 05/81] =?UTF-8?q?Define=20o=20idioma=20principal=20como=20?= =?UTF-8?q?Portugu=C3=AAs=20e=20Ingl=C3=AAs=20(EUA)=20como=20alternativo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set Portuguese as main language and English (US) as an alternative --- angular.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/angular.json b/angular.json index f6cd9475..da54ae77 100644 --- a/angular.json +++ b/angular.json @@ -5,6 +5,12 @@ "projects": { "querido-diario": { "projectType": "application", + "i18n": { + "sourceLocale": "pt", + "locales": { + "en-US": "src/locales/messages.en-US.xlf" + } + }, "schematics": { "@schematics/angular:component": { "style": "sass" From 19af1c9da774335f8cf96d3b17c40858df45d4ad Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:51:37 -0300 Subject: [PATCH 06/81] =?UTF-8?q?Habilita=20a=20localiza=C3=A7=C3=A3o=20na?= =?UTF-8?q?=20build=20e=20define=20o=20n=C3=ADvel=20de=20valida=C3=A7?= =?UTF-8?q?=C3=A3o=20como=20erro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable the localization in the build and set its validation level to error --- angular.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/angular.json b/angular.json index da54ae77..b31d3902 100644 --- a/angular.json +++ b/angular.json @@ -31,6 +31,8 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", + "localize": true, + "i18nMissingTranslation": "error", "aot": true, "assets": [ "src/favicon.ico", From 7c7acadced15fd27ed6cfcb647a1530acf7123e7 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:53:07 -0300 Subject: [PATCH 07/81] =?UTF-8?q?Cria=20uma=20configura=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20build=20para=20o=20idioma=20Ingl=C3=AAs=20(EUA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a build configuration for English (US) language --- angular.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/angular.json b/angular.json index b31d3902..b7877729 100644 --- a/angular.json +++ b/angular.json @@ -72,6 +72,9 @@ "maximumError": "5mb" } ] + }, + "en-US": { + "localize": ["en-US"] } } }, From c493dac217920ef1a155ccd66e4cc7f7eeae9703 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:53:38 -0300 Subject: [PATCH 08/81] =?UTF-8?q?Cria=20uma=20configura=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20servidor=20para=20o=20idioma=20Ingl=C3=AAs=20(EUA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a serve configuration for English (US) language --- angular.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/angular.json b/angular.json index b7877729..8c6bb900 100644 --- a/angular.json +++ b/angular.json @@ -86,6 +86,9 @@ "configurations": { "production": { "browserTarget": "querido-diario:build:production" + }, + "en-US": { + "browserTarget": "querido-diario:build:en-US" } } }, From b37f01389b837a96d5b448fa36c0548854dbac98 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:56:17 -0300 Subject: [PATCH 09/81] =?UTF-8?q?Versiona=20arquivo=20de=20tradu=C3=A7?= =?UTF-8?q?=C3=A3o=20para=20o=20idioma=20principal=20(Portugu=C3=AAs)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versionate the translation file for the main language (Portuguese) --- src/locales/messages.xlf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/locales/messages.xlf diff --git a/src/locales/messages.xlf b/src/locales/messages.xlf new file mode 100644 index 00000000..6519b268 --- /dev/null +++ b/src/locales/messages.xlf @@ -0,0 +1,15 @@ + + + + + + Pesquisar + + src/app/modules/components/search-form/search-form.component.html + 57 + + Button to submit a search in official gazettes + + + + From 8dad2cecc506ca6354a909549a69b31b901d1572 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sat, 12 Aug 2023 13:56:55 -0300 Subject: [PATCH 10/81] =?UTF-8?q?Versiona=20arquivo=20de=20tradu=C3=A7?= =?UTF-8?q?=C3=A3o=20para=20o=20Ingl=C3=AAs=20(EUA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versionate the translation file for the English (US) --- src/locales/messages.en-US.xlf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/locales/messages.en-US.xlf diff --git a/src/locales/messages.en-US.xlf b/src/locales/messages.en-US.xlf new file mode 100644 index 00000000..9981c64e --- /dev/null +++ b/src/locales/messages.en-US.xlf @@ -0,0 +1,16 @@ + + + + + + Pesquisar + Search + + src/app/modules/components/search-form/search-form.component.html + 57 + + Button to submit a search in official gazettes + + + + From 356f68da65922fc1e9e56047d166362c51978ebb Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 15 Aug 2023 23:39:51 -0300 Subject: [PATCH 11/81] =?UTF-8?q?Mapeia=20um=20texto=20de=20teste=20para?= =?UTF-8?q?=20tradu=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Map a test string to translate --- .../modules/components/search-form/search-form.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/components/search-form/search-form.component.html b/src/app/modules/components/search-form/search-form.component.html index e61c54f5..130d788e 100644 --- a/src/app/modules/components/search-form/search-form.component.html +++ b/src/app/modules/components/search-form/search-form.component.html @@ -54,5 +54,5 @@ class="period-input" > - + From c60957a7ad9572e9b546b4f5afbf946951f59969 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 00:12:01 -0300 Subject: [PATCH 12/81] =?UTF-8?q?Cria=20arquivo=20de=20configura=C3=A7?= =?UTF-8?q?=C3=A3o=20do=20Netlify?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create Netlify config file --- netlify.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 netlify.toml diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 00000000..16043eaa --- /dev/null +++ b/netlify.toml @@ -0,0 +1,7 @@ +[build] + publish = "dist/querido-diario" + command = "ng build --prod" +[[redirects]] + from = "/*" + to = "/pt/index.html" + status = 200 From ddca9672091cc1ca8f8f5bb0dcce4055b52a32e8 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 00:31:35 -0300 Subject: [PATCH 13/81] Adiciona regra de redirecionamento para en-US Add redirect rule for en-US --- netlify.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/netlify.toml b/netlify.toml index 16043eaa..2eefa4d8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,7 +1,13 @@ [build] publish = "dist/querido-diario" command = "ng build --prod" + [[redirects]] from = "/*" to = "/pt/index.html" status = 200 + +[[redirects]] + from = "/en-US/*" + to = "/en-US/index.html" + status = 200 From 02a4b369fe345b06aa4d309e2d6d440e956e6f0c Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 00:35:03 -0300 Subject: [PATCH 14/81] Atualiza regra de redirecionamento para pt Update redirect rule for pt --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 2eefa4d8..404b86ae 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ command = "ng build --prod" [[redirects]] - from = "/*" + from = "/pt/*" to = "/pt/index.html" status = 200 From 9416ffd63d632def34464b2f6d6cf02a9f919250 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 00:50:26 -0300 Subject: [PATCH 15/81] Remove a barra inicial da URL Remove initial slash from URL --- src/app/services/blog/blog.service.ts | 2 +- src/app/services/content/content.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/services/blog/blog.service.ts b/src/app/services/blog/blog.service.ts index c75e50bc..facd93dd 100644 --- a/src/app/services/blog/blog.service.ts +++ b/src/app/services/blog/blog.service.ts @@ -10,7 +10,7 @@ export class BlogService { constructor(private http: HttpClient) {} getAll(): Observable { - return this.http.get(`/assets/pages/blog.json`).pipe( + return this.http.get(`assets/pages/blog.json`).pipe( map((data) => { return data; }) diff --git a/src/app/services/content/content.service.ts b/src/app/services/content/content.service.ts index e55d82f3..950452f7 100644 --- a/src/app/services/content/content.service.ts +++ b/src/app/services/content/content.service.ts @@ -12,7 +12,7 @@ export class ContentService { content$: Observable = of(null) find(pageName: string): Observable { - return this.http.get(`/assets/pages/${pageName}.json`).pipe( + return this.http.get(`assets/pages/${pageName}.json`).pipe( map((data) => { return data; }) From b23f3fc469a875d1b9e0b38b1835d89dcadddb8f Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 00:54:21 -0300 Subject: [PATCH 16/81] Remove a barra inicial da URL Remove initial slash from URL --- src/assets/_fonts.sass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/_fonts.sass b/src/assets/_fonts.sass index b498adc9..e84a0f24 100644 --- a/src/assets/_fonts.sass +++ b/src/assets/_fonts.sass @@ -1,18 +1,18 @@ @font-face font-family: Baloo - src: url(/assets/fonts/baloo/Baloo2-Bold.ttf) + src: url(assets/fonts/baloo/Baloo2-Bold.ttf) font-weight: 800 font-style: normal @font-face font-family: Lato - src: url(/assets/fonts/lato/Lato-Regular.ttf) + src: url(assets/fonts/lato/Lato-Regular.ttf) font-weight: 600 font-style: normal @font-face font-family: Lato - src: url(/assets/fonts/lato/Lato-Bold.ttf) + src: url(assets/fonts/lato/Lato-Bold.ttf) font-weight: 900 font-style: normal From 7c750c4b905b795660fd0c9bbe34bd6cbdc38d0c Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 00:57:25 -0300 Subject: [PATCH 17/81] Corrige o caminho dos assets Fix assets path --- src/assets/_fonts.sass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/_fonts.sass b/src/assets/_fonts.sass index e84a0f24..a7209ad0 100644 --- a/src/assets/_fonts.sass +++ b/src/assets/_fonts.sass @@ -1,18 +1,18 @@ @font-face font-family: Baloo - src: url(assets/fonts/baloo/Baloo2-Bold.ttf) + src: url(../assets/fonts/baloo/Baloo2-Bold.ttf) font-weight: 800 font-style: normal @font-face font-family: Lato - src: url(assets/fonts/lato/Lato-Regular.ttf) + src: url(../assets/fonts/lato/Lato-Regular.ttf) font-weight: 600 font-style: normal @font-face font-family: Lato - src: url(assets/fonts/lato/Lato-Bold.ttf) + src: url(../assets/fonts/lato/Lato-Bold.ttf) font-weight: 900 font-style: normal From b57a54d0a8650e24179ef869ec98948131e28808 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Wed, 16 Aug 2023 23:59:13 -0300 Subject: [PATCH 18/81] Corrige o caminho dos assets Fix assets path --- .../modules/components/carousel/carousel.component.sass | 4 ++-- .../cities-search-result.component.html | 6 +++--- .../cities-search-result.component.sass | 2 +- src/app/modules/components/header/header.component.sass | 4 ++-- .../components/search-form/search-form.component.sass | 2 +- src/app/modules/layout/container/container.component.sass | 8 ++++---- .../alerts/alert-item/alert-item.component.html | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/modules/components/carousel/carousel.component.sass b/src/app/modules/components/carousel/carousel.component.sass index f6e096af..9129e395 100644 --- a/src/app/modules/components/carousel/carousel.component.sass +++ b/src/app/modules/components/carousel/carousel.component.sass @@ -27,8 +27,8 @@ .carousel-arrow-prev left: 0 !important - background-image: url('/assets/icons/slide-left.svg') !important + background-image: url('../../../../assets/icons/slide-left.svg') !important .carousel-arrow-next right: 0 !important - background-image: url('/assets/icons/slide-right.svg') !important \ No newline at end of file + background-image: url('../../../../assets/icons/slide-right.svg') !important diff --git a/src/app/modules/components/cities-search-result/cities-search-result.component.html b/src/app/modules/components/cities-search-result/cities-search-result.component.html index 4e6a9a4e..7a0c882a 100644 --- a/src/app/modules/components/cities-search-result/cities-search-result.component.html +++ b/src/app/modules/components/cities-search-result/cities-search-result.component.html @@ -2,7 +2,7 @@
-
+
Nível 1 de acesso
Possuímos a fonte de publicação do diário oficial deste município.
@@ -14,7 +14,7 @@
-
+
Nível 2 de acesso
Temos o script para coletar os arquivos e armazená-los em nossa base.
@@ -29,7 +29,7 @@
-
+
Nível 3 de acesso
o conteúdo dos diários oficiais deste município está disponível na plataforma Querido Diário.
diff --git a/src/app/modules/components/cities-search-result/cities-search-result.component.sass b/src/app/modules/components/cities-search-result/cities-search-result.component.sass index ee09066f..401be3e1 100644 --- a/src/app/modules/components/cities-search-result/cities-search-result.component.sass +++ b/src/app/modules/components/cities-search-result/cities-search-result.component.sass @@ -89,4 +89,4 @@ top: calc(50% - 5px) background-position: center background-repeat: no-repeat - background-image: url('/assets/icons/right-arrow-white.svg') + background-image: url('../../../../assets/icons/right-arrow-white.svg') diff --git a/src/app/modules/components/header/header.component.sass b/src/app/modules/components/header/header.component.sass index b26af369..f3cfc5ce 100644 --- a/src/app/modules/components/header/header.component.sass +++ b/src/app/modules/components/header/header.component.sass @@ -97,7 +97,7 @@ header &.bg-orange, &.bg-purple, &.bg-dark-purple, &.login &::after - background-image: url('/assets/icons/right-arrow-white.svg') + background-image: url('../../../../assets/icons/right-arrow-white.svg') &.bg-orange background-color: rgba(255, 133, 0, 1) @@ -115,7 +115,7 @@ header top: calc(50% - 5px) width: rem(5) height: rem(10) - background-image: url('/assets/icons/right-arrow-purple-dark.svg') + background-image: url('../../../../assets/icons/right-arrow-purple-dark.svg') background-position: center .user-name, .logged-link, .login diff --git a/src/app/modules/components/search-form/search-form.component.sass b/src/app/modules/components/search-form/search-form.component.sass index 8e04bf60..95f3592d 100644 --- a/src/app/modules/components/search-form/search-form.component.sass +++ b/src/app/modules/components/search-form/search-form.component.sass @@ -72,7 +72,7 @@ &::after content: '' - background-image: url('/assets/icons/pin-gray.svg') + background-image: url('../../../../assets/icons/pin-gray.svg') width: rem(20) height: rem(25) position: absolute diff --git a/src/app/modules/layout/container/container.component.sass b/src/app/modules/layout/container/container.component.sass index dafadcbc..ceae40b8 100644 --- a/src/app/modules/layout/container/container.component.sass +++ b/src/app/modules/layout/container/container.component.sass @@ -15,26 +15,26 @@ padding: 0 0 rem(84) 0 .bg-gray-square - background-image: url('/assets/images/gray-squares@2x.jpg') + background-image: url('../../../../assets/images/gray-squares@2x.jpg') background-repeat-y: no-repeat background-position: bottom background-size: 100% 100% .bg-purple-square - background-image: url('/assets/images/purple-squares@2x.jpg') + background-image: url('../../../../assets/images/purple-squares@2x.jpg') background-repeat-y: no-repeat background-position: bottom background-size: 100% 85% color: #FFF .bg-dark-lines - background-image: url('/assets/images/bg-dark-lines.png') + background-image: url('../../../../assets/images/bg-dark-lines.png') background-repeat-y: no-repeat background-position: bottom background-size: 115% 6.5% .bg-yellow-lines - background-image: url('/assets/images/bg-yellow-lines.png') + background-image: url('../../../../assets/images/bg-yellow-lines.png') background-color: #FFFCBD background-repeat-y: no-repeat background-position: bottom diff --git a/src/app/modules/pages/area-education/alerts/alert-item/alert-item.component.html b/src/app/modules/pages/area-education/alerts/alert-item/alert-item.component.html index 2f301ad8..b9739584 100644 --- a/src/app/modules/pages/area-education/alerts/alert-item/alert-item.component.html +++ b/src/app/modules/pages/area-education/alerts/alert-item/alert-item.component.html @@ -5,16 +5,16 @@

{{alert.query_string}}

Filtros:
- icone de localização + icone de localização {{territories}}
- icone de tema + icone de tema {{alert.sub_themes && alert.sub_themes.length ? alert.sub_themes.join(', ') : 'Nenhum subtema selecionado'}}
- icone de ente governamental + icone de ente governamental {{alert.gov_entities && alert.gov_entities.length ? alert.gov_entities.join(', ') : 'Nenhum envolvido selecionado'}}
From 22333685444ab0042eb66378e28635616e28af6b Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Thu, 17 Aug 2023 00:13:02 -0300 Subject: [PATCH 19/81] Corrige o caminho dos assets Fix assets path --- src/app/app.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index bc3fe8a0..e8ac9d97 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -22,7 +22,7 @@ export class AppComponent { Icons.map((icon) => { this.matIconRegistry.addSvgIcon( icon, - this.sanitizer.bypassSecurityTrustResourceUrl(`../assets/icons/${icon}.svg`) + this.sanitizer.bypassSecurityTrustResourceUrl(`assets/icons/${icon}.svg`) ) }) } From 677388ac0d070b5ea97ca676647228c82f175e27 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Thu, 17 Aug 2023 00:19:49 -0300 Subject: [PATCH 20/81] =?UTF-8?q?Redireciona=20os=20acessos=20para=20PT=20?= =?UTF-8?q?por=20padr=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Redirect the accesses to PT as default --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 404b86ae..2eefa4d8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ command = "ng build --prod" [[redirects]] - from = "/pt/*" + from = "/*" to = "/pt/index.html" status = 200 From 6dbef993a3a4e037719179b77de6f0ae68dd11d1 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 11:38:48 -0300 Subject: [PATCH 21/81] Remove temporariamente as URLs criadas para en-US Remove temporarily the URLs created for en-US --- src/app/app-routing.module.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1784d16e..ea7f35d4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -30,13 +30,11 @@ import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/t const routes: Routes = [ { path: '', component: HomeComponent }, { path: 'sobre', component: AboutComponent }, - { path: 'en-US/sobre', component: AboutComponentEnUS }, { path: 'privacidade', component: PrivacyPolicyComponent }, { path: 'informacoes', component: ComplaintComponent }, { path: 'acesso', component: AccessLevelsComponent }, { path: 'apoie', component: SupportComponent }, { path: 'tecnologia', component: TechComponent }, - { path: 'en-US/tecnologia', component: TechComponentEnUS }, { path: 'sugestao', component: SuggestionComponent }, { path: 'glossario', component: GlossaryComponent }, { path: 'pesquisa', component: SearchComponent }, From c6653c41ab5184dd4d34c77684af251ccdb6bc4d Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 11:58:49 -0300 Subject: [PATCH 22/81] Altera a ordem das regras de redirecionamento do Netlify Update the order of Netlify redirect rules --- netlify.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netlify.toml b/netlify.toml index 2eefa4d8..c2483df8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,11 +3,11 @@ command = "ng build --prod" [[redirects]] - from = "/*" - to = "/pt/index.html" + from = "/en-US/*" + to = "/en-US/index.html" status = 200 [[redirects]] - from = "/en-US/*" - to = "/en-US/index.html" + from = "/*" + to = "/pt/index.html" status = 200 From 0f67f92852e4d20f6d05da8b6914b7ddf9f2dc2c Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 12:18:05 -0300 Subject: [PATCH 23/81] Atualiza regra de redirecionamento para en-US Update redirect rule for en-US --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index c2483df8..1206e661 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ command = "ng build --prod" [[redirects]] - from = "/en-US/*" + from = "/en-US" to = "/en-US/index.html" status = 200 From 089f48d0b0bfad2ad9f34afd095ccf57dd0369a7 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 12:26:28 -0300 Subject: [PATCH 24/81] Troca o caminho absoluto por relativo Replace the absolute path with the relative one --- src/app/modules/pages/search/search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/pages/search/search.component.html b/src/app/modules/pages/search/search.component.html index 7589553c..62d833c1 100644 --- a/src/app/modules/pages/search/search.component.html +++ b/src/app/modules/pages/search/search.component.html @@ -66,7 +66,7 @@

Sua pesquisa não encontrou nenhum conteúdo correspondente

{{ gazetteResponse.total_gazettes }}* resultados encontrados

- *A quantidade de resultados atingiu o limite da pesquisa. Tente utilizar termos mais específicos ou os operadores da busca avançada. + *A quantidade de resultados atingiu o limite da pesquisa. Tente utilizar termos mais específicos ou os operadores da busca avançada.
Date: Sun, 8 Oct 2023 12:29:30 -0300 Subject: [PATCH 25/81] Desabilita o redirecionamento de en-US Disable the en-US redirect --- netlify.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netlify.toml b/netlify.toml index 1206e661..a6fcec18 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,10 +2,10 @@ publish = "dist/querido-diario" command = "ng build --prod" -[[redirects]] - from = "/en-US" - to = "/en-US/index.html" - status = 200 +#[[redirects]] +# from = "/en-US" +# to = "/en-US/index.html" +# status = 200 [[redirects]] from = "/*" From 0eddba0e41fce6a7f810c4f1691355ce78e725e9 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 12:37:05 -0300 Subject: [PATCH 26/81] =?UTF-8?q?Define=20o=20idioma=20en-US=20como=20padr?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set en-US language as default --- netlify.toml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/netlify.toml b/netlify.toml index a6fcec18..91bf2a06 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,12 +2,7 @@ publish = "dist/querido-diario" command = "ng build --prod" -#[[redirects]] -# from = "/en-US" -# to = "/en-US/index.html" -# status = 200 - [[redirects]] from = "/*" - to = "/pt/index.html" + to = "/en-US/index.html" status = 200 From 142f718decb3dc1e1399a869c050260afc8a4e74 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 17:51:44 -0300 Subject: [PATCH 27/81] Define regra para redirecionamento para 'pt' quando houver o idioma no browser Set a redirect rule for 'pt' when there is a language from the browser --- netlify.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/netlify.toml b/netlify.toml index 91bf2a06..dedd2a8e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,6 +2,12 @@ publish = "dist/querido-diario" command = "ng build --prod" +[[redirects]] + from = "/*" + to = "/pt/index.html" + status = 200 + conditions = {Language = ["pt"]} + [[redirects]] from = "/*" to = "/en-US/index.html" From 6cb8bcb19c9c92f477650834c1d41192f3d0279b Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 18:21:29 -0300 Subject: [PATCH 28/81] =?UTF-8?q?Coloca=20a=20importa=C3=A7=C3=A3o=20do=20?= =?UTF-8?q?m=C3=B3dulo=20de=20rotas=20por=20=C3=BAltimo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Place the route module import at the end --- src/app/app.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 369796fd..7f0a34f3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -189,7 +189,6 @@ import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/t ], imports: [ BrowserModule, - AppRoutingModule, BrowserAnimationsModule, MatGridListModule, MatMenuModule, @@ -213,6 +212,7 @@ import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/t IvyCarouselModule, NgxPaginationModule, + AppRoutingModule, ], providers: [ { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true }, From 1f8f8035c42dd4c6c37bf827e9980acd846a1cdd Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 18:24:54 -0300 Subject: [PATCH 29/81] =?UTF-8?q?Cria=20uma=20regra=20gen=C3=A9rica=20para?= =?UTF-8?q?=20redirecionar=20para=20a=20p=C3=A1gina=20inicial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a wildcard rule to redirect to the home page --- src/app/app-routing.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ea7f35d4..68f1a3ed 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -54,6 +54,8 @@ const routes: Routes = [ { path: 'educacao/relatorio/:id', component: ReportDetailComponent }, { path: 'educacao/caso/:id', component: ReportDetailComponent }, { path: 'educacao/redefinir-senha', component: PassResetComponent }, + + { path: '**', redirectTo: '' }, ]; @NgModule({ From 7bdf186925a434438bd4948b432a49143d6ebb23 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 8 Oct 2023 18:29:32 -0300 Subject: [PATCH 30/81] Define o idioma 'pt' como default e redireciona para 'en-US' quando o navegador tiver o idioma 'en' Set the default language as 'pt' and redirect to 'en-US' when there is the 'en' language in the browser --- netlify.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netlify.toml b/netlify.toml index dedd2a8e..60c83e16 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,11 +4,11 @@ [[redirects]] from = "/*" - to = "/pt/index.html" + to = "/en-US/index.html" status = 200 - conditions = {Language = ["pt"]} + conditions = {Language = ["en"]} [[redirects]] from = "/*" - to = "/en-US/index.html" + to = "/pt/index.html" status = 200 From f63557dce8eaab602b7782658521e5db66208f83 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 9 Oct 2023 23:18:40 -0300 Subject: [PATCH 31/81] =?UTF-8?q?Exp=C3=B5e=20a=20lista=20de=20idiomas=20e?= =?UTF-8?q?=20a=20localiza=C3=A7=C3=A3o=20atual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Expose the language list and the current locale --- src/app/modules/components/header/header.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/modules/components/header/header.component.ts b/src/app/modules/components/header/header.component.ts index b4a8bd95..2f42f819 100644 --- a/src/app/modules/components/header/header.component.ts +++ b/src/app/modules/components/header/header.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { UserModel } from 'src/app/interfaces/account'; @@ -20,6 +20,10 @@ export class HeaderComponent implements OnInit { userData: UserModel = {}; urlsHide = ['/educacao/cadastrar']; hideMenu = false; + languageList = [ + { code: 'pt', label: 'Português' }, + { code: 'en-US', label: 'English (US)' } + ]; constructor( private userQuery: UserQuery, @@ -27,6 +31,7 @@ export class HeaderComponent implements OnInit { private contentService: ContentService, private userService: UserService, private router: Router, + @Inject(LOCALE_ID) public localeId: string ) {} notificationIcon: IconType = { From c99eb74d1e5659293bcbd4ac708ad79513e0a6c9 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 9 Oct 2023 23:19:12 -0300 Subject: [PATCH 32/81] Cria links para os idiomas mapeados Create links to the mapped languages --- .../components/header/header.component.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 198de936..ef130629 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -3,6 +3,13 @@
From b4d0ee17277fa31b7160142227e6a2aa02653408 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Fri, 27 Oct 2023 21:37:11 -0300 Subject: [PATCH 49/81] =?UTF-8?q?Substitui=20CSS=20puro=20por=20classes=20?= =?UTF-8?q?utilit=C3=A1rias=20do=20TailwindCSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace pure CSS with utility classes from TailwindCSS --- src/app/modules/components/header/header.component.sass | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/modules/components/header/header.component.sass b/src/app/modules/components/header/header.component.sass index 8064d1f9..77f63e1b 100644 --- a/src/app/modules/components/header/header.component.sass +++ b/src/app/modules/components/header/header.component.sass @@ -18,13 +18,7 @@ header display: flex a, .top-header-menu-item - color: #5e3f8e - font-family: Lato - font-size: rem(16) - font-weight: 600 - letter-spacing: 0 - line-height: rem(28) - align-self: center + @apply self-center font-lato text-[#5e3f8e] font-semibold text-base tracking-normal leading-7 button.btn height: rem(42) From 4e328fa2d5af9e8c7a559e801326790b5645b5df Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 29 Oct 2023 22:12:16 -0300 Subject: [PATCH 50/81] Atualiza o link para utilizar o router Update link to use the router --- src/app/modules/components/header/header.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 01b01dfe..f1232ff5 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + From bc9516ad1a522829e97ad74a7946a89de8ed76c1 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 29 Oct 2023 22:13:06 -0300 Subject: [PATCH 51/81] Atualiza o menu mobile Update the mobile menu --- .../components/header/header.component.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index f1232ff5..f5e2e439 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -103,14 +103,15 @@ language Language - - - -
+ + + + + + +
From b92d51f0767259d9d9ed6993fd348560fce8a3f0 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 29 Oct 2023 22:13:41 -0300 Subject: [PATCH 52/81] Atualiza o comando para rodar o projeto Update the command to run the project --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 894eb90f..0b30c38f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -47,7 +47,7 @@ Para mais detalhes ou informações sobre a configuração em outros sistemas op # Como executar 1. Com o terminal aberto no diretório raíz do repositório, o projeto pode ser servido localmente com o comando: ``` console -yarn ng serve +yarn serve ``` 2. Durante a execução, um log aparecerá no terminal. O trecho final, como este a seguir, informa em qual porta a visualização do site está hospedada. Basta copiar o endereço `http` e abrir no navegador. ``` From 850c64c3f4a3ccfddae1a209861e1993ef038609 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Sun, 29 Oct 2023 22:17:45 -0300 Subject: [PATCH 53/81] Substitui o router por href Replace router with href --- src/app/modules/components/header/header.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index f5e2e439..8640b586 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + @@ -107,7 +107,7 @@ - + From 918a9d5c968166fe330262967e97c5806f3ea7b5 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 20:39:40 -0300 Subject: [PATCH 54/81] Adiciona o atributo target Add the target attribute --- src/app/modules/components/header/header.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 8640b586..e365fb8c 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + @@ -107,7 +107,7 @@ - + From 74ad73cbe25355632789bf3436c2e29e23fc6832 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:20:00 -0300 Subject: [PATCH 55/81] =?UTF-8?q?Cria=20p=C3=A1gina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create 404 page --- .../page-not-found.component.html | 2 ++ .../page-not-found.component.sass | 0 .../page-not-found.component.spec.ts | 25 +++++++++++++++++++ .../page-not-found.component.ts | 15 +++++++++++ 4 files changed, 42 insertions(+) create mode 100644 src/app/page-not-found/page-not-found.component.html create mode 100644 src/app/page-not-found/page-not-found.component.sass create mode 100644 src/app/page-not-found/page-not-found.component.spec.ts create mode 100644 src/app/page-not-found/page-not-found.component.ts diff --git a/src/app/page-not-found/page-not-found.component.html b/src/app/page-not-found/page-not-found.component.html new file mode 100644 index 00000000..8033fa1f --- /dev/null +++ b/src/app/page-not-found/page-not-found.component.html @@ -0,0 +1,2 @@ +

Page Not Found

+

We couldn't find that page! Not even with x-ray vision.

\ No newline at end of file diff --git a/src/app/page-not-found/page-not-found.component.sass b/src/app/page-not-found/page-not-found.component.sass new file mode 100644 index 00000000..e69de29b diff --git a/src/app/page-not-found/page-not-found.component.spec.ts b/src/app/page-not-found/page-not-found.component.spec.ts new file mode 100644 index 00000000..aa242a97 --- /dev/null +++ b/src/app/page-not-found/page-not-found.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PageNotFoundComponent } from './page-not-found.component'; + +describe('PageNotFoundComponent', () => { + let component: PageNotFoundComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ PageNotFoundComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PageNotFoundComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/page-not-found/page-not-found.component.ts b/src/app/page-not-found/page-not-found.component.ts new file mode 100644 index 00000000..2d1091ce --- /dev/null +++ b/src/app/page-not-found/page-not-found.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-page-not-found', + templateUrl: './page-not-found.component.html', + styleUrls: ['./page-not-found.component.sass'] +}) +export class PageNotFoundComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} From ea2578ca09796be8f6545695c7385fbdbfc9b94b Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:21:01 -0300 Subject: [PATCH 56/81] =?UTF-8?q?Exp=C3=B5e=20a=20p=C3=A1gina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Expose the 404 page --- src/app/app.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 38ca5e0d..141c78e9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -110,8 +110,7 @@ import { ResetPassModalComponent } from './modules/pages/area-education/header/r import { AboutComponent as AboutComponentEnUS } from './modules/pages/about-en_US/about.component'; import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/tech.component'; import { PrivacyPolicyComponent as PrivacyPolicyComponentEnUS } from './modules/pages/privacy-policy-en_US/privacy-policy.component'; - - +import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; @NgModule({ declarations: [ @@ -190,6 +189,7 @@ import { PrivacyPolicyComponent as PrivacyPolicyComponentEnUS } from './modules/ AboutComponentEnUS, TechComponentEnUS, PrivacyPolicyComponentEnUS, + PageNotFoundComponent, ], imports: [ BrowserModule, From fba02aa6a39504cc81c79dbb1ca4bac61b2167f0 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:21:41 -0300 Subject: [PATCH 57/81] =?UTF-8?q?Redireciona=20URLs=20n=C3=A3o=20existente?= =?UTF-8?q?s=20para=20a=20p=C3=A1gina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Redirect non-existing URLs to the 404 page --- src/app/app-routing.module.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index dd409f02..8124cb7e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,16 +23,12 @@ import { SearchTutorialComponent } from './modules/pages/search-tutorial/search- import { SuggestionComponent } from './modules/pages/suggestion/suggestion.component'; import { SupportComponent } from './modules/pages/support/support.component'; import { TechComponent } from './modules/pages/tech/tech.component'; -import { AboutComponent as AboutComponentEnUS } from './modules/pages/about-en_US/about.component'; -import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/tech.component'; -import { PrivacyPolicyComponent as PrivacyPolicyComponentEnUS } from './modules/pages/privacy-policy-en_US/privacy-policy.component'; - +import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; const routes: Routes = [ { path: '', component: HomeComponent }, { path: 'sobre', component: AboutComponent }, { path: 'privacidade', component: PrivacyPolicyComponent }, - { path: 'en-US/privacidade', component: PrivacyPolicyComponentEnUS }, { path: 'informacoes', component: ComplaintComponent }, { path: 'acesso', component: AccessLevelsComponent }, { path: 'apoie', component: SupportComponent }, @@ -57,7 +53,7 @@ const routes: Routes = [ { path: 'educacao/caso/:id', component: ReportDetailComponent }, { path: 'educacao/redefinir-senha', component: PassResetComponent }, - { path: '**', redirectTo: '' }, + { path: '**', component: PageNotFoundComponent } ]; @NgModule({ From b9de69d7cffc49579556ccb9b7e88cc5bcc5b07c Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:26:19 -0300 Subject: [PATCH 58/81] Substitui o href pelo router Replace href with router --- src/app/modules/components/header/header.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index e365fb8c..490c45b2 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + @@ -107,7 +107,7 @@ - + From c2ee2baea29ed1c80e0e4fd40e971310c35db0bf Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:29:39 -0300 Subject: [PATCH 59/81] =?UTF-8?q?Adiciona=20um=20ponto=20no=20in=C3=ADcio?= =?UTF-8?q?=20do=20caminho?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a dot at the beginning of the path --- src/app/modules/components/header/header.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 490c45b2..417760e0 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + @@ -107,7 +107,7 @@ - + From a21dc56ea1ce3aa5f60e1be6ed35b3bc92dacb1a Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:33:06 -0300 Subject: [PATCH 60/81] Substitui o router por href Replace router with href --- src/app/modules/components/header/header.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 417760e0..1a444e63 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + @@ -107,7 +107,7 @@ - + From 11e1aabd62dff58654879ff63d489a50fb5ca5af Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 21:49:48 -0300 Subject: [PATCH 61/81] =?UTF-8?q?Adiciona=20outro=20ponto=20no=20in=C3=ADc?= =?UTF-8?q?io=20do=20caminho?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add another dot at the beginning of the path --- src/app/modules/components/header/header.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 1a444e63..e36528e0 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + @@ -107,7 +107,7 @@ - + From 34515a6a17c0878db4035e02976636a5580f10df Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 22:21:41 -0300 Subject: [PATCH 62/81] Cria uma string para teste Create a string for testing --- src/app/modules/components/header/header.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/modules/components/header/header.component.ts b/src/app/modules/components/header/header.component.ts index 4e046073..1f023c23 100644 --- a/src/app/modules/components/header/header.component.ts +++ b/src/app/modules/components/header/header.component.ts @@ -24,6 +24,7 @@ export class HeaderComponent implements OnInit { { code: 'pt', label: 'Português (BR)' }, { code: 'en', label: 'English (US)' } ]; + foo = "./en/tecnologia"; constructor( private userQuery: UserQuery, From fa5e7880896d8fee0b34be78864b01c95ee2a39d Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Mon, 30 Oct 2023 22:22:48 -0300 Subject: [PATCH 63/81] Usa a string de teste como URL Use the testing string as URL --- src/app/modules/components/header/header.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index e36528e0..1fd791ca 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,7 +21,7 @@ - + From e179c4941da0a8809cf1a51a6c93b19b6b889489 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 10:45:11 -0300 Subject: [PATCH 64/81] =?UTF-8?q?Cria=20links=20com=20diversas=20poss?= =?UTF-8?q?=C3=ADveis=20solu=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create links with several possible solutions --- .../components/header/header.component.html | 51 ++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 1fd791ca..5a87369e 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -20,13 +20,60 @@ language - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ba849e1f55c192e4d4b16bdfcb89880ab403be76 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 10:49:15 -0300 Subject: [PATCH 65/81] Update header.component.html --- .../components/header/header.component.html | 99 ++++++++++--------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 5a87369e..e1436858 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -20,60 +20,61 @@ language - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + --> From b61a28aa5542a7bcebf78b314c5024da546d9c8a Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:06:23 -0300 Subject: [PATCH 66/81] Update netlify.toml --- netlify.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/netlify.toml b/netlify.toml index 0555d4b7..e61d3c03 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,6 +8,11 @@ status = 200 conditions = {Language = ["en"]} +[[redirects]] + from = "/en/*" + to = "/en/index.html" + status = 200 + [[redirects]] from = "/*" to = "/pt/index.html" From ff7ba10c2a24f1c53805942e2414af2e9338915f Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:12:43 -0300 Subject: [PATCH 67/81] Update header.component.html --- .../components/header/header.component.html | 49 ------------------- 1 file changed, 49 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index e1436858..14c2d864 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -21,60 +21,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - From e7aaf0c4890533bb82d9b9f93c746d7ef5d8fd4f Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:15:17 -0300 Subject: [PATCH 68/81] Update header.component.html --- src/app/modules/components/header/header.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 14c2d864..74203aa2 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -26,6 +26,7 @@ href="../{{language.code}}{{router.url}}" + From 283954445e3d1cea033049c55bddcc41b3082b72 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:26:43 -0300 Subject: [PATCH 69/81] Update header.component.html --- src/app/modules/components/header/header.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 74203aa2..e36528e0 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -23,7 +23,7 @@ From 31bcf95b726274b6947b0805d6f234a177a95f39 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:40:49 -0300 Subject: [PATCH 70/81] =?UTF-8?q?Remove=20c=C3=B3digo=20de=20teste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove code for testing --- src/app/modules/components/header/header.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/modules/components/header/header.component.ts b/src/app/modules/components/header/header.component.ts index 1f023c23..4e046073 100644 --- a/src/app/modules/components/header/header.component.ts +++ b/src/app/modules/components/header/header.component.ts @@ -24,7 +24,6 @@ export class HeaderComponent implements OnInit { { code: 'pt', label: 'Português (BR)' }, { code: 'en', label: 'English (US)' } ]; - foo = "./en/tecnologia"; constructor( private userQuery: UserQuery, From d16736dacf90c35a4cee6e3c8f48e9aa2f699e4c Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:43:45 -0300 Subject: [PATCH 71/81] =?UTF-8?q?Remove=20configura=C3=A7=C3=A3o=20de=20p?= =?UTF-8?q?=C3=A1gina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove 404 page setup --- src/app/app-routing.module.ts | 3 --- src/app/app.module.ts | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8124cb7e..4d541fd2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,7 +23,6 @@ import { SearchTutorialComponent } from './modules/pages/search-tutorial/search- import { SuggestionComponent } from './modules/pages/suggestion/suggestion.component'; import { SupportComponent } from './modules/pages/support/support.component'; import { TechComponent } from './modules/pages/tech/tech.component'; -import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; const routes: Routes = [ { path: '', component: HomeComponent }, @@ -52,8 +51,6 @@ const routes: Routes = [ { path: 'educacao/relatorio/:id', component: ReportDetailComponent }, { path: 'educacao/caso/:id', component: ReportDetailComponent }, { path: 'educacao/redefinir-senha', component: PassResetComponent }, - - { path: '**', component: PageNotFoundComponent } ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 141c78e9..619386ee 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -110,7 +110,6 @@ import { ResetPassModalComponent } from './modules/pages/area-education/header/r import { AboutComponent as AboutComponentEnUS } from './modules/pages/about-en_US/about.component'; import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/tech.component'; import { PrivacyPolicyComponent as PrivacyPolicyComponentEnUS } from './modules/pages/privacy-policy-en_US/privacy-policy.component'; -import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; @NgModule({ declarations: [ @@ -189,7 +188,6 @@ import { PageNotFoundComponent } from './page-not-found/page-not-found.component AboutComponentEnUS, TechComponentEnUS, PrivacyPolicyComponentEnUS, - PageNotFoundComponent, ], imports: [ BrowserModule, From ce7b0516ad67fba1a17f42d7f2afa7f36d3aef83 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 22:44:16 -0300 Subject: [PATCH 72/81] =?UTF-8?q?Remove=20p=C3=A1gina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove 404 page --- .../page-not-found.component.html | 2 -- .../page-not-found.component.sass | 0 .../page-not-found.component.spec.ts | 25 ------------------- .../page-not-found.component.ts | 15 ----------- 4 files changed, 42 deletions(-) delete mode 100644 src/app/page-not-found/page-not-found.component.html delete mode 100644 src/app/page-not-found/page-not-found.component.sass delete mode 100644 src/app/page-not-found/page-not-found.component.spec.ts delete mode 100644 src/app/page-not-found/page-not-found.component.ts diff --git a/src/app/page-not-found/page-not-found.component.html b/src/app/page-not-found/page-not-found.component.html deleted file mode 100644 index 8033fa1f..00000000 --- a/src/app/page-not-found/page-not-found.component.html +++ /dev/null @@ -1,2 +0,0 @@ -

Page Not Found

-

We couldn't find that page! Not even with x-ray vision.

\ No newline at end of file diff --git a/src/app/page-not-found/page-not-found.component.sass b/src/app/page-not-found/page-not-found.component.sass deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/page-not-found/page-not-found.component.spec.ts b/src/app/page-not-found/page-not-found.component.spec.ts deleted file mode 100644 index aa242a97..00000000 --- a/src/app/page-not-found/page-not-found.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PageNotFoundComponent } from './page-not-found.component'; - -describe('PageNotFoundComponent', () => { - let component: PageNotFoundComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ PageNotFoundComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(PageNotFoundComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/page-not-found/page-not-found.component.ts b/src/app/page-not-found/page-not-found.component.ts deleted file mode 100644 index 2d1091ce..00000000 --- a/src/app/page-not-found/page-not-found.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-page-not-found', - templateUrl: './page-not-found.component.html', - styleUrls: ['./page-not-found.component.sass'] -}) -export class PageNotFoundComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} From 1a9aa309149d92b11cbf4477491e04521e71734a Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 23:12:09 -0300 Subject: [PATCH 73/81] =?UTF-8?q?Cria=20componente=20para=20p=C3=A1gina=20?= =?UTF-8?q?404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create component for 404 page --- .../page-not-found/page-not-found.component.html | 10 ++++++++++ .../page-not-found/page-not-found.component.ts | 14 ++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 src/app/modules/pages/page-not-found/page-not-found.component.html create mode 100644 src/app/modules/pages/page-not-found/page-not-found.component.ts diff --git a/src/app/modules/pages/page-not-found/page-not-found.component.html b/src/app/modules/pages/page-not-found/page-not-found.component.html new file mode 100644 index 00000000..6d565beb --- /dev/null +++ b/src/app/modules/pages/page-not-found/page-not-found.component.html @@ -0,0 +1,10 @@ + +
+ +

+ Página não encontrada +

+

Lamentamos, mas a página solicitada não foi encontrada.

+ +
+ diff --git a/src/app/modules/pages/page-not-found/page-not-found.component.ts b/src/app/modules/pages/page-not-found/page-not-found.component.ts new file mode 100644 index 00000000..03c95d0f --- /dev/null +++ b/src/app/modules/pages/page-not-found/page-not-found.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-page-not-found', + templateUrl: './page-not-found.component.html', +}) +export class PageNotFoundComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} From bac87007ed1a9fc3faf5d7722cd687dae225afaf Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 23:12:33 -0300 Subject: [PATCH 74/81] =?UTF-8?q?Mapeia=20o=20componente=20para=20p=C3=A1g?= =?UTF-8?q?ina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Map the component for 404 page --- src/app/app.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 619386ee..ea4b3991 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -110,6 +110,7 @@ import { ResetPassModalComponent } from './modules/pages/area-education/header/r import { AboutComponent as AboutComponentEnUS } from './modules/pages/about-en_US/about.component'; import { TechComponent as TechComponentEnUS } from './modules/pages/tech-en_US/tech.component'; import { PrivacyPolicyComponent as PrivacyPolicyComponentEnUS } from './modules/pages/privacy-policy-en_US/privacy-policy.component'; +import { PageNotFoundComponent } from './modules/pages/page-not-found/page-not-found.component'; @NgModule({ declarations: [ @@ -188,6 +189,7 @@ import { PrivacyPolicyComponent as PrivacyPolicyComponentEnUS } from './modules/ AboutComponentEnUS, TechComponentEnUS, PrivacyPolicyComponentEnUS, + PageNotFoundComponent, ], imports: [ BrowserModule, From ca5b23f7106391bdfb56bdf04568db36bbb3bd4c Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 23:13:20 -0300 Subject: [PATCH 75/81] =?UTF-8?q?Define=20uma=20rota=20curinga=20para=20a?= =?UTF-8?q?=20p=C3=A1gina=20404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set a wildcard route to the 404 page --- src/app/app-routing.module.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4d541fd2..fb7aa6f9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,6 +23,7 @@ import { SearchTutorialComponent } from './modules/pages/search-tutorial/search- import { SuggestionComponent } from './modules/pages/suggestion/suggestion.component'; import { SupportComponent } from './modules/pages/support/support.component'; import { TechComponent } from './modules/pages/tech/tech.component'; +import { PageNotFoundComponent } from './modules/pages/page-not-found/page-not-found.component'; const routes: Routes = [ { path: '', component: HomeComponent }, @@ -51,6 +52,8 @@ const routes: Routes = [ { path: 'educacao/relatorio/:id', component: ReportDetailComponent }, { path: 'educacao/caso/:id', component: ReportDetailComponent }, { path: 'educacao/redefinir-senha', component: PassResetComponent }, + + { path: '**', component: PageNotFoundComponent } ]; @NgModule({ From 39a5041dfda7c5546c7f009d9833271c3bad39b7 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 23:26:49 -0300 Subject: [PATCH 76/81] Define os itens do menu superior para serem traduzidos Set the top menu items to be translated --- .../modules/components/header/header.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index e36528e0..ce330c08 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -6,15 +6,15 @@
From fccdcbd512f6d71501b835214306800cbd6cd95e Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 23:35:54 -0300 Subject: [PATCH 79/81] =?UTF-8?q?Atualiza=20os=20arquivos=20de=20tradu?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the translation files --- src/locales/messages.en.xlf | 9 +++++++++ src/locales/messages.xlf | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/src/locales/messages.en.xlf b/src/locales/messages.en.xlf index 021de80d..69a16f9b 100644 --- a/src/locales/messages.en.xlf +++ b/src/locales/messages.en.xlf @@ -56,6 +56,15 @@ Item do menu superior para a página de Apoie + + Idioma + Language + + src/app/modules/components/header/header.component.html + 104 + + Rótulo do botão para trocar de idioma + Pesquisar Search diff --git a/src/locales/messages.xlf b/src/locales/messages.xlf index 012a64d3..a2fe2e5e 100644 --- a/src/locales/messages.xlf +++ b/src/locales/messages.xlf @@ -50,6 +50,14 @@ Item do menu superior para a página de Apoie + + Idioma + + src/app/modules/components/header/header.component.html + 104 + + Rótulo do botão para trocar de idioma + Pesquisar From b3b09e4a83f481f032f186655c449d5cf06424c5 Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Tue, 31 Oct 2023 23:54:20 -0300 Subject: [PATCH 80/81] =?UTF-8?q?Adiciona=20significado=20=C3=A0s=20string?= =?UTF-8?q?s=20mapeadas=20para=20tradu=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add meaning to mapped strings to be translated --- .../components/header/header.component.html | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/app/modules/components/header/header.component.html b/src/app/modules/components/header/header.component.html index 475da80d..0e98104e 100644 --- a/src/app/modules/components/header/header.component.html +++ b/src/app/modules/components/header/header.component.html @@ -6,15 +6,15 @@