Skip to content

Commit

Permalink
I added a notification window for when the city is not found
Browse files Browse the repository at this point in the history
  • Loading branch information
aline-borges committed Nov 16, 2020
1 parent de9af6e commit 9b28b65
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 14 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
"@react-navigation/stack": "^5.9.1",
"date-fns": "^2.16.1",
"date-fns-tz": "^1.0.12",
"date-time-format-timezone": "^1.0.22",
"expo": "^39.0.3",
"expo-linear-gradient": "~8.3.0",
"expo-localization": "~9.0.0",
"expo-status-bar": "~1.0.2",
"intl": "^1.2.5",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-native": "https://github.com/expo/react-native/archive/sdk-39.0.2.tar.gz",
Expand Down
1 change: 1 addition & 0 deletions src/screens/Location/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const Location = ({ route, navigation }) => {
if(weather === 'Thunderstorm') {return 'Tempestade'}
if(weather === 'Snow') {return 'Neve'}
if(weather === 'Fog') {return 'Nevoeiro'}
console.log(weather)
}

const backgroundRandom = () => {
Expand Down
18 changes: 6 additions & 12 deletions src/screens/Locations/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Feather } from '@expo/vector-icons';
import { SafeAreaView } from 'react-native-safe-area-context';
import { format, utcToZonedTime } from 'date-fns-tz';
import { getHours, getMinutes } from 'date-fns';
import 'date-time-format-timezone';

import OpenWeather, { getOneCall } from '../../services/apis/openWeather';

Expand All @@ -39,18 +40,14 @@ const Locations = ({ navigation }) => {
const date = new Date(response2.current.dt * 1000 )
const timezone = response2.timezone;

const newDate = utcToZonedTime(date, timezone)
const newDate = utcToZonedTime(date, timezone);

format(newDate, 'hh:mm', { timeZone: `${timezone}` })
const newHour = getHours(newDate)
const newHour = getHours(newDate, {locale: 'pt-BR'});
const newMinutes = getMinutes(newDate);
let h = ``;
let m = ``;

newHour < 10 ? h = `0${newHour}`: h = `${newHour}`;
newMinutes < 10 ? m = `0${newMinutes}`: m = `${newMinutes}`;
const h = newHour < 10 ? `0${newHour}` : newHour;
const m = newMinutes < 10 ? `0${newMinutes}` : newMinutes;

let newTime = `${h}:${m}`;
const newTime = `${h}:${m}`;

const datas = {data: response, data2: response2}
const location = {
Expand All @@ -72,9 +69,6 @@ const Locations = ({ navigation }) => {
setSavedCities(newCities);
setLocations(newLocations);
AsyncStorage.setItem("locationData", JSON.stringify(newCities));

console.log(newCities);
console.log(newLocations);
};

const renderLocation = location => {
Expand Down
11 changes: 11 additions & 0 deletions src/screens/Search/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,15 @@ const Search = ({ navigation, route }) => {
AsyncStorage.setItem("locationData", JSON.stringify(locations));
}

const notFoundAlert = () =>
Alert.alert(
"Cidade Não Encontrada",
"Infelizmente, a cidade digitada não consta em nossos dados. Por favor, tente novamente."
)

const handleSubmit = async () => {
const data = await OpenWeather(query);

if (data.cod === 200) {
const data2 = await getOneCall(data.coord.lat, data.coord.lon);
const datas = {data: data, data2: data2}
Expand All @@ -49,6 +56,10 @@ const Search = ({ navigation, route }) => {
})
);
}

if(data.cod === '404') {
notFoundAlert();
}
};

return (
Expand Down
35 changes: 33 additions & 2 deletions yarn-error.log
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Arguments:
C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js add @react-native-async-storage/async-storage
C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js add date-time-format-timezone

PATH:
C:\Cmder\bin;C:\Cmder\vendor\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Users\apbor\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Program Files\Microsoft VS Code\bin;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Yarn\bin\;C:\Program Files\Git\cmd;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Users\apbor\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Program Files\Microsoft VS Code\bin;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Yarn\bin\;C:\Program Files\Git\cmd;C:\Ruby26-x64\bin;C:\Users\apbor\AppData\Local\Microsoft\WindowsApps;C:\Users\apbor\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\apbor\AppData\Local\Yarn\bin;C:\Users\apbor\.deno\bin;C:\Program Files\MongoDB\Server\4.2\bin;C:\Users\apbor\AppData\Local\GitHubDesktop\bin;C:\Program Files\heroku\bin;c:\sqlite3;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Cmder;C:\Cmder\vendor\git-for-windows\cmd;C:\Cmder\vendor\git-for-windows\mingw64\bin;C:\Cmder\vendor\git-for-windows\usr\bin
C:\Cmder\bin;C:\Cmder\vendor\bin;C:\Cmder\vendor\conemu-maximus5\ConEmu\Scripts;C:\Cmder\vendor\conemu-maximus5;C:\Cmder\vendor\conemu-maximus5\ConEmu;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Users\apbor\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Program Files\Microsoft VS Code\bin;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Yarn\bin\;C:\Program Files\Git\cmd;C:\Ruby26-x64\bin;C:\Users\apbor\AppData\Local\Microsoft\WindowsApps;C:\Users\apbor\AppData\Local\Yarn\bin;C:\Users\apbor\.deno\bin;C:\Program Files\MongoDB\Server\4.2\bin;C:\Users\apbor\AppData\Local\GitHubDesktop\bin;C:\Program Files\heroku\bin;c:\sqlite3;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Cmder;C:\Cmder\vendor\git-for-windows\cmd;C:\Cmder\vendor\git-for-windows\mingw64\bin;C:\Cmder\vendor\git-for-windows\usr\bin

Yarn version:
1.22.4
Expand Down Expand Up @@ -32,9 +32,13 @@ npm manifest:
"@react-navigation/bottom-tabs": "^5.9.0",
"@react-navigation/native": "^5.7.4",
"@react-navigation/stack": "^5.9.1",
"date-fns": "^2.16.1",
"date-fns-tz": "^1.0.12",
"expo": "^39.0.3",
"expo-linear-gradient": "~8.3.0",
"expo-localization": "~9.0.0",
"expo-status-bar": "~1.0.2",
"intl": "^1.2.5",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-native": "https://github.com/expo/react-native/archive/sdk-39.0.2.tar.gz",
Expand Down Expand Up @@ -2284,6 +2288,16 @@ Lockfile:
css-color-keywords "^1.0.0"
postcss-value-parser "^4.0.2"

date-fns-tz@^1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.0.12.tgz#2d680e1099767775cff7a30eac34362d52639fed"
integrity sha512-Ca+9pjGkU90XDHnclfSjz9o7g/ZqyYyYI0aCYmbf65P75oy8gktuaRslO3UPXl3ADgAnF9/KCykQkpU3/xvtWQ==

date-fns@^2.16.1:
version "2.16.1"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==

dayjs@^1.8.15:
version "1.8.36"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
Expand Down Expand Up @@ -2648,6 +2662,13 @@ Lockfile:
qs "^6.5.0"
url-parse "^1.4.4"

expo-localization@~9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/expo-localization/-/expo-localization-9.0.0.tgz#1a61582f9ffb3cd28879a917dec347c444bff54e"
integrity sha512-jG84LA9yyQpLcSOKvR/WoIm0IHZ4tZQma//AJ9/DgBZC5zSB/aDbcjmCStQvqCePz8EMy1CKxRd+UlKYPLEiVw==
dependencies:
rtl-detect "^1.0.2"

expo-location@~9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/expo-location/-/expo-location-9.0.0.tgz#43906dbd503803f6029a814df51f0370c3b4a765"
Expand Down Expand Up @@ -3201,6 +3222,11 @@ Lockfile:
strip-ansi "^4.0.0"
through "^2.3.6"

intl@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=

invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
Expand Down Expand Up @@ -4991,6 +5017,11 @@ Lockfile:
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==

rtl-detect@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.2.tgz#8eca316f5c6563d54df4e406171dd7819adda67f"
integrity sha512-5X1422hvphzg2a/bo4tIDbjFjbJUOaPZwqE6dnyyxqwFqfR+tBcvfqapJr0o0VygATVCGKiODEewhZtKF+90AA==

run-async@^2.2.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2236,6 +2236,11 @@ date-fns@^2.16.1:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==

date-time-format-timezone@^1.0.22:
version "1.0.22"
resolved "https://registry.yarnpkg.com/date-time-format-timezone/-/date-time-format-timezone-1.0.22.tgz#6bb4713aac3bf36338738b59c374583cfcbe6246"
integrity sha512-4hEeKPpNlbFO05ldht9FwJEy2g1xL7kU3dTPY5hNSd1AyMjrrIeUS54kSWgt/KdttYshhjDMIonU+vCmL4NjVw==

dayjs@^1.8.15:
version "1.8.36"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
Expand Down Expand Up @@ -3160,6 +3165,11 @@ inquirer@^3.0.6:
strip-ansi "^4.0.0"
through "^2.3.6"

intl@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=

invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
Expand Down

0 comments on commit 9b28b65

Please sign in to comment.